Attachment 287090 Details for Bug 161230 – Patch

[patch] Patch

0001-Bug-161230-The-annotation-xml-element-does-not-need-.patch (text/plain), 7.94 KB, created by Frédéric Wang Nélar on 2016-08-26 02:45:23 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Frédéric Wang Nélar

Created: 2016-08-26 02:45:23 PDT

Size: 7.94 KB

patch

obsolete

>From 2a7fca3607b56f91e0087314d09bddbc67fe0050 Mon Sep 17 00:00:00 2001
>From: Frederic Wang <fred.wang@free.fr>
>Date: Fri, 26 Aug 2016 11:41:56 +0200
>Subject: [PATCH] Bug 161230 - The annotation-xml element does not need to be
> behave as an mrow
>
>---
> LayoutTests/ChangeLog                              | 12 +++++++++++
> .../math-foreign-content-expected.txt              |  3 +--
> .../math-foreign-content-expected.txt              |  3 +--
> .../math-foreign-content-expected.txt              |  5 ++---
> Source/WebCore/ChangeLog                           | 25 ++++++++++++++++++++++
> Source/WebCore/mathml/MathMLAnnotationElement.cpp  |  9 ++++----
> Source/WebCore/mathml/MathMLAnnotationElement.h    |  4 ++--
> 7 files changed, 47 insertions(+), 14 deletions(-)
>
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index c6d8cf9..570bcfe 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,15 @@
>+2016-08-26  Frederic Wang  <fwang@igalia.com>
>+
>+        The annotation-xml element does not need to be behave as an mrow
>+        https://bugs.webkit.org/show_bug.cgi?id=161230
>+
>+        Reviewed by Manuel Rego Casasnovas.
>+
>+        * platform/efl/accessibility/math-foreign-content-expected.txt: Remove the AXGroup from the
>+        test expectation, which that was used for annotation-xml.
>+        * platform/gtk/accessibility/math-foreign-content-expected.txt: Ditto.
>+        * platform/mac/accessibility/math-foreign-content-expected.txt: Ditto.
>+
> 2016-08-25  Jiewen Tan  <jiewen_tan@apple.com>
> 
>         Unreviewed, rebase iOS simulator WK1 imported/w3c tests
>diff --git a/LayoutTests/platform/efl/accessibility/math-foreign-content-expected.txt b/LayoutTests/platform/efl/accessibility/math-foreign-content-expected.txt
>index f75028a..7e086ca 100644
>--- a/LayoutTests/platform/efl/accessibility/math-foreign-content-expected.txt
>+++ b/LayoutTests/platform/efl/accessibility/math-foreign-content-expected.txt
>@@ -5,8 +5,7 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
> 
> AXRole: AXMath 
>     AXRole: AXGroup 
>-        AXRole: AXGroup 
>-            AXRole: AXSection AXValue: SVG
>+        AXRole: AXSection AXValue: SVG
>     AXRole: AXStatic AXValue: HTML
> PASS successfullyParsed is true
> 
>diff --git a/LayoutTests/platform/gtk/accessibility/math-foreign-content-expected.txt b/LayoutTests/platform/gtk/accessibility/math-foreign-content-expected.txt
>index f75028a..7e086ca 100644
>--- a/LayoutTests/platform/gtk/accessibility/math-foreign-content-expected.txt
>+++ b/LayoutTests/platform/gtk/accessibility/math-foreign-content-expected.txt
>@@ -5,8 +5,7 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
> 
> AXRole: AXMath 
>     AXRole: AXGroup 
>-        AXRole: AXGroup 
>-            AXRole: AXSection AXValue: SVG
>+        AXRole: AXSection AXValue: SVG
>     AXRole: AXStatic AXValue: HTML
> PASS successfullyParsed is true
> 
>diff --git a/LayoutTests/platform/mac/accessibility/math-foreign-content-expected.txt b/LayoutTests/platform/mac/accessibility/math-foreign-content-expected.txt
>index bba92e8..eba1de3 100644
>--- a/LayoutTests/platform/mac/accessibility/math-foreign-content-expected.txt
>+++ b/LayoutTests/platform/mac/accessibility/math-foreign-content-expected.txt
>@@ -5,9 +5,8 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
> 
> AXRole: AXGroup AXSubrole: AXDocumentMath AXValue: 
>     AXRole: AXGroup AXSubrole: AXMathRow AXValue: 
>-        AXRole: AXGroup AXSubrole: AXMathRow AXValue: 
>-            AXRole: AXGroup AXSubrole:  AXValue: 
>-                AXRole: AXStaticText AXSubrole:  AXValue: SVG
>+        AXRole: AXGroup AXSubrole:  AXValue: 
>+            AXRole: AXStaticText AXSubrole:  AXValue: SVG
>     AXRole: AXGroup AXSubrole: AXMathText AXValue: 
>         AXRole: AXStaticText AXSubrole:  AXValue: HTML
> PASS successfullyParsed is true
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 2176b80..d571cf3 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,28 @@
>+2016-08-26  Frederic Wang  <fwang@igalia.com>
>+
>+        The annotation-xml element does not need to be behave as an mrow
>+        https://bugs.webkit.org/show_bug.cgi?id=161230
>+
>+        Reviewed by Manuel Rego Casasnovas.
>+
>+        In r204779, MathMLAnnotationElement was made a MathMLRowElement just because the
>+        annotation-xml element is generating a RenderMathMLRow. This later point is actually not
>+        needed since annotation-xml is just a wrapper for foreign elements and so does not need to
>+        handle special MathML features like operator spacing or stretching. We can thus move back
>+        MathMLAnnotationElement to a generic MathMLPresentationElement and instead make the
>+        annotation-xml element generate a generic RenderMathMLBlock renderer.
>+
>+        No new tests, semantics annotations already covered by existing tests.
>+
>+        * mathml/MathMLAnnotationElement.cpp: Replace RenderMathMLRow.h with RenderMathMLBlock.h
>+        (WebCore::MathMLAnnotationElement::MathMLAnnotationElement): Inherit from
>+        MathMLPresentationElement instead of MathMLRowElement.
>+        (WebCore::MathMLAnnotationElement::createElementRenderer): Make annotation-xml create a
>+        RenderMathMLBlock instead of a RenderMathMLRow.
>+        (WebCore::MathMLAnnotationElement::attributeChanged): Inherit from MathMLPresentationElement
>+        instead of MathMLRowElement.
>+        * mathml/MathMLAnnotationElement.h: Ditto.
>+
> 2016-08-25  Carlos Garcia Campos  <cgarcia@igalia.com>
> 
>         Unreviewed. Fix GTK+ build after r204986 and r204996.
>diff --git a/Source/WebCore/mathml/MathMLAnnotationElement.cpp b/Source/WebCore/mathml/MathMLAnnotationElement.cpp
>index 3c08a3a..a7e8628 100644
>--- a/Source/WebCore/mathml/MathMLAnnotationElement.cpp
>+++ b/Source/WebCore/mathml/MathMLAnnotationElement.cpp
>@@ -33,7 +33,7 @@
> #include "MathMLMathElement.h"
> #include "MathMLNames.h"
> #include "MathMLSelectElement.h"
>-#include "RenderMathMLRow.h"
>+#include "RenderMathMLBlock.h"
> #include "SVGSVGElement.h"
> 
> namespace WebCore {
>@@ -41,7 +41,7 @@ namespace WebCore {
> using namespace MathMLNames;
> 
> MathMLAnnotationElement::MathMLAnnotationElement(const QualifiedName& tagName, Document& document)
>-    : MathMLRowElement(tagName, document)
>+    : MathMLPresentationElement(tagName, document)
> {
>     ASSERT(hasTagName(annotationTag) || hasTagName(annotation_xmlTag));
> }
>@@ -56,9 +56,8 @@ RenderPtr<RenderElement> MathMLAnnotationElement::createElementRenderer(RenderSt
>     if (hasTagName(MathMLNames::annotationTag))
>         return MathMLElement::createElementRenderer(WTFMove(style), insertionPosition);
> 
>-    // FIXME: Do we really need to create a RenderMathMLRow?
>     ASSERT(hasTagName(annotation_xmlTag));
>-    return createRenderer<RenderMathMLRow>(*this, WTFMove(style));
>+    return createRenderer<RenderMathMLBlock>(*this, WTFMove(style));
> }
> 
> bool MathMLAnnotationElement::childShouldCreateRenderer(const Node& child) const
>@@ -100,7 +99,7 @@ void MathMLAnnotationElement::attributeChanged(const QualifiedName& name, const
>         if (is<MathMLElement>(parent) && parent->hasTagName(semanticsTag))
>             downcast<MathMLElement>(*parent).updateSelectedChild();
>     }
>-    MathMLRowElement::attributeChanged(name, oldValue, newValue, reason);
>+    MathMLPresentationElement::attributeChanged(name, oldValue, newValue, reason);
> }
> 
> }
>diff --git a/Source/WebCore/mathml/MathMLAnnotationElement.h b/Source/WebCore/mathml/MathMLAnnotationElement.h
>index 766eb33..4c08433 100644
>--- a/Source/WebCore/mathml/MathMLAnnotationElement.h
>+++ b/Source/WebCore/mathml/MathMLAnnotationElement.h
>@@ -27,11 +27,11 @@
> 
> #if ENABLE(MATHML)
> 
>-#include "MathMLRowElement.h"
>+#include "MathMLPresentationElement.h"
> 
> namespace WebCore {
> 
>-class MathMLAnnotationElement final : public MathMLRowElement {
>+class MathMLAnnotationElement final : public MathMLPresentationElement {
> public:
>     static Ref<MathMLAnnotationElement> create(const QualifiedName& tagName, Document&);
> private:
>-- 
>2.8.1
>

Actions: View | Formatted Diff | Diff

Attachments on bug 161230: 287079 | 287083 | 287088 | 287090 | 287099