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

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

Issue 977113003: Rename renderer() to layoutObject(). (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase to master Created 5 years, 10 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: Source/web/tests/ScrollingCoordinatorTest.cpp
diff --git a/Source/web/tests/ScrollingCoordinatorTest.cpp b/Source/web/tests/ScrollingCoordinatorTest.cpp
index e1e5efabf1f342b61f7a1f2ba83dd1c3343209ca..1e83018d3a31567631885e7b7bab48a10a255e96 100644
--- a/Source/web/tests/ScrollingCoordinatorTest.cpp
+++ b/Source/web/tests/ScrollingCoordinatorTest.cpp
@@ -163,7 +163,7 @@ TEST_F(ScrollingCoordinatorTest, fastFractionalScrollingDiv)
scrollableElement->setScrollLeft(1.2);
forceFullCompositingUpdate();
- LayoutObject* renderer = scrollableElement->renderer();
+ LayoutObject* renderer = scrollableElement->layoutObject();
ASSERT_TRUE(renderer->isBox());
LayoutBox* box = toLayoutBox(renderer);
ASSERT_TRUE(box->usesCompositedScrolling());
@@ -180,7 +180,7 @@ static WebLayer* webLayerFromElement(Element* element)
{
if (!element)
return 0;
- LayoutObject* renderer = element->renderer();
+ LayoutObject* renderer = element->layoutObject();
if (!renderer || !renderer->isBoxModelObject())
return 0;
Layer* layer = toLayoutBoxModelObject(renderer)->layer();
@@ -353,7 +353,7 @@ TEST_F(ScrollingCoordinatorTest, overflowScrolling)
Element* scrollableElement = frame()->document()->getElementById("scrollable");
ASSERT(scrollableElement);
- LayoutObject* renderer = scrollableElement->renderer();
+ LayoutObject* renderer = scrollableElement->layoutObject();
ASSERT_TRUE(renderer->isBox());
ASSERT_TRUE(renderer->hasLayer());
@@ -393,7 +393,7 @@ TEST_F(ScrollingCoordinatorTest, overflowHidden)
Element* overflowElement = frame()->document()->getElementById("unscrollable-y");
ASSERT(overflowElement);
- LayoutObject* renderer = overflowElement->renderer();
+ LayoutObject* renderer = overflowElement->layoutObject();
ASSERT_TRUE(renderer->isBox());
ASSERT_TRUE(renderer->hasLayer());
@@ -416,7 +416,7 @@ TEST_F(ScrollingCoordinatorTest, overflowHidden)
overflowElement = frame()->document()->getElementById("unscrollable-x");
ASSERT(overflowElement);
- renderer = overflowElement->renderer();
+ renderer = overflowElement->layoutObject();
ASSERT_TRUE(renderer->isBox());
ASSERT_TRUE(renderer->hasLayer());
@@ -449,7 +449,7 @@ TEST_F(ScrollingCoordinatorTest, iframeScrolling)
Element* scrollableFrame = frame()->document()->getElementById("scrollable");
ASSERT_TRUE(scrollableFrame);
- LayoutObject* renderer = scrollableFrame->renderer();
+ LayoutObject* renderer = scrollableFrame->layoutObject();
ASSERT_TRUE(renderer);
ASSERT_TRUE(renderer->isLayoutPart());
@@ -493,7 +493,7 @@ TEST_F(ScrollingCoordinatorTest, rtlIframe)
Element* scrollableFrame = frame()->document()->getElementById("scrollable");
ASSERT_TRUE(scrollableFrame);
- LayoutObject* renderer = scrollableFrame->renderer();
+ LayoutObject* renderer = scrollableFrame->layoutObject();
ASSERT_TRUE(renderer);
ASSERT_TRUE(renderer->isLayoutPart());
@@ -541,7 +541,7 @@ TEST_F(ScrollingCoordinatorTest, scrollbarsForceMainThreadOrHaveWebScrollbarLaye
Element* scrollableElement = document->getElementById("scroller");
ASSERT(scrollableElement);
- LayoutObject* renderer = scrollableElement->renderer();
+ LayoutObject* renderer = scrollableElement->layoutObject();
ASSERT_TRUE(renderer->isBox());
LayoutBox* box = toLayoutBox(renderer);
ASSERT_TRUE(box->usesCompositedScrolling());

Powered by Google App Engine
This is Rietveld 408576698