Changeset 226654 in webkit

Timestamp:

Jan 9, 2018 12:15:19 PM (6 years ago)

Author:

Alan Bujtas

Message:

[RenderTreeBuilder] Move MathML addChild logic to RenderTreeBuilder
​https://bugs.webkit.org/show_bug.cgi?id=181443
<rdar://problem/36380228>

Reviewed by Antti Koivisto.

This is about moving code, no cleanup and/or normalization (unfortunately it also means
some temporary changes).

No change in functionality.

• Sources.txt:
• WebCore.xcodeproj/project.pbxproj:
• rendering/mathml/RenderMathMLFenced.cpp:

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

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

(WebCore::RenderTreeBuilder::RenderTreeBuilder):
(WebCore::RenderTreeBuilder::insertChildToRenderMathMLFenced):

• rendering/updating/RenderTreeBuilder.h:

(WebCore::RenderTreeBuilder::mathMLBuilder):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Sources.txt (modified) (1 diff)
• WebCore.xcodeproj/project.pbxproj (modified) (2 diffs)
• rendering/mathml/RenderMathMLFenced.cpp (modified) (2 diffs)
• rendering/mathml/RenderMathMLFenced.h (modified) (2 diffs)
• rendering/updating/RenderTreeBuilder.cpp (modified) (3 diffs)
• rendering/updating/RenderTreeBuilder.h (modified) (5 diffs)
• rendering/updating/RenderTreeBuilderMathML.cpp (added)
• rendering/updating/RenderTreeBuilderMathML.h (added)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-01-09  Zalan Bujtas  <zalan@apple.com>
+
+        [RenderTreeBuilder] Move MathML addChild logic to RenderTreeBuilder
+        https://bugs.webkit.org/show_bug.cgi?id=181443
+        <rdar://problem/36380228>
+
+        Reviewed by Antti Koivisto.
+
+        This is about moving code, no cleanup and/or normalization (unfortunately it also means
+        some temporary changes).  
+
+        No change in functionality.
+
+        * Sources.txt:
+        * WebCore.xcodeproj/project.pbxproj:
+        * rendering/mathml/RenderMathMLFenced.cpp:
+        (WebCore::RenderMathMLFenced::addChild):
+        (WebCore::RenderMathMLFenced::createMathMLOperator): Deleted.
+        (WebCore::RenderMathMLFenced::makeFences): Deleted.
+        * rendering/mathml/RenderMathMLFenced.h:
+        * rendering/updating/RenderTreeBuilder.cpp:
+        (WebCore::RenderTreeBuilder::RenderTreeBuilder):
+        (WebCore::RenderTreeBuilder::insertChildToRenderMathMLFenced):
+        * rendering/updating/RenderTreeBuilder.h:
+        (WebCore::RenderTreeBuilder::mathMLBuilder):
+
 2018-01-09  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/Sources.txt

@@ -1990 +1990 @@
 rendering/updating/RenderTreeBuilderInline.cpp
 rendering/updating/RenderTreeBuilderList.cpp
+rendering/updating/RenderTreeBuilderMathML.cpp
 rendering/updating/RenderTreeBuilderMultiColumn.cpp
 rendering/updating/RenderTreeBuilderRuby.cpp

trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -5598 +5598 @@
                 11C5F12A2004231D0001AE60 /* RenderTreeBuilderSVG.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderTreeBuilderSVG.h; sourceTree = "<group>"; };
                 11C5F12C2004231E0001AE60 /* RenderTreeBuilderSVG.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderTreeBuilderSVG.cpp; sourceTree = "<group>"; };
+                11C5F132200527F80001AE60 /* RenderTreeBuilderMathML.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderTreeBuilderMathML.cpp; sourceTree = "<group>"; };
+                11C5F134200527F90001AE60 /* RenderTreeBuilderMathML.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderTreeBuilderMathML.h; sourceTree = "<group>"; };
                 11E067EB1E62461300162D16 /* SimpleLineLayoutCoverage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SimpleLineLayoutCoverage.cpp; sourceTree = "<group>"; };
                 11E067ED1E6246E500162D16 /* SimpleLineLayoutCoverage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SimpleLineLayoutCoverage.h; sourceTree = "<group>"; };
@@ -24646 +24648 @@
                                 E47C392B1FE6E0DF00BBBC6B /* RenderTreeBuilderList.cpp */,
                                 E47C39281FE6E0DD00BBBC6B /* RenderTreeBuilderList.h */,
