Use sk_surface_->flush() for OOPR + DDL

This is a revert of a temporary fix
https://chromium-review.googlesource.com/c/chromium/src/+/1594780

Bug: 958055
Change-Id: Ie00a41007512fef7f01492f851e96c14e5e54bc4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1717201Reviewed-by: Jonathan Backer <backer@chromium.org>
Commit-Queue: Peng Huang <penghuang@chromium.org>
Auto-Submit: Peng Huang <penghuang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#680582}

gpu/command_buffer/service/raster_decoder.cc

@@ -2381,16 +2381,9 @@ void RasterDecoderImpl::DoEndRasterCHROMIUM() {
     };
     AddVulkanCleanupTaskForSkiaFlush(
         shared_context_state_->vk_context_provider(), &flush_info);
-    if (use_ddl_) {
-      // TODO(penghuang): Switch to sk_surface_->flush() when skia flush bug is
-      // fixed. https://crbug.com/958055
-      auto result = gr_context()->flush(flush_info);
-      DCHECK(result == GrSemaphoresSubmitted::kYes || end_semaphores_.empty());
-    } else {
-      auto result = sk_surface_->flush(
-          SkSurface::BackendSurfaceAccess::kPresent, flush_info);
-      DCHECK(result == GrSemaphoresSubmitted::kYes || end_semaphores_.empty());
-    }
+    auto result = sk_surface_->flush(SkSurface::BackendSurfaceAccess::kPresent,
+                                     flush_info);
+    DCHECK(result == GrSemaphoresSubmitted::kYes || end_semaphores_.empty());
     end_semaphores_.clear();
   }