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()); |