Changeset 228503 in webkit


Ignore:
Timestamp:
Feb 14, 2018 7:41:57 PM (6 years ago)
Author:
Alan Bujtas
Message:

[RenderTreeBuilder] Move RenderMathMLFenced::addChild() to RenderTreeBuilder
​https://bugs.webkit.org/show_bug.cgi?id=182817
<rdar://problem/37556761>

Reviewed by Antti Koivisto.

No change in functionality.

  • rendering/mathml/RenderMathMLFenced.cpp:

(WebCore::RenderMathMLFenced::addChild): Deleted.

  • rendering/mathml/RenderMathMLFenced.h:
  • rendering/updating/RenderTreeBuilder.cpp:

(WebCore::RenderTreeBuilder::insertChild):
(WebCore::RenderTreeBuilder::insertChildToRenderMathMLFenced): Deleted.

  • rendering/updating/RenderTreeBuilder.h:
  • rendering/updating/RenderTreeBuilderMathML.cpp:

(WebCore::RenderTreeBuilder::MathML::insertChild):

Location:
trunk/Source/WebCore
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r228497 r228503  
     12018-02-14  Zalan Bujtas  <zalan@apple.com>
     2
     3        [RenderTreeBuilder] Move RenderMathMLFenced::addChild() to RenderTreeBuilder
     4        https://bugs.webkit.org/show_bug.cgi?id=182817
     5        <rdar://problem/37556761>
     6
     7        Reviewed by Antti Koivisto.
     8
     9        No change in functionality.
     10
     11        * rendering/mathml/RenderMathMLFenced.cpp:
     12        (WebCore::RenderMathMLFenced::addChild): Deleted.
     13        * rendering/mathml/RenderMathMLFenced.h:
     14        * rendering/updating/RenderTreeBuilder.cpp:
     15        (WebCore::RenderTreeBuilder::insertChild):
     16        (WebCore::RenderTreeBuilder::insertChildToRenderMathMLFenced): Deleted.
     17        * rendering/updating/RenderTreeBuilder.h:
     18        * rendering/updating/RenderTreeBuilderMathML.cpp:
     19        (WebCore::RenderTreeBuilder::MathML::insertChild):
     20
    1212018-02-14  Antti Koivisto  <antti@apple.com>
    222

  • trunk/Source/WebCore/rendering/mathml/RenderMathMLFenced.cpp

    r226654 r228503  
    8686}
    8787
    88 void RenderMathMLFenced::addChild(RenderTreeBuilder& builder, RenderPtr<RenderObject> child, RenderObject* beforeChild)
    89 {
    90     // make the fences if the render object is empty
    91     if (!firstChild())
    92         updateFromElement();
    93     builder.insertChildToRenderMathMLFenced(*this, WTFMove(child), beforeChild);
    94 }
    95 
    9688}
    9789

  • trunk/Source/WebCore/rendering/mathml/RenderMathMLFenced.h

    r226654 r228503  
    4747    void setCloseFenceRenderer(RenderMathMLFencedOperator& renderer) { m_closeFenceRenderer = makeWeakPtr(renderer); }
    4848
     49    void updateFromElement();
     50
    4951private:
    5052    bool isRenderMathMLFenced() const final { return true; }
    5153    const char* renderName() const final { return "RenderMathMLFenced"; }
    52     void addChild(RenderTreeBuilder&, RenderPtr<RenderObject> child, RenderObject* beforeChild) final;
    53     void updateFromElement();
    5454
    5555    String m_open;
    … …  
    6262}
    6363
     64SPECIALIZE_TYPE_TRAITS_RENDER_OBJECT(RenderMathMLFenced, isRenderMathMLFenced())
     65
    6466#endif // ENABLE(MATHML)

  • trunk/Source/WebCore/rendering/updating/RenderTreeBuilder.cpp

    r228492 r228503  
    3535#include "RenderGrid.h"
    3636#include "RenderLineBreak.h"
     37#include "RenderMathMLFenced.h"
    3738#include "RenderMenuList.h"
    3839#include "RenderRuby.h"
    … …  
    215216    }
    216217
     218    if (is<RenderMathMLFenced>(parent)) {
     219        mathMLBuilder().insertChild(downcast<RenderMathMLFenced>(parent), WTFMove(child), beforeChild);
     220        return;
     221    }
     222
    217223    parent.addChild(*this, WTFMove(child), beforeChild);
    218224}
    … …  
    508514}
    509515
    510 void RenderTreeBuilder::insertChildToRenderMathMLFenced(RenderMathMLFenced& parent, RenderPtr<RenderObject> child, RenderObject* beforeChild)
    511 {
    512     mathMLBuilder().insertChild(parent, WTFMove(child), beforeChild);
    513 }
    514 
    515516void RenderTreeBuilder::updateAfterDescendants(RenderElement& renderer)
    516517{

  • trunk/Source/WebCore/rendering/updating/RenderTreeBuilder.h

    r228492 r228503  
    7373    void insertChildToRenderTableSection(RenderTableSection& parent, RenderPtr<RenderObject> child, RenderObject* beforeChild = nullptr);
    7474    void insertChildToRenderTableRow(RenderTableRow& parent, RenderPtr<RenderObject> child, RenderObject* beforeChild = nullptr);
    75     void insertChildToRenderMathMLFenced(RenderMathMLFenced& parent, RenderPtr<RenderObject> child, RenderObject* beforeChild = nullptr);
    7675
    7776    RenderPtr<RenderObject> takeChildFromRenderElement(RenderElement& parent, RenderObject& child) WARN_UNUSED_RETURN;

  • trunk/Source/WebCore/rendering/updating/RenderTreeBuilderMathML.cpp

    r226654 r228503  
    5757void RenderTreeBuilder::MathML::insertChild(RenderMathMLFenced& parent, RenderPtr<RenderObject> child, RenderObject* beforeChild)
    5858{
    59     if (!parent.firstChild())
     59    // make the fences if the render object is empty
     60    if (!parent.firstChild()) {
     61        parent.updateFromElement();
    6062        makeFences(parent);
     63    }
    6164    // FIXME: Adding or removing a child should possibly cause all later separators to shift places
    6265    // if they're different, as later child positions change by +1 or -1.
Note: See TracChangeset for help on using the changeset viewer.