Move rendering/RenderObject to layout/LayoutObject.

Source/web/FindInPageCoordinates.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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 16 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "web/FindInPageCoordinates.h"
 
 #include "core/dom/Node.h"
 #include "core/dom/Range.h"
 #include "core/frame/LocalFrame.h"
+#include "core/layout/LayoutObject.h"
 #include "core/rendering/RenderBlock.h"
 #include "core/rendering/RenderBox.h"
-#include "core/rendering/RenderObject.h"
 #include "core/rendering/RenderPart.h"
 #include "core/rendering/RenderView.h"
 #include "core/rendering/style/RenderStyle.h"
 #include "platform/geometry/FloatPoint.h"
 #include "platform/geometry/FloatQuad.h"
 #include "platform/geometry/IntPoint.h"
 
 namespace blink {
 
-static const RenderBlock* enclosingScrollableAncestor(const RenderObject* renderer)
+static const RenderBlock* enclosingScrollableAncestor(const LayoutObject* renderer)
 {
     ASSERT(!renderer->isRenderView());
 
     // Trace up the containingBlocks until we reach either the render view or a scrollable object.
     const RenderBlock* container = renderer->containingBlock();
     while (!container->hasOverflowClip() && !container->isRenderView())
         container = container->containingBlock();
     return container;
 }
 
-static FloatRect toNormalizedRect(const FloatRect& absoluteRect, const RenderObject* renderer, const RenderBlock* container)
+static FloatRect toNormalizedRect(const FloatRect& absoluteRect, const LayoutObject* renderer, const RenderBlock* container)
 {
     ASSERT(renderer);
 
     ASSERT(container || renderer->isRenderView());
     if (!container)
         return FloatRect();
 
     // We want to normalize by the max layout overflow size instead of only the visible bounding box.
     // Quads and their enclosing bounding boxes need to be used in order to keep results transform-friendly.
     FloatPoint scrolledOrigin;
@@ skipping 15 matching lines @@
 
     // Fixed positions do not make sense in this coordinate system, but need to leave consistent tickmarks.
     // So, use their position when the view is not scrolled, like an absolute position.
     if (renderer->style()->position() == FixedPosition && container->isRenderView())
         normalizedRect.move(-toRenderView(container)->frameView()->scrollOffsetForViewportConstrainedObjects());
 
     normalizedRect.scale(1 / containerRect.width(), 1 / containerRect.height());
     return normalizedRect;
 }
 
-FloatRect findInPageRectFromAbsoluteRect(const FloatRect& inputRect, const RenderObject* baseRenderer)
+FloatRect findInPageRectFromAbsoluteRect(const FloatRect& inputRect, const LayoutObject* baseRenderer)
 {
     if (!baseRenderer || inputRect.isEmpty())
         return FloatRect();
 
     // Normalize the input rect to its container block.
     const RenderBlock* baseContainer = enclosingScrollableAncestor(baseRenderer);
     FloatRect normalizedRect = toNormalizedRect(inputRect, baseRenderer, baseContainer);
 
     // Go up across frames.
     for (const RenderBox* renderer = baseContainer; renderer; ) {
@@ skipping 17 matching lines @@
     }
 
     return normalizedRect;
 }
 
 FloatRect findInPageRectFromRange(Range* range)
 {
     if (!range || !range->firstNode())
         return FloatRect();
 
-    return findInPageRectFromAbsoluteRect(RenderObject::absoluteBoundingBoxRectForRange(range), range->firstNode()->renderer());
+    return findInPageRectFromAbsoluteRect(LayoutObject::absoluteBoundingBoxRectForRange(range), range->firstNode()->renderer());
 }
 
 } // namespace blink