Attachment 286612 Details for Bug 161050 – Patch

[patch] Patch

bug-161050-20160822212737.patch (text/plain), 21.98 KB, created by Frédéric Wang Nélar on 2016-08-22 12:29:35 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Frédéric Wang Nélar

Created: 2016-08-22 12:29:35 PDT

Size: 21.98 KB

patch

obsolete

>Subversion Revision: 204727
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 70b2d74bca790da1681761f9720a7142c4315d3d..5246f77e6e4c70318a914d4a3b37d6c26e8cc9ce 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,40 @@
>+2016-08-22  Frederic Wang  <fwang@igalia.com>
>+
>+        Introduce a MathMLRowElement class for mrow-like elements
>+        https://bugs.webkit.org/show_bug.cgi?id=161050
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        We introduce a MathMLRowElement class for elements creating RenderMathMLRow renderers.
>+
>+        No new tests, behavior is unchanged.
>+
>+        * CMakeLists.txt: Add MathMLRowElement files.
>+        * WebCore.xcodeproj/project.pbxproj: Ditto.
>+        * mathml/MathMLAllInOne.cpp: Ditto.
>+        * mathml/MathMLInlineContainerElement.cpp: Remove unused headers.
>+        (WebCore::MathMLInlineContainerElement::createElementRenderer): Handle some mrow-like
>+        elements in the MathMLRowElement class.
>+        (WebCore::MathMLInlineContainerElement::acceptsDisplayStyleAttribute): Ditto.
>+        (WebCore::MathMLInlineContainerElement::childrenChanged): Deleted. We only need to calculate
>+        the form for operators inside a MathMLRowElement.
>+        (WebCore::MathMLInlineContainerElement::acceptsMathVariantAttribute): Deleted. mstyle is
>+        handled in the MathMLRowElement class.
>+        * mathml/MathMLInlineContainerElement.h: Update function declarations.
>+        * mathml/MathMLMathElement.cpp: Make this class inherits from MathMLRowElement.
>+        * mathml/MathMLMathElement.h: Ditto.
>+        * mathml/MathMLPaddedElement.cpp: Ditto.
>+        * mathml/MathMLPaddedElement.h: Ditto.
>+        * mathml/MathMLRowElement.cpp: New class for mrow-like element.
>+        (WebCore::MathMLRowElement::MathMLRowElement):
>+        (WebCore::MathMLRowElement::create):
>+        (WebCore::MathMLRowElement::childrenChanged): Move code from MathMLInlineContainerElement.
>+        (WebCore::MathMLRowElement::createElementRenderer): Ditto.
>+        (WebCore::MathMLRowElement::acceptsDisplayStyleAttribute): Ditto.
>+        (WebCore::MathMLRowElement::acceptsMathVariantAttribute): Ditto.
>+        * mathml/MathMLRowElement.h:
>+        * mathml/mathtags.in: Map tags creating RenderMathMLRow renderers to MathMLRowElement.
>+
> 2016-08-22  Alex Christensen  <achristensen@webkit.org>
> 
>         Fix bindings tests after r204717.
>diff --git a/Source/WebCore/CMakeLists.txt b/Source/WebCore/CMakeLists.txt
>index d1e9d2e36e0aa5cb858610884a2ee030ab965487..15dd78375b26430c73c189e9627ba49ab3625e6b 100644
>--- a/Source/WebCore/CMakeLists.txt
>+++ b/Source/WebCore/CMakeLists.txt
>@@ -2011,6 +2011,7 @@ set(WebCore_SOURCES
>     mathml/MathMLOperatorDictionary.cpp
>     mathml/MathMLOperatorElement.cpp
>     mathml/MathMLPaddedElement.cpp
>+    mathml/MathMLRowElement.cpp
>     mathml/MathMLScriptsElement.cpp
>     mathml/MathMLSelectElement.cpp
>     mathml/MathMLSpaceElement.cpp
>diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
>index 2584780f762f9fb12b5b1f8717df16405bc7cd42..885efe88a0a569a9d4d28c97b1c0318ac2391a02 100644
>--- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj
>+++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
>@@ -6312,9 +6312,11 @@
> 		F98FFF4511A2676200F548E8 /* CSSOMUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = F98FFF4311A2676200F548E8 /* CSSOMUtils.h */; };
> 		F9F0ED7A0DB50CA200D16DB9 /* XMLHttpRequestProgressEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = F9F0ED770DB50CA200D16DB9 /* XMLHttpRequestProgressEvent.h */; };
> 		FA654A6B1108ABED002615E0 /* MathMLTokenElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FA654A691108ABED002615E0 /* MathMLTokenElement.cpp */; };
>+		FA765A6B1108ABED002615E0 /* MathMLRowElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FA765A691108ABED002615E0 /* MathMLRowElement.cpp */; };
> 		FA654A6B1108ABED002616F1 /* MathMLOperatorElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FA654A691108ABED002616F1 /* MathMLOperatorElement.cpp */; };
> 		FA654A6B1108ABED002626F1 /* MathMLUnderOverElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FA654A691108ABED002626F1 /* MathMLUnderOverElement.cpp */; };
> 		FA654A6C1108ABED002615E0 /* MathMLTokenElement.h in Headers */ = {isa = PBXBuildFile; fileRef = FA654A6A1108ABED002615E0 /* MathMLTokenElement.h */; };
>+		FA765A6C1108ABED002615E0 /* MathMLRowElement.h in Headers */ = {isa = PBXBuildFile; fileRef = FA765A6A1108ABED002615E0 /* MathMLRowElement.h */; };
> 		FA654A6C1108ABED002616F1 /* MathMLOperatorElement.h in Headers */ = {isa = PBXBuildFile; fileRef = FA654A6A1108ABED002616F1 /* MathMLOperatorElement.h */; };
> 		FA654A6C1108ABED002626F1 /* MathMLUnderOverElement.h in Headers */ = {isa = PBXBuildFile; fileRef = FA654A6A1108ABED002626F1 /* MathMLUnderOverElement.h */; };
> 		FABE72F41059C1EB00D888CC /* MathMLAnnotationElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FABE72ED1059C1EB00D888CC /* MathMLAnnotationElement.cpp */; };
>@@ -13884,9 +13886,11 @@
> 		FA654A631108ABB7002615E0 /* mathml.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = mathml.css; sourceTree = "<group>"; };
> 		FA654A671108ABE2002615E0 /* mathattrs.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mathattrs.in; sourceTree = "<group>"; };
> 		FA654A691108ABED002615E0 /* MathMLTokenElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MathMLTokenElement.cpp; sourceTree = "<group>"; };
>+		FA765A691108ABED002615E0 /* MathMLRowElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MathMLRowElement.cpp; sourceTree = "<group>"; };
> 		FA654A691108ABED002616F1 /* MathMLOperatorElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MathMLOperatorElement.cpp; sourceTree = "<group>"; };
> 		FA654A691108ABED002626F1 /* MathMLUnderOverElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MathMLUnderOverElement.cpp; sourceTree = "<group>"; };
> 		FA654A6A1108ABED002615E0 /* MathMLTokenElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MathMLTokenElement.h; sourceTree = "<group>"; };
>+		FA765A6A1108ABED002615E0 /* MathMLRowElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MathMLRowElement.h; sourceTree = "<group>"; };
> 		FA654A6A1108ABED002616F1 /* MathMLOperatorElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MathMLOperatorElement.h; sourceTree = "<group>"; };
> 		FA654A6A1108ABED002626F1 /* MathMLUnderOverElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MathMLUnderOverElement.h; sourceTree = "<group>"; };
> 		FA6E466FCD0418A9966A5B60 /* DNSResolveQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DNSResolveQueue.h; sourceTree = "<group>"; };
>@@ -23142,6 +23146,8 @@
> 				4FA65A6A1108ABED002615E0 /* MathMLSpaceElement.h */,
> 				FA654A691108ABED002615E0 /* MathMLTokenElement.cpp */,
> 				FA654A6A1108ABED002615E0 /* MathMLTokenElement.h */,
>+				FA765A691108ABED002615E0 /* MathMLRowElement.cpp */,
>+				FA765A6A1108ABED002615E0 /* MathMLRowElement.h */,
> 				FA654A691108ABED002626F1 /* MathMLUnderOverElement.cpp */,
> 				FA654A6A1108ABED002626F1 /* MathMLUnderOverElement.h */,
> 				FABE72F31059C1EB00D999DD /* mathtags.in */,
>@@ -25375,6 +25381,7 @@
> 				4FA65A6C1108ABED002615E0 /* MathMLSpaceElement.h in Headers */,
> 				439176E012DA25E17BAF80A2 /* MathMLStyle.h in Headers */,
> 				FA654A6C1108ABED002615E0 /* MathMLTokenElement.h in Headers */,
>+				FA765A6C1108ABED002615E0 /* MathMLRowElement.h in Headers */,
> 				FA654A6C1108ABED002626F1 /* MathMLUnderOverElement.h in Headers */,
> 				439046EA12DA25E812AF80AC /* MathOperator.h in Headers */,
> 				49D5DC2C0F423A73008F20FD /* Matrix3DTransformOperation.h in Headers */,
>@@ -29059,6 +29066,7 @@
> 				4FA65A6B1108ABED002615E0 /* MathMLSpaceElement.cpp in Sources */,
> 				439176DF12DA25E17BAF80A2 /* MathMLStyle.cpp in Sources */,
> 				FA654A6B1108ABED002615E0 /* MathMLTokenElement.cpp in Sources */,
>+				FA765A6B1108ABED002615E0 /* MathMLRowElement.cpp in Sources */,
> 				FA654A6B1108ABED002626F1 /* MathMLUnderOverElement.cpp in Sources */,
> 				439046E912DA25E812AF80AC /* MathOperator.cpp in Sources */,
> 				49D5DC2B0F423A73008F20FD /* Matrix3DTransformOperation.cpp in Sources */,
>diff --git a/Source/WebCore/mathml/MathMLAllInOne.cpp b/Source/WebCore/mathml/MathMLAllInOne.cpp
>index 77520bdd4aac3905e5fa81173ac09cfb1f2ab58c..7e309081f33181f47e21edbbe9109b48e54ebdcb 100644
>--- a/Source/WebCore/mathml/MathMLAllInOne.cpp
>+++ b/Source/WebCore/mathml/MathMLAllInOne.cpp
>@@ -34,6 +34,7 @@
> #include "MathMLOperatorDictionary.cpp"
> #include "MathMLOperatorElement.cpp"
> #include "MathMLPaddedElement.cpp"
>+#include "MathMLRowElement.cpp"
> #include "MathMLScriptsElement.cpp"
> #include "MathMLSelectElement.cpp"
> #include "MathMLTokenElement.cpp"
>diff --git a/Source/WebCore/mathml/MathMLInlineContainerElement.cpp b/Source/WebCore/mathml/MathMLInlineContainerElement.cpp
>index 295f8ff04abd938942d2ed51ab2ce49c982afd13..7dbcf44c4043112374b2e6e7bd7620e5692180b4 100644
>--- a/Source/WebCore/mathml/MathMLInlineContainerElement.cpp
>+++ b/Source/WebCore/mathml/MathMLInlineContainerElement.cpp
>@@ -32,12 +32,7 @@
> #include "MathMLInlineContainerElement.h"
> 
> #include "MathMLNames.h"
>-#include "MathMLOperatorElement.h"
> #include "RenderMathMLBlock.h"
>-#include "RenderMathMLFenced.h"
>-#include "RenderMathMLMenclose.h"
>-#include "RenderMathMLRoot.h"
>-#include "RenderMathMLRow.h"
> 
> namespace WebCore {
> 
>@@ -53,24 +48,8 @@ Ref<MathMLInlineContainerElement> MathMLInlineContainerElement::create(const Qua
>     return adoptRef(*new MathMLInlineContainerElement(tagName, document));
> }
> 
>-void MathMLInlineContainerElement::childrenChanged(const ChildChange& change)
>-{
>-    for (auto child = firstChild(); child; child = child->nextSibling()) {
>-        if (child->hasTagName(MathMLNames::moTag))
>-            static_cast<MathMLOperatorElement*>(child)->setOperatorFormDirty();
>-    }
>-
>-    MathMLElement::childrenChanged(change);
>-}
>-
> RenderPtr<RenderElement> MathMLInlineContainerElement::createElementRenderer(RenderStyle&& style, const RenderTreePosition&)
> {
>-    if (hasTagName(merrorTag) || hasTagName(mphantomTag) || hasTagName(mrowTag) || hasTagName(mstyleTag))
>-        return createRenderer<RenderMathMLRow>(*this, WTFMove(style));
>-    if (hasTagName(msqrtTag) || hasTagName(mrootTag))
>-        return createRenderer<RenderMathMLRoot>(*this, WTFMove(style));
>-    if (hasTagName(mfencedTag))
>-        return createRenderer<RenderMathMLFenced>(*this, WTFMove(style));
>     if (hasTagName(mtableTag))
>         return createRenderer<RenderMathMLTable>(*this, WTFMove(style));
> 
>@@ -79,12 +58,7 @@ RenderPtr<RenderElement> MathMLInlineContainerElement::createElementRenderer(Ren
> 
> bool MathMLInlineContainerElement::acceptsDisplayStyleAttribute()
> {
>-    return hasTagName(mstyleTag) || hasTagName(mtableTag);
>-}
>-
>-bool MathMLInlineContainerElement::acceptsMathVariantAttribute()
>-{
>-    return hasTagName(mstyleTag);
>+    return hasTagName(mtableTag);
> }
> 
> void MathMLInlineContainerElement::parseAttribute(const QualifiedName& name, const AtomicString& value)
>diff --git a/Source/WebCore/mathml/MathMLInlineContainerElement.h b/Source/WebCore/mathml/MathMLInlineContainerElement.h
>index bd8edf44bec2bc206128d995d42eb6a1fdbad097..f2b1e25c5c2c3cabfc44c4aaeb2d47b64f64b5b7 100644
>--- a/Source/WebCore/mathml/MathMLInlineContainerElement.h
>+++ b/Source/WebCore/mathml/MathMLInlineContainerElement.h
>@@ -38,11 +38,9 @@ public:
> 
> protected:
>     MathMLInlineContainerElement(const QualifiedName& tagName, Document&);
>-    void childrenChanged(const ChildChange&) override;
>     void parseAttribute(const QualifiedName&, const AtomicString&) override;
> 
>     bool acceptsDisplayStyleAttribute() override;
>-    bool acceptsMathVariantAttribute() override;
> 
> private:
>     RenderPtr<RenderElement> createElementRenderer(RenderStyle&&, const RenderTreePosition&) override;
>diff --git a/Source/WebCore/mathml/MathMLMathElement.cpp b/Source/WebCore/mathml/MathMLMathElement.cpp
>index ee1c3e1f296be5c29a0117fd9f2d321dc55fe9c1..d1d21882f4cb79dbd9f9873e60cb20c3e7d32a79 100644
>--- a/Source/WebCore/mathml/MathMLMathElement.cpp
>+++ b/Source/WebCore/mathml/MathMLMathElement.cpp
>@@ -39,7 +39,7 @@ namespace WebCore {
> using namespace MathMLNames;
> 
> inline MathMLMathElement::MathMLMathElement(const QualifiedName& tagName, Document& document)
>-    : MathMLInlineContainerElement(tagName, document)
>+    : MathMLRowElement(tagName, document)
> {
>     setHasCustomStyleResolveCallbacks();
> }
>@@ -83,7 +83,7 @@ void MathMLMathElement::parseAttribute(const QualifiedName& name, const AtomicSt
> 
> void MathMLMathElement::didAttachRenderers()
> {
>-    MathMLInlineContainerElement::didAttachRenderers();
>+    MathMLRowElement::didAttachRenderers();
> 
>     MathMLStyle::resolveMathMLStyleTree(renderer());
> }
>diff --git a/Source/WebCore/mathml/MathMLMathElement.h b/Source/WebCore/mathml/MathMLMathElement.h
>index f73b9d887a6300ea07b23b5b419f9df1a7982fee..5ac0940b8d27d48c15c95f9e79a8d9de94e4502a 100644
>--- a/Source/WebCore/mathml/MathMLMathElement.h
>+++ b/Source/WebCore/mathml/MathMLMathElement.h
>@@ -28,11 +28,11 @@
> #pragma once
> 
> #if ENABLE(MATHML)
>-#include "MathMLInlineContainerElement.h"
>+#include "MathMLRowElement.h"
> 
> namespace WebCore {
> 
>-class MathMLMathElement final : public MathMLInlineContainerElement {
>+class MathMLMathElement final : public MathMLRowElement {
> public:
>     static Ref<MathMLMathElement> create(const QualifiedName& tagName, Document&);
> 
>diff --git a/Source/WebCore/mathml/MathMLPaddedElement.cpp b/Source/WebCore/mathml/MathMLPaddedElement.cpp
>index 64a84be6f8cbdf48349e50554a88a31774e95cfc..4a419ceb163ade65f72607515712e5b80aae2cf4 100644
>--- a/Source/WebCore/mathml/MathMLPaddedElement.cpp
>+++ b/Source/WebCore/mathml/MathMLPaddedElement.cpp
>@@ -36,7 +36,7 @@ namespace WebCore {
> using namespace MathMLNames;
> 
> inline MathMLPaddedElement::MathMLPaddedElement(const QualifiedName& tagName, Document& document)
>-    : MathMLInlineContainerElement(tagName, document)
>+    : MathMLRowElement(tagName, document)
> {
> }
> 
>diff --git a/Source/WebCore/mathml/MathMLPaddedElement.h b/Source/WebCore/mathml/MathMLPaddedElement.h
>index c3a98f14eb87db95b3937647de01481e9369aeab..ce0772c32803ce16b983b57c06f97f39099ab540 100644
>--- a/Source/WebCore/mathml/MathMLPaddedElement.h
>+++ b/Source/WebCore/mathml/MathMLPaddedElement.h
>@@ -26,11 +26,11 @@
> #pragma once
> 
> #if ENABLE(MATHML)
>-#include "MathMLInlineContainerElement.h"
>+#include "MathMLRowElement.h"
> 
> namespace WebCore {
> 
>-class MathMLPaddedElement final : public MathMLInlineContainerElement {
>+class MathMLPaddedElement final : public MathMLRowElement {
> public:
>     static Ref<MathMLPaddedElement> create(const QualifiedName& tagName, Document&);
>     // FIXME: Pseudo-units are not supported yet (https://bugs.webkit.org/show_bug.cgi?id=85730).
>diff --git a/Source/WebCore/mathml/MathMLRowElement.cpp b/Source/WebCore/mathml/MathMLRowElement.cpp
>new file mode 100644
>index 0000000000000000000000000000000000000000..85632636ad9618531125277433132a54651220b4
>--- /dev/null
>+++ b/Source/WebCore/mathml/MathMLRowElement.cpp
>@@ -0,0 +1,86 @@
>+/*
>+ * Copyright (C) 2016 Igalia S.L. All rights reserved.
>+ *
>+ * Redistribution and use in source and binary forms, with or without
>+ * modification, are permitted provided that the following conditions
>+ * are met:
>+ * 1. Redistributions of source code must retain the above copyright
>+ *    notice, this list of conditions and the following disclaimer.
>+ * 2. Redistributions in binary form must reproduce the above copyright
>+ *    notice, this list of conditions and the following disclaimer in the
>+ *    documentation and/or other materials provided with the distribution.
>+ *
>+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+ */
>+
>+#include "config.h"
>+
>+#if ENABLE(MATHML)
>+#include "MathMLRowElement.h"
>+
>+#include "MathMLNames.h"
>+#include "MathMLOperatorElement.h"
>+#include "RenderMathMLFenced.h"
>+#include "RenderMathMLMenclose.h"
>+#include "RenderMathMLRoot.h"
>+#include "RenderMathMLRow.h"
>+
>+namespace WebCore {
>+
>+using namespace MathMLNames;
>+
>+MathMLRowElement::MathMLRowElement(const QualifiedName& tagName, Document& document)
>+    : MathMLInlineContainerElement(tagName, document)
>+{
>+}
>+
>+Ref<MathMLRowElement> MathMLRowElement::create(const QualifiedName& tagName, Document& document)
>+{
>+    return adoptRef(*new MathMLRowElement(tagName, document));
>+}
>+
>+void MathMLRowElement::childrenChanged(const ChildChange& change)
>+{
>+    for (auto child = firstChild(); child; child = child->nextSibling()) {
>+        if (child->hasTagName(moTag))
>+            static_cast<MathMLOperatorElement*>(child)->setOperatorFormDirty();
>+    }
>+
>+    MathMLInlineContainerElement::childrenChanged(change);
>+}
>+
>+RenderPtr<RenderElement> MathMLRowElement::createElementRenderer(RenderStyle&& style, const RenderTreePosition&)
>+{
>+    if (hasTagName(msqrtTag) || hasTagName(mrootTag))
>+        return createRenderer<RenderMathMLRoot>(*this, WTFMove(style));
>+
>+    if (hasTagName(mfencedTag))
>+        return createRenderer<RenderMathMLFenced>(*this, WTFMove(style));
>+
>+    ASSERT(hasTagName(merrorTag) || hasTagName(mphantomTag) || hasTagName(mrowTag) || hasTagName(mstyleTag));
>+    return createRenderer<RenderMathMLRow>(*this, WTFMove(style));
>+}
>+
>+bool MathMLRowElement::acceptsDisplayStyleAttribute()
>+{
>+    return hasTagName(mstyleTag);
>+}
>+
>+bool MathMLRowElement::acceptsMathVariantAttribute()
>+{
>+    return hasTagName(mstyleTag);
>+}
>+
>+}
>+
>+#endif // ENABLE(MATHML)
>diff --git a/Source/WebCore/mathml/MathMLRowElement.h b/Source/WebCore/mathml/MathMLRowElement.h
>new file mode 100644
>index 0000000000000000000000000000000000000000..992e63d0e72a61e537fa3452818d60f60f033651
>--- /dev/null
>+++ b/Source/WebCore/mathml/MathMLRowElement.h
>@@ -0,0 +1,50 @@
>+/*
>+ * Copyright (C) 2016 Igalia S.L. All rights reserved.
>+ *
>+ * Redistribution and use in source and binary forms, with or without
>+ * modification, are permitted provided that the following conditions
>+ * are met:
>+ * 1. Redistributions of source code must retain the above copyright
>+ *    notice, this list of conditions and the following disclaimer.
>+ * 2. Redistributions in binary form must reproduce the above copyright
>+ *    notice, this list of conditions and the following disclaimer in the
>+ *    documentation and/or other materials provided with the distribution.
>+ *
>+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
>+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
>+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
>+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
>+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
>+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
>+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>+ */
>+
>+#pragma once
>+
>+#if ENABLE(MATHML)
>+#include "MathMLInlineContainerElement.h"
>+
>+namespace WebCore {
>+
>+class MathMLRowElement : public MathMLInlineContainerElement {
>+public:
>+    static Ref<MathMLRowElement> create(const QualifiedName& tagName, Document&);
>+
>+protected:
>+    MathMLRowElement(const QualifiedName& tagName, Document&);
>+    void childrenChanged(const ChildChange&) final;
>+
>+    bool acceptsDisplayStyleAttribute() override;
>+    bool acceptsMathVariantAttribute() override;
>+
>+private:
>+    RenderPtr<RenderElement> createElementRenderer(RenderStyle&&, const RenderTreePosition&) override;
>+};
>+
>+}
>+
>+#endif // ENABLE(MATHML)
>diff --git a/Source/WebCore/mathml/mathtags.in b/Source/WebCore/mathml/mathtags.in
>index 2a2f5ab9aecce25d5b5d9a21a6d2bb807393521e..356a6d44771e2813d0926679b2c9dd49c1601564 100644
>--- a/Source/WebCore/mathml/mathtags.in
>+++ b/Source/WebCore/mathml/mathtags.in
>@@ -8,18 +8,18 @@ annotation-xml interfaceName=MathMLAnnotationElement
> maction interfaceName=MathMLSelectElement
> math
> mfrac interfaceName=MathMLFractionElement
>-mfenced interfaceName=MathMLInlineContainerElement
>+mfenced interfaceName=MathMLRowElement
> msubsup interfaceName=MathMLScriptsElement
>-merror interfaceName=MathMLInlineContainerElement
>+merror interfaceName=MathMLRowElement
> mpadded interfaceName=MathMLPaddedElement
>-mphantom interfaceName=MathMLInlineContainerElement
>-mrow interfaceName=MathMLInlineContainerElement
>-mstyle interfaceName=MathMLInlineContainerElement
>+mphantom interfaceName=MathMLRowElement
>+mrow interfaceName=MathMLRowElement
>+mstyle interfaceName=MathMLRowElement
> mover interfaceName=MathMLUnderOverElement
> munder interfaceName=MathMLUnderOverElement
> munderover interfaceName=MathMLUnderOverElement
>-msqrt interfaceName=MathMLInlineContainerElement
>-mroot interfaceName=MathMLInlineContainerElement
>+msqrt interfaceName=MathMLRowElement
>+mroot interfaceName=MathMLRowElement
> mi interfaceName=MathMLTokenElement
> mn interfaceName=MathMLTokenElement
> mo interfaceName=MathMLOperatorElement

Flags:

darin: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 161050: 286612 | 286689