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

Unified Diff: third_party/WebKit/Source/web/tests/ScrollingCoordinatorTest.cpp

Issue 1774943003: blink: Rename platform/ methods to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clash-platform: rebase-yayyyyyyyy Created 4 years, 9 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/tests/ScrollingCoordinatorTest.cpp
diff --git a/third_party/WebKit/Source/web/tests/ScrollingCoordinatorTest.cpp b/third_party/WebKit/Source/web/tests/ScrollingCoordinatorTest.cpp
index cffad5917ef584e7645464bedc7381ac497e2c2b..afe0aff7b1d724c1d5e3367a80c331e65a070760 100644
--- a/third_party/WebKit/Source/web/tests/ScrollingCoordinatorTest.cpp
+++ b/third_party/WebKit/Source/web/tests/ScrollingCoordinatorTest.cpp
@@ -415,7 +415,7 @@ TEST_F(ScrollingCoordinatorTest, overflowScrolling)
ASSERT(compositedLayerMapping->scrollingContentsLayer());
GraphicsLayer* graphicsLayer = compositedLayerMapping->scrollingContentsLayer();
- ASSERT_EQ(box->layer()->scrollableArea(), graphicsLayer->scrollableArea());
+ ASSERT_EQ(box->layer()->getScrollableArea(), graphicsLayer->getScrollableArea());
WebLayer* webScrollLayer = compositedLayerMapping->scrollingContentsLayer()->platformLayer();
ASSERT_TRUE(webScrollLayer->scrollable());
@@ -455,7 +455,7 @@ TEST_F(ScrollingCoordinatorTest, overflowHidden)
ASSERT(compositedLayerMapping->scrollingContentsLayer());
GraphicsLayer* graphicsLayer = compositedLayerMapping->scrollingContentsLayer();
- ASSERT_EQ(box->layer()->scrollableArea(), graphicsLayer->scrollableArea());
+ ASSERT_EQ(box->layer()->getScrollableArea(), graphicsLayer->getScrollableArea());
WebLayer* webScrollLayer = compositedLayerMapping->scrollingContentsLayer()->platformLayer();
ASSERT_TRUE(webScrollLayer->scrollable());
@@ -470,7 +470,7 @@ TEST_F(ScrollingCoordinatorTest, overflowHidden)
ASSERT_TRUE(layoutObject->hasLayer());
box = toLayoutBox(layoutObject);
- ASSERT_TRUE(box->scrollableArea()->usesCompositedScrolling());
+ ASSERT_TRUE(box->getScrollableArea()->usesCompositedScrolling());
ASSERT_EQ(PaintsIntoOwnBacking, box->layer()->compositingState());
compositedLayerMapping = box->layer()->compositedLayerMapping();
@@ -478,7 +478,7 @@ TEST_F(ScrollingCoordinatorTest, overflowHidden)
ASSERT(compositedLayerMapping->scrollingContentsLayer());
graphicsLayer = compositedLayerMapping->scrollingContentsLayer();
- ASSERT_EQ(box->layer()->scrollableArea(), graphicsLayer->scrollableArea());
+ ASSERT_EQ(box->layer()->getScrollableArea(), graphicsLayer->getScrollableArea());
webScrollLayer = compositedLayerMapping->scrollingContentsLayer()->platformLayer();
ASSERT_TRUE(webScrollLayer->scrollable());
@@ -516,7 +516,7 @@ TEST_F(ScrollingCoordinatorTest, iframeScrolling)
ASSERT_TRUE(innerCompositor->scrollLayer());
GraphicsLayer* scrollLayer = innerCompositor->scrollLayer();
- ASSERT_EQ(innerFrameView, scrollLayer->scrollableArea());
+ ASSERT_EQ(innerFrameView, scrollLayer->getScrollableArea());
WebLayer* webScrollLayer = scrollLayer->platformLayer();
ASSERT_TRUE(webScrollLayer->scrollable());
@@ -560,7 +560,7 @@ TEST_F(ScrollingCoordinatorTest, rtlIframe)
ASSERT_TRUE(innerCompositor->scrollLayer());
GraphicsLayer* scrollLayer = innerCompositor->scrollLayer();
- ASSERT_EQ(innerFrameView, scrollLayer->scrollableArea());
+ ASSERT_EQ(innerFrameView, scrollLayer->getScrollableArea());
WebLayer* webScrollLayer = scrollLayer->platformLayer();
ASSERT_TRUE(webScrollLayer->scrollable());
« no previous file with comments | « third_party/WebKit/Source/web/mac/WebSubstringUtil.mm ('k') | third_party/WebKit/Source/web/tests/TopControlsTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698