Attachment 287224 Details for Bug 161297 – Patch

[patch] Patch

161297.patch (text/plain), 4.66 KB, created by Frédéric Wang Nélar on 2016-08-28 02:29:04 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Frédéric Wang Nélar

Created: 2016-08-28 02:29:04 PDT

Size: 4.66 KB

patch

obsolete

>diff --git a/Source/WebCore/mathml/MathMLElement.cpp b/Source/WebCore/mathml/MathMLElement.cpp
>index 98af962..09d3364 100644
>--- a/Source/WebCore/mathml/MathMLElement.cpp
>+++ b/Source/WebCore/mathml/MathMLElement.cpp
>@@ -64,26 +64,6 @@ Ref<MathMLElement> MathMLElement::create(const QualifiedName& tagName, Document&
>     return adoptRef(*new MathMLElement(tagName, document));
> }
> 
>-bool MathMLElement::isPresentationMathML() const
>-{
>-    return hasTagName(MathMLNames::mtrTag)
>-        || hasTagName(MathMLNames::mtdTag)
>-        || hasTagName(MathMLNames::maligngroupTag)
>-        || hasTagName(MathMLNames::malignmarkTag)
>-        || hasTagName(MathMLNames::mencloseTag)
>-        || hasTagName(MathMLNames::mglyphTag)
>-        || hasTagName(MathMLNames::mlabeledtrTag)
>-        || hasTagName(MathMLNames::mlongdivTag)
>-        || hasTagName(MathMLNames::mpaddedTag)
>-        || hasTagName(MathMLNames::msTag)
>-        || hasTagName(MathMLNames::mscarriesTag)
>-        || hasTagName(MathMLNames::mscarryTag)
>-        || hasTagName(MathMLNames::msgroupTag)
>-        || hasTagName(MathMLNames::mslineTag)
>-        || hasTagName(MathMLNames::msrowTag)
>-        || hasTagName(MathMLNames::mstackTag);
>-}
>-
> bool MathMLElement::isPhrasingContent(const Node& node) const
> {
>     // Phrasing content is described in the HTML 5 specification:
>diff --git a/Source/WebCore/mathml/MathMLElement.h b/Source/WebCore/mathml/MathMLElement.h
>index bb95339..2590c33 100644
>--- a/Source/WebCore/mathml/MathMLElement.h
>+++ b/Source/WebCore/mathml/MathMLElement.h
>@@ -44,7 +44,7 @@ public:
> 
>     virtual bool isMathMLToken() const { return false; }
>     virtual bool isSemanticAnnotation() const { return false; }
>-    virtual bool isPresentationMathML() const;
>+    virtual bool isPresentationMathML() const { return false; }
> 
>     bool hasTagName(const MathMLQualifiedName& name) const { return hasLocalName(name.localName()); }
> 
>diff --git a/Source/WebCore/mathml/MathMLPresentationElement.cpp b/Source/WebCore/mathml/MathMLPresentationElement.cpp
>index 744d8e2..00739cd 100644
>--- a/Source/WebCore/mathml/MathMLPresentationElement.cpp
>+++ b/Source/WebCore/mathml/MathMLPresentationElement.cpp
>@@ -47,12 +47,12 @@ Ref<MathMLPresentationElement> MathMLPresentationElement::create(const Qualified
>     return adoptRef(*new MathMLPresentationElement(tagName, document));
> }
> 
>-RenderPtr<RenderElement> MathMLPresentationElement::createElementRenderer(RenderStyle&& style, const RenderTreePosition&)
>+RenderPtr<RenderElement> MathMLPresentationElement::createElementRenderer(RenderStyle&& style, const RenderTreePosition& insertionPosition)
> {
>     if (hasTagName(mtableTag))
>         return createRenderer<RenderMathMLTable>(*this, WTFMove(style));
> 
>-    return createRenderer<RenderMathMLBlock>(*this, WTFMove(style));
>+    return MathMLElement::createElementRenderer(WTFMove(style), insertionPosition);
> }
> 
> bool MathMLPresentationElement::acceptsDisplayStyleAttribute()
>diff --git a/Source/WebCore/mathml/mathtags.in b/Source/WebCore/mathml/mathtags.in
>index 4be6ee7..3ba9ce7 100644
>--- a/Source/WebCore/mathml/mathtags.in
>+++ b/Source/WebCore/mathml/mathtags.in
>@@ -29,22 +29,23 @@ mspace interfaceName=MathMLSpaceElement
> msub interfaceName=MathMLScriptsElement
> msup interfaceName=MathMLScriptsElement
> mtable interfaceName=MathMLPresentationElement
>-mtr interfaceName=MathMLElement
>-mtd interfaceName=MathMLElement
>+mtr interfaceName=MathMLPresentationElement
>+mtd interfaceName=MathMLPresentationElement
> mmultiscripts interfaceName=MathMLScriptsElement
> mprescripts interfaceName=MathMLPresentationElement
> menclose interfaceName=MathMLMencloseElement
> none interfaceName=MathMLPresentationElement
> semantics interfaceName=MathMLSelectElement
> 
>-maligngroup interfaceName=MathMLElement
>-malignmark interfaceName=MathMLElement
>-mglyph interfaceName=MathMLElement
>-mlabeledtr interfaceName=MathMLElement
>-mlongdiv interfaceName=MathMLElement
>-mscarries interfaceName=MathMLElement
>-mscarry interfaceName=MathMLElement
>-msgroup interfaceName=MathMLElement
>-msline interfaceName=MathMLElement
>-msrow interfaceName=MathMLElement
>-mstack interfaceName=MathMLElement
>+# Rendering is not implemented for the following presentation tags.
>+maligngroup interfaceName=MathMLPresentationElement
>+malignmark interfaceName=MathMLPresentationElement
>+mglyph interfaceName=MathMLPresentationElement
>+mlabeledtr interfaceName=MathMLPresentationElement
>+mlongdiv interfaceName=MathMLPresentationElement
>+mscarries interfaceName=MathMLPresentationElement
>+mscarry interfaceName=MathMLPresentationElement
>+msgroup interfaceName=MathMLPresentationElement
>+msline interfaceName=MathMLPresentationElement
>+msrow interfaceName=MathMLPresentationElement
>+mstack interfaceName=MathMLPresentationElement

Actions: View | Formatted Diff | Diff

Attachments on bug 161297: 287224 | 287250