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

Unified Diff: Source/core/layout/LayoutRubyBase.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
Index: Source/core/layout/LayoutRubyBase.cpp
diff --git a/Source/core/layout/LayoutRubyBase.cpp b/Source/core/layout/LayoutRubyBase.cpp
index 0d5f0d390a8d557f66c7dc86363c3c0afca658fb..aeb86163371bdde0e92fcef9d024d5a00f5e9814 100644
--- a/Source/core/layout/LayoutRubyBase.cpp
+++ b/Source/core/layout/LayoutRubyBase.cpp
@@ -53,12 +53,12 @@ LayoutRubyBase* LayoutRubyBase::createAnonymous(Document* document)
return layoutObject;
}
-bool LayoutRubyBase::isChildAllowed(RenderObject* child, RenderStyle*) const
+bool LayoutRubyBase::isChildAllowed(LayoutObject* child, RenderStyle*) const
{
return child->isInline();
}
-void LayoutRubyBase::moveChildren(LayoutRubyBase* toBase, RenderObject* beforeChild)
+void LayoutRubyBase::moveChildren(LayoutRubyBase* toBase, LayoutObject* beforeChild)
{
// This function removes all children that are before (!) beforeChild
// and appends them to toBase.
@@ -76,7 +76,7 @@ void LayoutRubyBase::moveChildren(LayoutRubyBase* toBase, RenderObject* beforeCh
toBase->setNeedsLayoutAndPrefWidthsRecalcAndFullPaintInvalidation();
}
-void LayoutRubyBase::moveInlineChildren(LayoutRubyBase* toBase, RenderObject* beforeChild)
+void LayoutRubyBase::moveInlineChildren(LayoutRubyBase* toBase, LayoutObject* beforeChild)
{
ASSERT(childrenInline());
ASSERT_ARG(toBase, toBase);
@@ -91,7 +91,7 @@ void LayoutRubyBase::moveInlineChildren(LayoutRubyBase* toBase, RenderObject* be
} else {
// We need to wrap the inline objects into an anonymous block.
// If toBase has a suitable block, we re-use it, otherwise create a new one.
- RenderObject* lastChild = toBase->lastChild();
+ LayoutObject* lastChild = toBase->lastChild();
if (lastChild && lastChild->isAnonymousBlock() && lastChild->childrenInline()) {
toBlock = toRenderBlock(lastChild);
} else {
@@ -103,7 +103,7 @@ void LayoutRubyBase::moveInlineChildren(LayoutRubyBase* toBase, RenderObject* be
moveChildrenTo(toBlock, firstChild(), beforeChild);
}
-void LayoutRubyBase::moveBlockChildren(LayoutRubyBase* toBase, RenderObject* beforeChild)
+void LayoutRubyBase::moveBlockChildren(LayoutRubyBase* toBase, LayoutObject* beforeChild)
{
ASSERT(!childrenInline());
ASSERT_ARG(toBase, toBase);
@@ -115,8 +115,8 @@ void LayoutRubyBase::moveBlockChildren(LayoutRubyBase* toBase, RenderObject* bef
toBase->makeChildrenNonInline();
// If an anonymous block would be put next to another such block, then merge those.
- RenderObject* firstChildHere = firstChild();
- RenderObject* lastChildThere = toBase->lastChild();
+ LayoutObject* firstChildHere = firstChild();
+ LayoutObject* lastChildThere = toBase->lastChild();
if (firstChildHere->isAnonymousBlock() && firstChildHere->childrenInline()
&& lastChildThere && lastChildThere->isAnonymousBlock() && lastChildThere->childrenInline()) {
RenderBlock* anonBlockHere = toRenderBlock(firstChildHere);

Powered by Google App Engine
This is Rietveld 408576698