Change mock canvases to paint into SkCanvas

third_party/WebKit/Source/web/PageOverlayTest.cpp

 // Copyright 2015 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 "web/PageOverlay.h"
 
 #include "core/frame/FrameView.h"
 #include "platform/graphics/Color.h"
 #include "platform/graphics/GraphicsContext.h"
 #include "platform/graphics/paint/DrawingRecorder.h"
@@ skipping 91 matching lines @@
  public:
   RuntimeFeatureChange(bool newValue) : m_oldValue(getter()) {
     setter(newValue);
   }
   ~RuntimeFeatureChange() { setter(m_oldValue); }
 
  private:
   bool m_oldValue;
 };
 
-class MockCanvas : public PaintCanvas {
+class MockCanvas : public SkCanvas {
  public:
-  MockCanvas(int width, int height) : PaintCanvas(width, height) {}
-  MOCK_METHOD2(onDrawRect, void(const SkRect&, const PaintFlags&));
+  MockCanvas(int width, int height) : SkCanvas(width, height) {}
+  MOCK_METHOD2(onDrawRect, void(const SkRect&, const SkPaint&));
 };
 
 TEST_F(PageOverlayTest, PageOverlay_AcceleratedCompositing) {
   initialize(AcceleratedCompositing);
   webViewImpl()->layerTreeView()->setViewportSize(
       WebSize(viewportWidth, viewportHeight));
 
   std::unique_ptr<PageOverlay> pageOverlay = createSolidYellowOverlay();
   pageOverlay->update();
   webViewImpl()->updateAllLifecyclePhases();
 
   // Ideally, we would get results from the compositor that showed that this
   // page overlay actually winds up getting drawn on top of the rest.
   // For now, we just check that the GraphicsLayer will draw the right thing.
 
   MockCanvas canvas(viewportWidth, viewportHeight);
   EXPECT_CALL(canvas, onDrawRect(_, _)).Times(AtLeast(0));
   EXPECT_CALL(canvas,
               onDrawRect(SkRect::MakeWH(viewportWidth, viewportHeight),
-                         Property(&PaintFlags::getColor, SK_ColorYELLOW)));
+                         Property(&SkPaint::getColor, SK_ColorYELLOW)));
 
   GraphicsLayer* graphicsLayer = pageOverlay->graphicsLayer();
   WebRect rect(0, 0, viewportWidth, viewportHeight);
 
   // Paint the layer with a null canvas to get a display list, and then
   // replay that onto the mock canvas for examination.
   IntRect intRect = rect;
   graphicsLayer->paint(&intRect);
 
   PaintController& paintController = graphicsLayer->getPaintController();
   GraphicsContext graphicsContext(paintController);
   graphicsContext.beginRecording(intRect);
   paintController.paintArtifact().replay(graphicsContext);
   graphicsContext.endRecording()->playback(&canvas);
 }
 
 TEST_F(PageOverlayTest, PageOverlay_VisualRect) {
   initialize(AcceleratedCompositing);
   std::unique_ptr<PageOverlay> pageOverlay = createSolidYellowOverlay();
   pageOverlay->update();
   webViewImpl()->updateAllLifecyclePhases();
   EXPECT_EQ(LayoutRect(0, 0, viewportWidth, viewportHeight),
             pageOverlay->visualRect());
 }
 
 }  // namespace
 }  // namespace blink