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

Unified Diff: Source/core/rendering/RenderRubyRun.cpp

Issue 163513002: Have RenderBlockFlow sub-classes' methods call their super-class method properly. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 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/rendering/RenderRuby.cpp ('k') | Source/core/rendering/RenderRubyText.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderRubyRun.cpp
diff --git a/Source/core/rendering/RenderRubyRun.cpp b/Source/core/rendering/RenderRubyRun.cpp
index fe58c872243f2afbb07d15381850700c2951e2c0..d89704cd592003bbe1dc407933ff7fc825b33d4d 100644
--- a/Source/core/rendering/RenderRubyRun.cpp
+++ b/Source/core/rendering/RenderRubyRun.cpp
@@ -91,7 +91,7 @@ RenderRubyBase* RenderRubyRun::rubyBaseSafe()
RenderRubyBase* base = rubyBase();
if (!base) {
base = createRubyBase();
- RenderBlock::addChild(base);
+ RenderBlockFlow::addChild(base);
}
return base;
}
@@ -119,7 +119,7 @@ void RenderRubyRun::addChild(RenderObject* child, RenderObject* beforeChild)
// RenderRuby has already ascertained that we can add the child here.
ASSERT(!hasRubyText());
// prepend ruby texts as first child
- RenderBlock::addChild(child, firstChild());
+ RenderBlockFlow::addChild(child, firstChild());
} else if (beforeChild->isRubyText()) {
// New text is inserted just before another.
// In this case the new text takes the place of the old one, and
@@ -133,8 +133,8 @@ void RenderRubyRun::addChild(RenderObject* child, RenderObject* beforeChild)
// Note: Doing it in this order and not using RenderRubyRun's methods,
// in order to avoid automatic removal of the ruby run in case there is no
// other child besides the old ruby text.
- RenderBlock::addChild(child, beforeChild);
- RenderBlock::removeChild(beforeChild);
+ RenderBlockFlow::addChild(child, beforeChild);
+ RenderBlockFlow::removeChild(beforeChild);
newRun->addChild(beforeChild);
} else if (hasRubyBase()) {
// Insertion before a ruby base object.
@@ -176,13 +176,13 @@ void RenderRubyRun::removeChild(RenderObject* child)
}
}
- RenderBlock::removeChild(child);
+ RenderBlockFlow::removeChild(child);
if (!beingDestroyed() && !documentBeingDestroyed()) {
// Check if our base (if any) is now empty. If so, destroy it.
RenderBlock* base = rubyBase();
if (base && !base->firstChild()) {
- RenderBlock::removeChild(base);
+ RenderBlockFlow::removeChild(base);
base->deleteLineBoxTree();
base->destroy();
}
@@ -230,7 +230,7 @@ RenderObject* RenderRubyRun::layoutSpecialExcludedChild(bool relayoutChildren, S
void RenderRubyRun::layout()
{
LayoutRectRecorder recorder(*this);
- RenderBlock::layout();
+ RenderBlockFlow::layout();
RenderRubyText* rt = rubyText();
if (!rt)
« no previous file with comments | « Source/core/rendering/RenderRuby.cpp ('k') | Source/core/rendering/RenderRubyText.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698