Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1416)

Unified Diff: third_party/WebKit/Source/web/PageOverlayTest.cpp

Issue 2640983002: Rename paint data structures (Closed)
Patch Set: DrawingDisplayItem Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/web/PageOverlayTest.cpp
diff --git a/third_party/WebKit/Source/web/PageOverlayTest.cpp b/third_party/WebKit/Source/web/PageOverlayTest.cpp
index 747b6fa8d7710a86e22e1c00d0842d717c3920ac..36e698caf734f7fe1ac2e6588ee7ef13fd9d834b 100644
--- a/third_party/WebKit/Source/web/PageOverlayTest.cpp
+++ b/third_party/WebKit/Source/web/PageOverlayTest.cpp
@@ -109,10 +109,10 @@ class RuntimeFeatureChange {
bool m_oldValue;
};
-class MockCanvas : public SkCanvas {
+class MockCanvas : public PaintCanvas {
public:
- MockCanvas(int width, int height) : SkCanvas(width, height) {}
- MOCK_METHOD2(onDrawRect, void(const SkRect&, const SkPaint&));
+ MockCanvas(int width, int height) : PaintCanvas(width, height) {}
+ MOCK_METHOD2(onDrawRect, void(const SkRect&, const PaintFlags&));
};
TEST_F(PageOverlayTest, PageOverlay_AcceleratedCompositing) {
@@ -130,8 +130,9 @@ TEST_F(PageOverlayTest, PageOverlay_AcceleratedCompositing) {
MockCanvas canvas(viewportWidth, viewportHeight);
EXPECT_CALL(canvas, onDrawRect(_, _)).Times(AtLeast(0));
- EXPECT_CALL(canvas, onDrawRect(SkRect::MakeWH(viewportWidth, viewportHeight),
- Property(&SkPaint::getColor, SK_ColorYELLOW)));
+ EXPECT_CALL(canvas,
+ onDrawRect(SkRect::MakeWH(viewportWidth, viewportHeight),
+ Property(&PaintFlags::getColor, SK_ColorYELLOW)));
GraphicsLayer* graphicsLayer = pageOverlay->graphicsLayer();
WebRect rect(0, 0, viewportWidth, viewportHeight);
« no previous file with comments | « third_party/WebKit/Source/web/LinkHighlightImpl.cpp ('k') | third_party/WebKit/Source/web/WebPluginContainerImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698