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

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

Issue 899163003: Move rendering/RenderObject to layout/LayoutObject. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: 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
« no previous file with comments | « Source/web/tests/PinchViewportTest.cpp ('k') | Source/web/tests/WebFrameTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/tests/ScrollingCoordinatorTest.cpp
diff --git a/Source/web/tests/ScrollingCoordinatorTest.cpp b/Source/web/tests/ScrollingCoordinatorTest.cpp
index e6a9843d7df045a9d7dfc2fa39e8cbcb2d0e4832..19874fbe02d560db2b3fae02a227bd94837be63d 100644
--- a/Source/web/tests/ScrollingCoordinatorTest.cpp
+++ b/Source/web/tests/ScrollingCoordinatorTest.cpp
@@ -168,7 +168,7 @@ TEST_F(ScrollingCoordinatorTest, fastFractionalScrollingDiv)
scrollableElement->setScrollLeft(1.2);
forceFullCompositingUpdate();
- RenderObject* renderer = scrollableElement->renderer();
+ LayoutObject* renderer = scrollableElement->renderer();
ASSERT_TRUE(renderer->isBox());
RenderBox* box = toRenderBox(renderer);
ASSERT_TRUE(box->usesCompositedScrolling());
@@ -185,7 +185,7 @@ static WebLayer* webLayerFromElement(Element* element)
{
if (!element)
return 0;
- RenderObject* renderer = element->renderer();
+ LayoutObject* renderer = element->renderer();
if (!renderer || !renderer->isBoxModelObject())
return 0;
Layer* layer = toRenderBoxModelObject(renderer)->layer();
@@ -353,12 +353,12 @@ TEST_F(ScrollingCoordinatorTest, overflowScrolling)
navigateTo(m_baseURL + "overflow-scrolling.html");
forceFullCompositingUpdate();
- // Verify the properties of the accelerated scrolling element starting from the RenderObject
+ // Verify the properties of the accelerated scrolling element starting from the LayoutObject
// all the way to the WebLayer.
Element* scrollableElement = frame()->document()->getElementById("scrollable");
ASSERT(scrollableElement);
- RenderObject* renderer = scrollableElement->renderer();
+ LayoutObject* renderer = scrollableElement->renderer();
ASSERT_TRUE(renderer->isBox());
ASSERT_TRUE(renderer->hasLayer());
@@ -393,12 +393,12 @@ TEST_F(ScrollingCoordinatorTest, overflowHidden)
navigateTo(m_baseURL + "overflow-hidden.html");
forceFullCompositingUpdate();
- // Verify the properties of the accelerated scrolling element starting from the RenderObject
+ // Verify the properties of the accelerated scrolling element starting from the LayoutObject
// all the way to the WebLayer.
Element* overflowElement = frame()->document()->getElementById("unscrollable-y");
ASSERT(overflowElement);
- RenderObject* renderer = overflowElement->renderer();
+ LayoutObject* renderer = overflowElement->renderer();
ASSERT_TRUE(renderer->isBox());
ASSERT_TRUE(renderer->hasLayer());
@@ -449,12 +449,12 @@ TEST_F(ScrollingCoordinatorTest, iframeScrolling)
navigateTo(m_baseURL + "iframe-scrolling.html");
forceFullCompositingUpdate();
- // Verify the properties of the accelerated scrolling element starting from the RenderObject
+ // Verify the properties of the accelerated scrolling element starting from the LayoutObject
// all the way to the WebLayer.
Element* scrollableFrame = frame()->document()->getElementById("scrollable");
ASSERT_TRUE(scrollableFrame);
- RenderObject* renderer = scrollableFrame->renderer();
+ LayoutObject* renderer = scrollableFrame->renderer();
ASSERT_TRUE(renderer);
ASSERT_TRUE(renderer->isRenderPart());
@@ -493,12 +493,12 @@ TEST_F(ScrollingCoordinatorTest, rtlIframe)
navigateTo(m_baseURL + "rtl-iframe.html");
forceFullCompositingUpdate();
- // Verify the properties of the accelerated scrolling element starting from the RenderObject
+ // Verify the properties of the accelerated scrolling element starting from the LayoutObject
// all the way to the WebLayer.
Element* scrollableFrame = frame()->document()->getElementById("scrollable");
ASSERT_TRUE(scrollableFrame);
- RenderObject* renderer = scrollableFrame->renderer();
+ LayoutObject* renderer = scrollableFrame->renderer();
ASSERT_TRUE(renderer);
ASSERT_TRUE(renderer->isRenderPart());
@@ -546,7 +546,7 @@ TEST_F(ScrollingCoordinatorTest, scrollbarsForceMainThreadOrHaveWebScrollbarLaye
Element* scrollableElement = document->getElementById("scroller");
ASSERT(scrollableElement);
- RenderObject* renderer = scrollableElement->renderer();
+ LayoutObject* renderer = scrollableElement->renderer();
ASSERT_TRUE(renderer->isBox());
RenderBox* box = toRenderBox(renderer);
ASSERT_TRUE(box->usesCompositedScrolling());
« no previous file with comments | « Source/web/tests/PinchViewportTest.cpp ('k') | Source/web/tests/WebFrameTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698