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

Unified Diff: Source/core/layout/LayoutObject.cpp

Issue 944923004: rendering/RenderBoxModelObject -> layout/LayoutBoxModelObject (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/layout/LayoutObject.h ('k') | Source/core/layout/LayoutTreeAsText.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/LayoutObject.cpp
diff --git a/Source/core/layout/LayoutObject.cpp b/Source/core/layout/LayoutObject.cpp
index 822373f88222ca5d4d057771d71ac812fcc2e727..afaf7bebbec020ec849ba6af12588ff5b2e5980b 100644
--- a/Source/core/layout/LayoutObject.cpp
+++ b/Source/core/layout/LayoutObject.cpp
@@ -579,12 +579,12 @@ RenderBox* LayoutObject::enclosingBox() const
return 0;
}
-RenderBoxModelObject* LayoutObject::enclosingBoxModelObject() const
+LayoutBoxModelObject* LayoutObject::enclosingBoxModelObject() const
{
LayoutObject* curr = const_cast<LayoutObject*>(this);
while (curr) {
if (curr->isBoxModelObject())
- return toRenderBoxModelObject(curr);
+ return toLayoutBoxModelObject(curr);
curr = curr->parent();
}
@@ -1517,7 +1517,7 @@ void LayoutObject::handleDynamicFloatPositionChange()
setInline(style()->isDisplayInlineType());
if (isInline() != parent()->childrenInline()) {
if (!isInline()) {
- toRenderBoxModelObject(parent())->childBecameNonInline(this);
+ toLayoutBoxModelObject(parent())->childBecameNonInline(this);
} else {
// An anonymous block must be made to wrap this inline.
RenderBlock* block = toRenderBlock(parent())->createAnonymousBlock();
« no previous file with comments | « Source/core/layout/LayoutObject.h ('k') | Source/core/layout/LayoutTreeAsText.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698