+                                11C5F132200527F80001AE60 /* RenderTreeBuilderMathML.cpp */,
+                                11C5F134200527F90001AE60 /* RenderTreeBuilderMathML.h */,
                                 E47C39231FE6E0DA00BBBC6B /* RenderTreeBuilderMultiColumn.cpp */,
                                 E47C39271FE6E0DC00BBBC6B /* RenderTreeBuilderMultiColumn.h */,

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

@@ -35 +35 @@
 #include "RenderMathMLFencedOperator.h"
 #include "RenderText.h"
+#include "RenderTreeBuilder.h"
 #include <wtf/IsoMallocInlines.h>
 #include <wtf/text/StringBuilder.h>
@@ -85 +86 @@
 }
 
-RenderPtr<RenderMathMLFencedOperator> RenderMathMLFenced::createMathMLOperator(const String& operatorString, MathMLOperatorDictionary::Form form, MathMLOperatorDictionary::Flag flag)
-{
-    RenderPtr<RenderMathMLFencedOperator> newOperator = createRenderer<RenderMathMLFencedOperator>(document(), RenderStyle::createAnonymousStyleWithDisplay(style(), BLOCK), operatorString, form, flag);
-    newOperator->initializeStyle();
-    return newOperator;
-}
-
-void RenderMathMLFenced::makeFences(RenderTreeBuilder& builder)
-{
-    auto openFence = createMathMLOperator(m_open, MathMLOperatorDictionary::Prefix, MathMLOperatorDictionary::Fence);
-    RenderMathMLRow::addChild(builder, WTFMove(openFence), firstChild());
-
-    auto closeFence = createMathMLOperator(m_close, MathMLOperatorDictionary::Postfix, MathMLOperatorDictionary::Fence);
-    m_closeFenceRenderer = makeWeakPtr(*closeFence);
-    RenderMathMLRow::addChild(builder, WTFMove(closeFence));
-}
-
 void RenderMathMLFenced::addChild(RenderTreeBuilder& builder, RenderPtr<RenderObject> child, RenderObject* beforeChild)
 {
     // make the fences if the render object is empty
-    if (!firstChild()) {
+    if (!firstChild())
         updateFromElement();
-        makeFences(builder);
-    }
-
-    // FIXME: Adding or removing a child should possibly cause all later separators to shift places if they're different, as later child positions change by +1 or -1. This should also handle surrogate pairs. See https://bugs.webkit.org/show_bug.cgi?id=125938.
-
-    RenderPtr<RenderMathMLFencedOperator> separatorRenderer;
-    if (m_separators.get()) {
-        unsigned int count = 0;
-        for (Node* position = child->node(); position; position = position->previousSibling()) {
-            if (position->isElementNode())
-                count++;
-        }
-        if (!beforeChild) {
-            // We're adding at the end (before the closing fence), so a new separator would go before the new child, not after it.
-            --count;
-        }
-        // |count| is now the number of element children that will be before our new separator, i.e. it's the 1-based index of the separator.
-
-        if (count > 0) {
-            UChar separator;
-
-            // Use the last separator if we've run out of specified separators.
-            if (count > m_separators.get()->length())
-                separator = (*m_separators.get())[m_separators.get()->length() - 1];
-            else
-                separator = (*m_separators.get())[count - 1];
-
-            StringBuilder stringBuilder;
-            stringBuilder.append(separator);
-            separatorRenderer = createMathMLOperator(stringBuilder.toString(), MathMLOperatorDictionary::Infix, MathMLOperatorDictionary::Separator);
-        }
-    }
-
-    if (beforeChild) {
-        // Adding |x| before an existing |y| e.g. in element (y) - first insert our new child |x|, then its separator, to get (x, y).
-        RenderMathMLRow::addChild(builder, WTFMove(child), beforeChild);
-        if (separatorRenderer)
-            RenderMathMLRow::addChild(builder, WTFMove(separatorRenderer), beforeChild);
-    } else {
-        // Adding |y| at the end of an existing element e.g. (x) - insert the separator first before the closing fence, then |y|, to get (x, y).
-        if (separatorRenderer)
-            RenderMathMLRow::addChild(builder, WTFMove(separatorRenderer), m_closeFenceRenderer.get());
-        RenderMathMLRow::addChild(builder, WTFMove(child), m_closeFenceRenderer.get());
-    }
+    builder.insertChildToRenderMathMLFenced(*this, WTFMove(child), beforeChild);
 }
 

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

