Move rendering/RenderObject to layout/LayoutObject.

Source/web/tests/ScrollingCoordinatorTest.cpp

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
@@ skipping 150 matching lines @@
     scrollableElement->setScrollTop(1.0);
     scrollableElement->setScrollLeft(1.0);
     forceFullCompositingUpdate();
 
     // Make sure the fractional scroll offset change 1.0 -> 1.2 gets propagated
     // to compositor.
     scrollableElement->setScrollTop(1.2);
     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());
     CompositedLayerMapping* compositedLayerMapping = box->layer()->compositedLayerMapping();
     ASSERT_TRUE(compositedLayerMapping->hasScrollingLayer());
     ASSERT(compositedLayerMapping->scrollingContentsLayer());
     WebLayer* webScrollLayer = compositedLayerMapping->scrollingContentsLayer()->platformLayer();
     ASSERT_TRUE(webScrollLayer);
     ASSERT_NEAR(1.2, webScrollLayer->scrollPositionDouble().x, 0.01);
     ASSERT_NEAR(1.2, webScrollLayer->scrollPositionDouble().y, 0.01);
 }
 
 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();
     if (!layer)
         return 0;
     if (!layer->hasCompositedLayerMapping())
         return 0;
     CompositedLayerMapping* compositedLayerMapping = layer->compositedLayerMapping();
     GraphicsLayer* graphicsLayer = compositedLayerMapping->mainGraphicsLayer();
     if (!graphicsLayer)
@@ skipping 147 matching lines @@
     WebLayer* rootScrollLayer = getRootScrollLayer();
     ASSERT_EQ(0u, rootScrollLayer->nonFastScrollableRegion().size());
 }
 
 TEST_F(ScrollingCoordinatorTest, overflowScrolling)
 {
     registerMockedHttpURLLoad("overflow-scrolling.html");
     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());
 
     RenderBox* box = toRenderBox(renderer);
     ASSERT_TRUE(box->usesCompositedScrolling());
     ASSERT_EQ(PaintsIntoOwnBacking, box->layer()->compositingState());
 
     CompositedLayerMapping* compositedLayerMapping = box->layer()->compositedLayerMapping();
     ASSERT_TRUE(compositedLayerMapping->hasScrollingLayer());
     ASSERT(compositedLayerMapping->scrollingContentsLayer());
@@ skipping 14 matching lines @@
     ASSERT_TRUE(compositedLayerMapping->layerForVerticalScrollbar()->hasContentsLayer());
 #endif
 }
 
 TEST_F(ScrollingCoordinatorTest, overflowHidden)
 {
     registerMockedHttpURLLoad("overflow-hidden.html");
     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());
 
     RenderBox* box = toRenderBox(renderer);
     ASSERT_TRUE(box->usesCompositedScrolling());
     ASSERT_EQ(PaintsIntoOwnBacking, box->layer()->compositingState());
 
     CompositedLayerMapping* compositedLayerMapping = box->layer()->compositedLayerMapping();
     ASSERT_TRUE(compositedLayerMapping->hasScrollingLayer());
     ASSERT(compositedLayerMapping->scrollingContentsLayer());
@@ skipping 30 matching lines @@
     ASSERT_TRUE(webScrollLayer->userScrollableVertical());
 }
 
 TEST_F(ScrollingCoordinatorTest, iframeScrolling)
 {
     registerMockedHttpURLLoad("iframe-scrolling.html");
     registerMockedHttpURLLoad("iframe-scrolling-inner.html");
     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());
 
     RenderPart* renderPart = toRenderPart(renderer);
     ASSERT_TRUE(renderPart);
     ASSERT_TRUE(renderPart->widget());
     ASSERT_TRUE(renderPart->widget()->isFrameView());
 
     FrameView* innerFrameView = toFrameView(renderPart->widget());
     RenderView* innerRenderView = innerFrameView->renderView();
@@ skipping 18 matching lines @@
 #endif
 }
 
 TEST_F(ScrollingCoordinatorTest, rtlIframe)
 {
     registerMockedHttpURLLoad("rtl-iframe.html");
     registerMockedHttpURLLoad("rtl-iframe-inner.html");
     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());
 
     RenderPart* renderPart = toRenderPart(renderer);
     ASSERT_TRUE(renderPart);
     ASSERT_TRUE(renderPart->widget());
     ASSERT_TRUE(renderPart->widget()->isFrameView());
 
     FrameView* innerFrameView = toFrameView(renderPart->widget());
     RenderView* innerRenderView = innerFrameView->renderView();
@@ skipping 27 matching lines @@
     blink::FrameTestHelpers::UseMockScrollbarSettings mockScrollbarSettings;
 
     registerMockedHttpURLLoad("trivial-scroller.html");
     navigateTo(m_baseURL + "trivial-scroller.html");
     forceFullCompositingUpdate();
 
     Document* document = frame()->document();
     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());
     CompositedLayerMapping* compositedLayerMapping = box->layer()->compositedLayerMapping();
     GraphicsLayerForScrollTesting* scrollbarGraphicsLayer = static_cast<GraphicsLayerForScrollTesting*>(compositedLayerMapping->layerForVerticalScrollbar());
     ASSERT_TRUE(scrollbarGraphicsLayer);
 
     bool hasWebScrollbarLayer = !scrollbarGraphicsLayer->drawsContent();
     ASSERT_TRUE(hasWebScrollbarLayer || scrollbarGraphicsLayer->platformLayer()->shouldScrollOnMainThread());
 }
@@ skipping 20 matching lines @@
     WebLayer* contentsLayer = scrollbarGraphicsLayer->contentsLayer();
     ASSERT_TRUE(contentsLayer);
 
     // After scrollableAreaScrollbarLayerDidChange,
     // if the main frame's scrollbarLayer is opaque,
     // contentsLayer should be opaque too.
     ASSERT_EQ(platformLayer->opaque(), contentsLayer->opaque());
 }
 
 } // namespace