Attachment 340976 Details for Bug 185865 – Patch

[patch] Patch

bug-185865-20180522144352.patch (text/plain), 6.14 KB, created by Olivier Blin on 2018-05-22 05:43:53 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Olivier Blin

Created: 2018-05-22 05:43:53 PDT

Size: 6.14 KB

patch

obsolete

>Subversion Revision: 232057
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index e5f6f8ffe140c040fa001774e42e7bb4ae0e1ff7..c7fd058ef96064c3751805341dfeb08f65c19e1e 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,27 @@
>+2018-05-22  Olivier Blin  <olivier.blin@softathome.com>
>+
>+        Fix build without MathML
>+        https://bugs.webkit.org/show_bug.cgi?id=185865
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Regression(r226654): [RenderTreeBuilder] Move MathML addChild logic to RenderTreeBuilder
>+        https://bugs.webkit.org/show_bug.cgi?id=181443
>+
>+        Regression(r229694): Put the DOM in IsoHeaps
>+        https://bugs.webkit.org/show_bug.cgi?id=183546
>+
>+        No new tests, build fix.
>+
>+        * mathml/MathMLUnknownElement.cpp:
>+        * mathml/MathMLUnknownElement.h:
>+        * rendering/updating/RenderTreeBuilder.cpp:
>+        (WebCore::RenderTreeBuilder::RenderTreeBuilder):
>+        (WebCore::RenderTreeBuilder::attach):
>+        * rendering/updating/RenderTreeBuilder.h:
>+        * rendering/updating/RenderTreeBuilderMathML.cpp:
>+        * rendering/updating/RenderTreeBuilderMathML.h:
>+
> 2018-05-21  Yusuke Suzuki  <utatane.tea@gmail.com>
> 
>         Use more C++17
>diff --git a/Source/WebCore/mathml/MathMLUnknownElement.cpp b/Source/WebCore/mathml/MathMLUnknownElement.cpp
>index bdfb51b0e55af4f5104b2c211d1ec5f745593494..4799fbeb945844a96caa988a80956f2a87017f52 100644
>--- a/Source/WebCore/mathml/MathMLUnknownElement.cpp
>+++ b/Source/WebCore/mathml/MathMLUnknownElement.cpp
>@@ -26,6 +26,8 @@
> #include "config.h"
> #include "MathMLUnknownElement.h"
> 
>+#if ENABLE(MATHML)
>+
> #include <wtf/IsoMallocInlines.h>
> 
> namespace WebCore {
>@@ -34,3 +36,4 @@ WTF_MAKE_ISO_ALLOCATED_IMPL(MathMLUnknownElement);
> 
> } // namespace WebCore
> 
>+#endif // ENABLE(MATHML)
>diff --git a/Source/WebCore/mathml/MathMLUnknownElement.h b/Source/WebCore/mathml/MathMLUnknownElement.h
>index 6f6873533837aa1a0e3896260f93d0fc34aecae3..cfd3ea7a6ed8788f69edd874c9b28efbc99ff4be 100644
>--- a/Source/WebCore/mathml/MathMLUnknownElement.h
>+++ b/Source/WebCore/mathml/MathMLUnknownElement.h
>@@ -25,6 +25,8 @@
> 
> #pragma once
> 
>+#if ENABLE(MATHML)
>+
> #include "MathMLElement.h"
> 
> namespace WebCore {
>@@ -47,3 +49,5 @@ private:
> };
> 
> } // namespace WebCore
>+
>+#endif // ENABLE(MATHML)
>diff --git a/Source/WebCore/rendering/updating/RenderTreeBuilder.cpp b/Source/WebCore/rendering/updating/RenderTreeBuilder.cpp
>index 9947d09879dbbfda6f18a92d6687b4e2fb78e8ff..a1f364d23b18df18c5075fe2c896c35b2c91ae86 100644
>--- a/Source/WebCore/rendering/updating/RenderTreeBuilder.cpp
>+++ b/Source/WebCore/rendering/updating/RenderTreeBuilder.cpp
>@@ -131,7 +131,9 @@ RenderTreeBuilder::RenderTreeBuilder(RenderView& view)
>     , m_blockFlowBuilder(std::make_unique<BlockFlow>(*this))
>     , m_inlineBuilder(std::make_unique<Inline>(*this))
>     , m_svgBuilder(std::make_unique<SVG>(*this))
>+#if ENABLE(MATHML)
>     , m_mathMLBuilder(std::make_unique<MathML>(*this))
>+#endif
>     , m_continuationBuilder(std::make_unique<Continuation>(*this))
> #if ENABLE(FULLSCREEN_API)
>     , m_fullScreenBuilder(std::make_unique<FullScreen>(*this))
>@@ -270,10 +272,12 @@ void RenderTreeBuilder::attach(RenderElement& parent, RenderPtr<RenderObject> ch
>         return;
>     }
> 
>+#if ENABLE(MATHML)
>     if (is<RenderMathMLFenced>(parent)) {
>         mathMLBuilder().attach(downcast<RenderMathMLFenced>(parent), WTFMove(child), beforeChild);
>         return;
>     }
>+#endif
> 
>     if (is<RenderGrid>(parent)) {
>         attachToRenderGrid(downcast<RenderGrid>(parent), WTFMove(child), beforeChild);
>diff --git a/Source/WebCore/rendering/updating/RenderTreeBuilder.h b/Source/WebCore/rendering/updating/RenderTreeBuilder.h
>index 559da940b36e64dd3a8bc9a5acafdece2ffd8f28..7e9369200089f791ca5ee69c507349a46a61f015 100644
>--- a/Source/WebCore/rendering/updating/RenderTreeBuilder.h
>+++ b/Source/WebCore/rendering/updating/RenderTreeBuilder.h
>@@ -94,7 +94,9 @@ private:
>     class BlockFlow;
>     class Inline;
>     class SVG;
>+#if ENABLE(MATHML)
>     class MathML;
>+#endif
>     class Continuation;
> #if ENABLE(FULLSCREEN_API)
>     class FullScreen;
>@@ -110,7 +112,9 @@ private:
>     BlockFlow& blockFlowBuilder() { return *m_blockFlowBuilder; }
>     Inline& inlineBuilder() { return *m_inlineBuilder; }
>     SVG& svgBuilder() { return *m_svgBuilder; }
>+#if ENABLE(MATHML)
>     MathML& mathMLBuilder() { return *m_mathMLBuilder; }
>+#endif
>     Continuation& continuationBuilder() { return *m_continuationBuilder; }
> #if ENABLE(FULLSCREEN_API)
>     FullScreen& fullScreenBuilder() { return *m_fullScreenBuilder; }
>@@ -130,7 +134,9 @@ private:
>     std::unique_ptr<BlockFlow> m_blockFlowBuilder;
>     std::unique_ptr<Inline> m_inlineBuilder;
>     std::unique_ptr<SVG> m_svgBuilder;
>+#if ENABLE(MATHML)
>     std::unique_ptr<MathML> m_mathMLBuilder;
>+#endif
>     std::unique_ptr<Continuation> m_continuationBuilder;
> #if ENABLE(FULLSCREEN_API)
>     std::unique_ptr<FullScreen> m_fullScreenBuilder;
>diff --git a/Source/WebCore/rendering/updating/RenderTreeBuilderMathML.cpp b/Source/WebCore/rendering/updating/RenderTreeBuilderMathML.cpp
>index 5cb478b317a9869968d955df3aaf140cf399bff7..a7b6060cbe048da5b9bcf973d8c71094e2bcc902 100644
>--- a/Source/WebCore/rendering/updating/RenderTreeBuilderMathML.cpp
>+++ b/Source/WebCore/rendering/updating/RenderTreeBuilderMathML.cpp
>@@ -26,6 +26,8 @@
> #include "config.h"
> #include "RenderTreeBuilderMathML.h"
> 
>+#if ENABLE(MATHML)
>+
> #include "RenderMathMLFenced.h"
> #include "RenderMathMLFencedOperator.h"
> #include "RenderTreeBuilderBlock.h"
>@@ -108,3 +110,5 @@ void RenderTreeBuilder::MathML::attach(RenderMathMLFenced& parent, RenderPtr<Ren
> }
> 
> }
>+
>+#endif // ENABLE(MATHML)
>diff --git a/Source/WebCore/rendering/updating/RenderTreeBuilderMathML.h b/Source/WebCore/rendering/updating/RenderTreeBuilderMathML.h
>index 1ccd7cec39ce353fdd3599233b3fb577d2fa6dab..0565b518483722b673120a4ae945d67306bdca81 100644
>--- a/Source/WebCore/rendering/updating/RenderTreeBuilderMathML.h
>+++ b/Source/WebCore/rendering/updating/RenderTreeBuilderMathML.h
>@@ -25,6 +25,8 @@
> 
> #pragma once
> 
>+#if ENABLE(MATHML)
>+
> #include "MathMLOperatorDictionary.h"
> #include "RenderTreeBuilder.h"
> 
>@@ -48,3 +50,5 @@ private:
> };
> 
> }
>+
>+#endif // ENABLE(MATHML)

Actions: View | Formatted Diff | Diff

Attachments on bug 185865: 340976