@@ -40 +40 @@
     RenderMathMLFenced(MathMLRowElement&, RenderStyle&&);
 
+    StringImpl* separators() const { return m_separators.get(); }
+    String openingBrace() const { return m_open; }
+    String closingBrace() const { return m_close; }
+
+    RenderMathMLFencedOperator* closeFenceRenderer() const { return m_closeFenceRenderer.get(); }
+    void setCloseFenceRenderer(RenderMathMLFencedOperator& renderer) { m_closeFenceRenderer = makeWeakPtr(renderer); }
+
 private:
     bool isRenderMathMLFenced() const final { return true; }
@@ -45 +52 @@
     void addChild(RenderTreeBuilder&, RenderPtr<RenderObject> child, RenderObject* beforeChild) final;
     void updateFromElement();
-
-    RenderPtr<RenderMathMLFencedOperator> createMathMLOperator(const String& operatorString, MathMLOperatorDictionary::Form, MathMLOperatorDictionary::Flag);
-    void makeFences(RenderTreeBuilder&);
 
     String m_open;

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

@@ -42 +42 @@
 #include "RenderTreeBuilderInline.h"
 #include "RenderTreeBuilderList.h"
+#include "RenderTreeBuilderMathML.h"
 #include "RenderTreeBuilderMultiColumn.h"
 #include "RenderTreeBuilderRuby.h"
@@ -115 +116 @@
     , m_inlineBuilder(std::make_unique<Inline>(*this))
     , m_svgBuilder(std::make_unique<SVG>(*this))
+    , m_mathMLBuilder(std::make_unique<MathML>(*this))
 {
     RELEASE_ASSERT(!s_current || &m_view != &s_current->m_view);
@@ -335 +337 @@
 }
 
+void RenderTreeBuilder::insertChildToRenderMathMLFenced(RenderMathMLFenced& parent, RenderPtr<RenderObject> child, RenderObject* beforeChild)
+{
+    mathMLBuilder().insertChild(parent, WTFMove(child), beforeChild);
+}
+
 void RenderTreeBuilder::updateAfterDescendants(RenderElement& renderer)
 {

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

@@ -30 +30 @@
 namespace WebCore {
 
+class RenderMathMLFenced;
 class RenderRubyRun;
 class RenderSVGContainer;
@@ -67 +68 @@
     void insertChildToRenderTableSection(RenderTableSection& parent, RenderPtr<RenderObject> child, RenderObject* beforeChild = nullptr);
     void insertChildToRenderTableRow(RenderTableRow& parent, RenderPtr<RenderObject> child, RenderObject* beforeChild = nullptr);
+    void insertChildToRenderMathMLFenced(RenderMathMLFenced& parent, RenderPtr<RenderObject> child, RenderObject* beforeChild = nullptr);
 
     void makeChildrenNonInline(RenderBlock& parent, RenderObject* insertionPoint = nullptr);
@@ -83 +85 @@
     class Inline;
     class SVG;
+    class MathML;
 
     FirstLetter& firstLetterBuilder() { return *m_firstLetterBuilder; }
@@ -94 +97 @@
     Inline& inlineBuilder() { return *m_inlineBuilder; }
     SVG& svgBuilder() { return *m_svgBuilder; }
+    MathML& mathMLBuilder() { return *m_mathMLBuilder; }
 
     RenderView& m_view;
@@ -110 +114 @@
     std::unique_ptr<Inline> m_inlineBuilder;
     std::unique_ptr<SVG> m_svgBuilder;
+    std::unique_ptr<MathML> m_mathMLBuilder;
 };