Title: [228670] releases/WebKitGTK/webkit-2.20/Source/WebCore
Revision
228670
Author
carlo...@webkit.org
Date
2018-02-19 05:17:39 -0800 (Mon, 19 Feb 2018)

Log Message

Merge r228289 - [RenderTreeBuilder] Do not use RenderTreeBuilder::current() in RenderRubyRun::takeChild
https://bugs.webkit.org/show_bug.cgi?id=182607
<rdar://problem/37355944>

Reviewed by Sam Weinig.

No change in functionality.

* rendering/RenderRubyRun.cpp:
(WebCore::RenderRubyRun::takeChild):

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/ChangeLog (228669 => 228670)


--- releases/WebKitGTK/webkit-2.20/Source/WebCore/ChangeLog	2018-02-19 13:17:35 UTC (rev 228669)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/ChangeLog	2018-02-19 13:17:39 UTC (rev 228670)
@@ -1,3 +1,16 @@
+2018-02-08  Zalan Bujtas  <za...@apple.com>
+
+        [RenderTreeBuilder] Do not use RenderTreeBuilder::current() in RenderRubyRun::takeChild
+        https://bugs.webkit.org/show_bug.cgi?id=182607
+        <rdar://problem/37355944>
+
+        Reviewed by Sam Weinig.
+
+        No change in functionality.
+
+        * rendering/RenderRubyRun.cpp:
+        (WebCore::RenderRubyRun::takeChild):
+
 2018-02-08  Antti Koivisto  <an...@apple.com>
 
         Use invalidation rulesets for attribute selectors

Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderRubyRun.cpp (228669 => 228670)


--- releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderRubyRun.cpp	2018-02-19 13:17:35 UTC (rev 228669)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderRubyRun.cpp	2018-02-19 13:17:39 UTC (rev 228670)
@@ -110,7 +110,7 @@
             if (rightRun.hasRubyBase()) {
                 RenderRubyBase* rightBase = rightRun.rubyBase();
                 // Collect all children in a single base, then swap the bases.
-                RenderTreeBuilder::current()->moveRubyChildren(*rightBase, *base);
+                builder.moveRubyChildren(*rightBase, *base);
                 moveChildTo(builder, &rightRun, base, RenderBoxModelObject::NormalizeAfterInsertion::No);
                 rightRun.moveChildTo(builder, this, rightBase, RenderBoxModelObject::NormalizeAfterInsertion::No);
                 // The now empty ruby base will be removed below.
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to