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

Unified Diff: Source/core/frame/LocalFrame.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/core/frame/FrameView.cpp ('k') | Source/core/frame/SmartClip.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/frame/LocalFrame.cpp
diff --git a/Source/core/frame/LocalFrame.cpp b/Source/core/frame/LocalFrame.cpp
index 4beedbfda3a92b24bd496c7bf3b98bc4bce61734..09e5bda9a8322fe3a6d9ed1d5e5a51fc90aecc50 100644
--- a/Source/core/frame/LocalFrame.cpp
+++ b/Source/core/frame/LocalFrame.cpp
@@ -451,7 +451,7 @@ bool LocalFrame::inScope(TreeScope* scope) const
void LocalFrame::countObjectsNeedingLayout(unsigned& needsLayoutObjects, unsigned& totalObjects, bool& isPartial)
{
- RenderObject* root = view()->layoutRoot();
+ LayoutObject* root = view()->layoutRoot();
isPartial = true;
if (!root) {
isPartial = false;
@@ -461,7 +461,7 @@ void LocalFrame::countObjectsNeedingLayout(unsigned& needsLayoutObjects, unsigne
needsLayoutObjects = 0;
totalObjects = 0;
- for (RenderObject* o = root; o; o = o->nextInPreOrder(root)) {
+ for (LayoutObject* o = root; o; o = o->nextInPreOrder(root)) {
++totalObjects;
if (o->needsLayout())
++needsLayoutObjects;
@@ -664,8 +664,8 @@ PassOwnPtr<DragImage> LocalFrame::nodeImage(Node& node)
m_view->setNodeToDraw(&node); // Enable special sub-tree drawing mode.
- // Document::updateLayout may have blown away the original RenderObject.
- RenderObject* renderer = node.renderer();
+ // Document::updateLayout may have blown away the original LayoutObject.
+ LayoutObject* renderer = node.renderer();
if (!renderer)
return nullptr;
@@ -704,7 +704,7 @@ VisiblePosition LocalFrame::visiblePositionForPoint(const IntPoint& framePoint)
Node* node = result.innerNonSharedNode();
if (!node)
return VisiblePosition();
- RenderObject* renderer = node->renderer();
+ LayoutObject* renderer = node->renderer();
if (!renderer)
return VisiblePosition();
VisiblePosition visiblePos = VisiblePosition(renderer->positionForPoint(result.localPoint()));
« no previous file with comments | « Source/core/frame/FrameView.cpp ('k') | Source/core/frame/SmartClip.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698