cc: Make PaintCanvas abstract

content/renderer/pepper/pepper_graphics_2d_host_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/pepper/pepper_graphics_2d_host.h"
 
 #include <stddef.h>
 
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "content/renderer/pepper/gfx_conversion.h"
 #include "content/renderer/pepper/mock_renderer_ppapi_host.h"
 #include "content/renderer/pepper/ppb_image_data_impl.h"
 #include "ppapi/shared_impl/ppb_view_shared.h"
 #include "ppapi/shared_impl/proxy_lock.h"
 #include "ppapi/shared_impl/test_globals.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/WebKit/public/platform/WebCanvas.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/rect.h"
 
-using blink::WebCanvas;
-
 namespace content {
 
 class PepperGraphics2DHostTest : public testing::Test {
  public:
   static bool ConvertToLogicalPixels(float scale,
                                      gfx::Rect* op_rect,
                                      gfx::Point* delta) {
     return PepperGraphics2DHost::ConvertToLogicalPixels(scale, op_rect, delta);
   }
 
@@ skipping 29 matching lines @@
   }
 
   void Flush() {
     ppapi::host::HostMessageContext context(
         ppapi::proxy::ResourceMessageCallParams(host_->pp_resource(), 0));
     host_->OnHostMsgFlush(&context);
     host_->ViewInitiatedPaint();
     host_->SendOffscreenFlushAck();
   }
 
-  void PaintToWebCanvas(SkBitmap* bitmap) {

[enne (OOO), 2017/03/14 17:50:10]

I went to change this to SkiaPaintCanvas, but it appears unused, so removed it.

[ncarter (slow), 2017/03/14 18:00:33]

Even better.

-    std::unique_ptr<WebCanvas> canvas(new WebCanvas(*bitmap));
-    gfx::Rect plugin_rect(PP_ToGfxRect(renderer_view_data_.rect));
-    host_->Paint(canvas.get(),
-                 plugin_rect,
-                 gfx::Rect(0, 0, plugin_rect.width(), plugin_rect.height()));
-  }
-
   void ResetPageBitmap(SkBitmap* bitmap) {
     PP_Rect plugin_rect = renderer_view_data_.rect;
     int width = plugin_rect.point.x + plugin_rect.size.width;
     int height = plugin_rect.point.y + plugin_rect.size.height;
     if (bitmap->isNull() || bitmap->width() != width ||
         bitmap->height() != height) {
       bitmap->allocN32Pixels(width, height);
     }
     bitmap->eraseColor(0);
   }
@@ skipping 67 matching lines @@
       EXPECT_EQ(delta, gfx::Point(tests[i].dx2, tests[i].dy2));
     }
     // Reverse the scale and ensure all the original pixels are still inside
     // the result.
     ConvertToLogicalPixels(1.0f / tests[i].scale, &r1, NULL);
     EXPECT_TRUE(r1.Contains(orig));
   }
 }
 
 }  // namespace content