Remove SkiaOutputSurface::SkiaSwapBuffers()

The function signature is no longer different so just use SwapBuffers().

Bug: none
Change-Id: I7f244b3dddafd95eb3e534df3cf9e639b3aff5e5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2008055Reviewed-by: Peng Huang <penghuang@chromium.org>
Commit-Queue: kylechar <kylechar@chromium.org>
Cr-Commit-Position: refs/heads/master@{#733393}

components/viz/service/display/skia_output_surface.h

@@ -96,10 +96,7 @@ class VIZ_SERVICE_EXPORT SkiaOutputSurface : public OutputSurface,
       sk_sp<SkColorSpace> dst_color_space,
       bool has_alpha) = 0;
 
-  // Swaps the current backbuffer to the screen.
-  virtual void SkiaSwapBuffers(OutputSurfaceFrame frame) = 0;
-
-  // Called if SkiaSwapBuffers() will be skipped.
+  // Called if SwapBuffers() will be skipped.
   virtual void SwapBuffersSkipped() = 0;
 
   // TODO(weiliangc): This API should move to OverlayProcessor.
@@ -152,7 +149,7 @@ class VIZ_SERVICE_EXPORT SkiaOutputSurface : public OutputSurface,
                           const gfx::ColorSpace& color_space,
                           std::unique_ptr<CopyOutputRequest> request) = 0;
 
-  // Schedule drawing overlays at next SkiaSwapBuffers() call. Waits on
+  // Schedule drawing overlays at next SwapBuffers() call. Waits on
   // |sync_tokens| for the overlay textures to be ready before scheduling.
   virtual void ScheduleOverlays(OverlayList overlays,
                                 std::vector<gpu::SyncToken> sync_tokens) = 0;

components/viz/service/display/skia_renderer.cc

@@ -819,7 +819,7 @@ void SkiaRenderer::SwapBuffers(SwapFrameData swap_frame_data) {
 
   switch (draw_mode_) {
     case DrawMode::DDL: {
-      skia_output_surface_->SkiaSwapBuffers(std::move(output_frame));
+      skia_output_surface_->SwapBuffers(std::move(output_frame));
       break;
     }
     case DrawMode::SKPRECORD: {

components/viz/service/display_embedder/skia_output_surface_impl.cc

@@ -393,7 +393,7 @@ SkiaOutputSurfaceImpl::CreateImageContext(
                                             std::move(color_space));
 }
 
-void SkiaOutputSurfaceImpl::SkiaSwapBuffers(OutputSurfaceFrame frame) {
+void SkiaOutputSurfaceImpl::SwapBuffers(OutputSurfaceFrame frame) {
   DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
   DCHECK(!current_paint_);
 
@@ -821,10 +821,6 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFormatForTexture(
   return GrBackendFormat();
 }
 
-void SkiaOutputSurfaceImpl::SwapBuffers(OutputSurfaceFrame frame) {
-  NOTREACHED();
-}
-
 uint32_t SkiaOutputSurfaceImpl::GetFramebufferCopyTextureFormat() {
   DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
 

components/viz/service/display_embedder/skia_output_surface_impl.h

@@ -96,7 +96,6 @@ class VIZ_SERVICE_EXPORT SkiaOutputSurfaceImpl : public SkiaOutputSurface {
       SkYUVColorSpace yuv_color_space,
       sk_sp<SkColorSpace> dst_color_space,
       bool has_alpha) override;
-  void SkiaSwapBuffers(OutputSurfaceFrame frame) override;
   void SwapBuffersSkipped() override;
   void ScheduleOutputSurfaceAsOverlay(
       OverlayProcessorInterface::OutputSurfaceOverlayPlane output_surface_plane)

components/viz/service/display_embedder/skia_output_surface_impl_unittest.cc

@@ -224,7 +224,7 @@ TEST_P(SkiaOutputSurfaceImplTest, SupportsColorSpaceChange) {
 
     OutputSurfaceFrame frame;
     frame.size = kSurfaceRect.size();
-    output_surface_->SkiaSwapBuffers(std::move(frame));
+    output_surface_->SwapBuffers(std::move(frame));
 
     run_loop.Run();
   }

components/viz/test/fake_skia_output_surface.cc

@@ -81,7 +81,10 @@ void FakeSkiaOutputSurface::Reshape(const gfx::Size& size,
 }
 
 void FakeSkiaOutputSurface::SwapBuffers(OutputSurfaceFrame frame) {
-  NOTIMPLEMENTED();
+  DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
+  base::ThreadTaskRunnerHandle::Get()->PostTask(
+      FROM_HERE, base::BindOnce(&FakeSkiaOutputSurface::SwapBuffersAck,
+                                weak_ptr_factory_.GetWeakPtr()));
 }
 
 void FakeSkiaOutputSurface::ScheduleOutputSurfaceAsOverlay(
@@ -188,13 +191,6 @@ FakeSkiaOutputSurface::CreateImageContext(
       holder, size, format, ycbcr_info, std::move(color_space));
 }
 
-void FakeSkiaOutputSurface::SkiaSwapBuffers(OutputSurfaceFrame frame) {
-  DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
-  base::ThreadTaskRunnerHandle::Get()->PostTask(
-      FROM_HERE, base::BindOnce(&FakeSkiaOutputSurface::SwapBuffersAck,
-                                weak_ptr_factory_.GetWeakPtr()));
-}
-
 SkCanvas* FakeSkiaOutputSurface::BeginPaintRenderPass(
     const RenderPassId& id,
     const gfx::Size& surface_size,

components/viz/test/fake_skia_output_surface.h

@@ -74,7 +74,6 @@ class FakeSkiaOutputSurface : public SkiaOutputSurface {
       SkYUVColorSpace yuv_color_space,
       sk_sp<SkColorSpace> dst_color_space,
       bool has_alpha) override;
-  void SkiaSwapBuffers(OutputSurfaceFrame frame) override;
   void SwapBuffersSkipped() override {}
   SkCanvas* BeginPaintRenderPass(const RenderPassId& id,
                                  const gfx::Size& surface_size,