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

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

Issue 2523673004: [NOT FOR COMMIT] Fully replace SkCanvas uses.
Patch Set: Support Android build. Created 4 years 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 eeb657ee19af056918afdc4dfc3e9dcf9b9eff16..3b91bca3804012a306c37f6665ab847a7e613a39 100644
--- a/third_party/WebKit/Source/web/PageOverlayTest.cpp
+++ b/third_party/WebKit/Source/web/PageOverlayTest.cpp
@@ -108,10 +108,10 @@ class RuntimeFeatureChange {
bool m_oldValue;
};
-class MockCanvas : public SkCanvas {
+class MockCanvas : public CdlCanvas {
public:
- MockCanvas(int width, int height) : SkCanvas(width, height) {}
- MOCK_METHOD2(onDrawRect, void(const SkRect&, const SkPaint&));
+ MockCanvas(int width, int height) : CdlCanvas(width, height) {}
+ MOCK_METHOD2(onDrawRect, void(const SkRect&, const CdlPaint&));
};
TEST_F(PageOverlayTest, PageOverlay_AcceleratedCompositing) {
@@ -129,8 +129,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(&CdlPaint::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