Changeset 228670 in webkit


Ignore:
Timestamp:
Feb 19, 2018 5:17:39 AM (6 years ago)
Author:
Carlos Garcia Campos
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):

Location:
releases/WebKitGTK/webkit-2.20/Source/WebCore
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • releases/WebKitGTK/webkit-2.20/Source/WebCore/ChangeLog

    r228669 r228670  
     12018-02-08  Zalan Bujtas  <zalan@apple.com>
     2
     3        [RenderTreeBuilder] Do not use RenderTreeBuilder::current() in RenderRubyRun::takeChild
     4        https://bugs.webkit.org/show_bug.cgi?id=182607
     5        <rdar://problem/37355944>
     6
     7        Reviewed by Sam Weinig.
     8
     9        No change in functionality.
     10
     11        * rendering/RenderRubyRun.cpp:
     12        (WebCore::RenderRubyRun::takeChild):
     13
    1142018-02-08  Antti Koivisto  <antti@apple.com>
    215
  • releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderRubyRun.cpp

    r228668 r228670  
    111111                RenderRubyBase* rightBase = rightRun.rubyBase();
    112112                // Collect all children in a single base, then swap the bases.
    113                 RenderTreeBuilder::current()->moveRubyChildren(*rightBase, *base);
     113                builder.moveRubyChildren(*rightBase, *base);
    114114                moveChildTo(builder, &rightRun, base, RenderBoxModelObject::NormalizeAfterInsertion::No);
    115115                rightRun.moveChildTo(builder, this, rightBase, RenderBoxModelObject::NormalizeAfterInsertion::No);
Note: See TracChangeset for help on using the changeset viewer.