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

Unified Diff: Source/web/FindInPageCoordinates.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/FindInPageCoordinates.h ('k') | Source/web/LinkHighlight.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/FindInPageCoordinates.cpp
diff --git a/Source/web/FindInPageCoordinates.cpp b/Source/web/FindInPageCoordinates.cpp
index 1b3288fc6909375042acf24e4f516478a6f3f35a..4999f38a0c53271f36faccd925b70d41595050a0 100644
--- a/Source/web/FindInPageCoordinates.cpp
+++ b/Source/web/FindInPageCoordinates.cpp
@@ -34,9 +34,9 @@
#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"
@@ -46,7 +46,7 @@
namespace blink {
-static const RenderBlock* enclosingScrollableAncestor(const RenderObject* renderer)
+static const RenderBlock* enclosingScrollableAncestor(const LayoutObject* renderer)
{
ASSERT(!renderer->isRenderView());
@@ -57,7 +57,7 @@ static const RenderBlock* enclosingScrollableAncestor(const RenderObject* render
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);
@@ -93,7 +93,7 @@ static FloatRect toNormalizedRect(const FloatRect& absoluteRect, const RenderObj
return normalizedRect;
}
-FloatRect findInPageRectFromAbsoluteRect(const FloatRect& inputRect, const RenderObject* baseRenderer)
+FloatRect findInPageRectFromAbsoluteRect(const FloatRect& inputRect, const LayoutObject* baseRenderer)
{
if (!baseRenderer || inputRect.isEmpty())
return FloatRect();
@@ -131,7 +131,7 @@ 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
« no previous file with comments | « Source/web/FindInPageCoordinates.h ('k') | Source/web/LinkHighlight.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698