Title: [227980] trunk/Source/WebCore
- Revision
- 227980
- Author
- [email protected]
- Date
- 2018-02-01 13:48:36 -0800 (Thu, 01 Feb 2018)
Log Message
[RenderTreeBuilder] Move RenderRubyRun::rubyBaseSafe to RenderTreeBuilder::Ruby
https://bugs.webkit.org/show_bug.cgi?id=182306
<rdar://problem/37041440>
Reviewed by Darin Adler.
Addressing post-review comment.
* rendering/updating/RenderTreeBuilderRuby.cpp:
(WebCore::RenderTreeBuilder::Ruby::insertChild):
(WebCore::RenderTreeBuilder::Ruby::rubyBaseSafe):
* rendering/updating/RenderTreeBuilderRuby.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (227979 => 227980)
--- trunk/Source/WebCore/ChangeLog 2018-02-01 20:30:04 UTC (rev 227979)
+++ trunk/Source/WebCore/ChangeLog 2018-02-01 21:48:36 UTC (rev 227980)
@@ -1,5 +1,20 @@
2018-02-01 Zalan Bujtas <[email protected]>
+ [RenderTreeBuilder] Move RenderRubyRun::rubyBaseSafe to RenderTreeBuilder::Ruby
+ https://bugs.webkit.org/show_bug.cgi?id=182306
+ <rdar://problem/37041440>
+
+ Reviewed by Darin Adler.
+
+ Addressing post-review comment.
+
+ * rendering/updating/RenderTreeBuilderRuby.cpp:
+ (WebCore::RenderTreeBuilder::Ruby::insertChild):
+ (WebCore::RenderTreeBuilder::Ruby::rubyBaseSafe):
+ * rendering/updating/RenderTreeBuilderRuby.h:
+
+2018-02-01 Zalan Bujtas <[email protected]>
+
[RenderTreeBuilder] Introduce RenderTreeBuilder to takeChild()
https://bugs.webkit.org/show_bug.cgi?id=182373
<rdar://problem/37101484>
Modified: trunk/Source/WebCore/rendering/updating/RenderTreeBuilderRuby.cpp (227979 => 227980)
--- trunk/Source/WebCore/rendering/updating/RenderTreeBuilderRuby.cpp 2018-02-01 20:30:04 UTC (rev 227979)
+++ trunk/Source/WebCore/rendering/updating/RenderTreeBuilderRuby.cpp 2018-02-01 21:48:36 UTC (rev 227980)
@@ -221,7 +221,7 @@
auto& run = *newRun;
m_builder.insertChild(*ruby, WTFMove(newRun), &parent);
m_builder.insertChild(run, WTFMove(child));
- moveChildrenInternal(*rubyBaseSafe(parent), *rubyBaseSafe(run), beforeChild);
+ moveChildrenInternal(rubyBaseSafe(parent), rubyBaseSafe(run), beforeChild);
}
return;
}
@@ -229,7 +229,7 @@
// (append it instead if beforeChild is the ruby text)
if (beforeChild && beforeChild->isRubyText())
beforeChild = nullptr;
- m_builder.insertChild(*rubyBaseSafe(parent), WTFMove(child), beforeChild);
+ m_builder.insertChild(rubyBaseSafe(parent), WTFMove(child), beforeChild);
}
RenderElement& RenderTreeBuilder::Ruby::findOrCreateParentForChild(RenderRubyAsBlock& parent, const RenderObject& child, RenderObject*& beforeChild)
@@ -356,7 +356,7 @@
return *lastRun;
}
-RenderRubyBase* RenderTreeBuilder::Ruby::rubyBaseSafe(RenderRubyRun& rubyRun)
+RenderRubyBase& RenderTreeBuilder::Ruby::rubyBaseSafe(RenderRubyRun& rubyRun)
{
auto* base = rubyRun.rubyBase();
if (!base) {
@@ -364,7 +364,7 @@
base = newBase.get();
m_builder.insertChildToRenderBlockFlow(rubyRun, WTFMove(newBase));
}
- return base;
+ return *base;
}
}
Modified: trunk/Source/WebCore/rendering/updating/RenderTreeBuilderRuby.h (227979 => 227980)
--- trunk/Source/WebCore/rendering/updating/RenderTreeBuilderRuby.h 2018-02-01 20:30:04 UTC (rev 227979)
+++ trunk/Source/WebCore/rendering/updating/RenderTreeBuilderRuby.h 2018-02-01 21:48:36 UTC (rev 227980)
@@ -51,7 +51,7 @@
void moveInlineChildren(RenderRubyBase& from, RenderRubyBase& to, RenderObject* beforeChild);
void moveBlockChildren(RenderRubyBase& from, RenderRubyBase& to, RenderObject* beforeChild);
void moveChildrenInternal(RenderRubyBase& from, RenderRubyBase& to, RenderObject* beforeChild = nullptr);
- RenderRubyBase* rubyBaseSafe(RenderRubyRun&);
+ RenderRubyBase& rubyBaseSafe(RenderRubyRun&);
RenderTreeBuilder& m_builder;
};
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
