Attachment 311214 Details for Bug 172355 – Patch

[patch] Patch

bug-172355-20170525143301.patch (text/plain), 10.27 KB, created by Joanmarie Diggs on 2017-05-25 05:33:02 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Joanmarie Diggs

Created: 2017-05-25 05:33:02 PDT

Size: 10.27 KB

patch

obsolete

>Subversion Revision: 217408
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index dcac2d95cffa6e96674e98726127a5590089dd86..95ea67b1a01c31251eb8ce939f3731a939c0ee74 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,28 @@
>+2017-05-25  Joanmarie Diggs  <jdiggs@igalia.com>
>+
>+        [ATK] Expose doc-footnote ARIA role with ATK_ROLE_FOOTNOTE
>+        https://bugs.webkit.org/show_bug.cgi?id=172355
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Add a new FootnoteRole accessibility role to WebCore and map it to
>+        ATK_ROLE_FOOTNOTE for WebKitGtk and NSAccessibilityGroupRole with
>+        a subrole of AXApplicationGroup for the Mac port.
>+
>+        No new tests because we already have coverage for this role.
>+        The existing test expectations were updated to reflect the
>+        new mapping of doc-footnote to ATK_ROLE_FOOTNOTE.
>+
>+        * accessibility/AccessibilityObject.cpp:
>+        (WebCore::initializeRoleMap):
>+        (WebCore::AccessibilityObject::computedRoleString):
>+        * accessibility/AccessibilityObject.h:
>+        * accessibility/atk/WebKitAccessibleWrapperAtk.cpp:
>+        (atkRole):
>+        * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
>+        (createAccessibilityRoleMap):
>+        (-[WebAccessibilityObjectWrapper subrole]):
>+
> 2017-05-24  Chris Dumez  <cdumez@apple.com>
> 
>         ResourceResponses for data URLs have their Source marked as Unknown
>diff --git a/Source/WebCore/accessibility/AccessibilityObject.cpp b/Source/WebCore/accessibility/AccessibilityObject.cpp
>index a6876a12731ad8b7fb96d4dca6a809d953adbe8d..36a6736d2c4315575b316228b62f34c80475452a 100644
>--- a/Source/WebCore/accessibility/AccessibilityObject.cpp
>+++ b/Source/WebCore/accessibility/AccessibilityObject.cpp
>@@ -2185,7 +2185,7 @@ static void initializeRoleMap()
>         { "doc-epilogue", LandmarkDocRegionRole },
>         { "doc-errata", LandmarkDocRegionRole },
>         { "doc-example", ApplicationTextGroupRole },
>-        { "doc-footnote", ApplicationTextGroupRole },
>+        { "doc-footnote", FootnoteRole },
>         { "doc-foreword", LandmarkDocRegionRole },
>         { "doc-glossary", LandmarkDocRegionRole },
>         { "doc-glossref", WebCoreLinkRole },
>@@ -2305,7 +2305,7 @@ String AccessibilityObject::computedRoleString() const
>         return "";
> 
>     // We do compute a role string for block elements with author-provided roles.
>-    if (role == ApplicationTextGroupRole)
>+    if (role == ApplicationTextGroupRole || role == FootnoteRole)
>         return reverseAriaRoleMap().get(ApplicationGroupRole);
> 
>     if (role == HorizontalRuleRole)
>diff --git a/Source/WebCore/accessibility/AccessibilityObject.h b/Source/WebCore/accessibility/AccessibilityObject.h
>index 1c39a0a90c5668757ee061cd353345141e25b1fe..05ecb541295739422b364c647765d5085ccac6a4 100644
>--- a/Source/WebCore/accessibility/AccessibilityObject.h
>+++ b/Source/WebCore/accessibility/AccessibilityObject.h
>@@ -133,6 +133,7 @@ enum AccessibilityRole {
>     FeedRole,
>     FigureRole,
>     FooterRole,
>+    FootnoteRole,
>     FormRole,
>     GridRole,
>     GridCellRole,
>diff --git a/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp b/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp
>index 52bf8c73cba3f5bd0324c0b526e33416d8bacad3..1dcd71dce4554af4865bbfe3360fdfdac86ba5a1 100644
>--- a/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp
>+++ b/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp
>@@ -637,6 +637,10 @@ static AtkRole atkRole(AccessibilityObject* coreObject)
> #if ATK_CHECK_VERSION(2, 11, 3)
>         return ATK_ROLE_BLOCK_QUOTE;
> #endif
>+    case FootnoteRole:
>+#if ATK_CHECK_VERSION(2, 25, 2)
>+        return ATK_ROLE_FOOTNOTE;
>+#endif
>     case ApplicationTextGroupRole:
>     case DivRole:
>     case PreRole:
>diff --git a/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm b/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm
>index a827a4c9a2e1808ba9b908aff8068748ccfc645e..4161e31a5c52627bf3a6baae972a3e88ad3ee9d7 100644
>--- a/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm
>+++ b/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm
>@@ -1944,6 +1944,7 @@ static const AccessibilityRoleMap& createAccessibilityRoleMap()
>         { TimeRole, NSAccessibilityGroupRole },
>         { FeedRole, NSAccessibilityGroupRole },
>         { FigureRole, NSAccessibilityGroupRole },
>+        { FootnoteRole, NSAccessibilityGroupRole },
>     };
>     AccessibilityRoleMap& roleMap = *new AccessibilityRoleMap;
>     
>@@ -2060,6 +2061,7 @@ static NSString* roleValueToNSString(AccessibilityRole value)
>         case ApplicationGroupRole:
>         case ApplicationTextGroupRole:
>         case FeedRole:
>+        case FootnoteRole:
>             return @"AXApplicationGroup";
>         case ApplicationLogRole:
>             return @"AXApplicationLog";
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index cbe3e8ddc314fdb5f915942d53ae85e53a13c33d..7718ba2c37e39777456ac851f67d576cda79268d 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,17 @@
>+2017-05-25  Joanmarie Diggs  <jdiggs@igalia.com>
>+
>+        [ATK] Expose doc-footnote ARIA role with ATK_ROLE_FOOTNOTE
>+        https://bugs.webkit.org/show_bug.cgi?id=172355
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Add map ATK_ROLE_FOOTNOTE to "AXFootnote" and bump jhbuild minimum
>+        versions of atk, at-spi2-core, and at-spi2-atk to 2.25.2 (the earliest
>+        releases which support the new platform footnote accessibility role.
>+
>+        * WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp:
>+        * gtk/jhbuild.modules:
>+
> 2017-05-24  Don Olmstead  <don.olmstead@am.sony.com>
> 
>         [CMake] Consolidate CMake code related to Cairo
>diff --git a/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp b/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp
>index a5c98fc36d189ac80de8ba56a579304358c122b0..defafdfb2ce8082b68290d4b59b73f53e4f0a758 100644
>--- a/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp
>+++ b/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp
>@@ -562,6 +562,10 @@ const gchar* roleToString(AtkObject* object)
>     case ATK_ROLE_SUPERSCRIPT:
>         return "AXSuperscript";
> #endif
>+#if ATK_CHECK_VERSION(2, 25, 2)
>+    case ATK_ROLE_FOOTNOTE:
>+        return "AXFootnote";
>+#endif
>     default:
>         // We want to distinguish ATK_ROLE_UNKNOWN from a known AtkRole which
>         // our DRT isn't properly handling.
>diff --git a/Tools/gtk/jhbuild.modules b/Tools/gtk/jhbuild.modules
>index 38bd2ea7cb154d30c46a3515750aeabf0fa77d82..31e1f33e26203dd7d64585b3338eac8abda208b8 100644
>--- a/Tools/gtk/jhbuild.modules
>+++ b/Tools/gtk/jhbuild.modules
>@@ -318,16 +318,16 @@
>   <autotools id="atk"
>              autogen-sh="configure"
>              autogenargs="--disable-introspection">
>-    <branch module="pub/GNOME/sources/atk/2.15/atk-2.15.4.tar.xz" version="2.15.4"
>+    <branch module="pub/GNOME/sources/atk/2.25/atk-2.25.2.tar.xz" version="2.25.2"
>             repo="ftp.gnome.org"
>-            hash="sha256:0dddfa73a02178ca21a8de172c86d699aa887b4efeec736b4c8721eee4ac349c"/>
>+            hash="sha256:75ac1f63e845f895dec8d72d4645ef5f362e32c921cc78987f2f19c2ce212a24"/>
>   </autotools>
> 
>   <autotools id="at-spi2-core" 
>              autogenargs="--disable-introspection">
>-    <branch module="pub/GNOME/sources/at-spi2-core/2.15/at-spi2-core-2.15.4.tar.xz" version="2.15.4"
>+    <branch module="pub/GNOME/sources/at-spi2-core/2.25/at-spi2-core-2.25.2.tar.xz" version="2.25.2"
>             repo="ftp.gnome.org"
>-            hash="sha256:0e3b01af6ba06d98faf7b85891ece394897fe145b0760b7846e810b57f1b809f">
>+            hash="sha256:4eaffa15bce924541809042dc0db5f62b80d0b45493b1d529642219a13871a40">
>     </branch>
>     <dependencies>
>       <dep package="glib"/>
>@@ -335,9 +335,9 @@
>   </autotools>
> 
>   <autotools id="at-spi2-atk">
>-    <branch module="pub/GNOME/sources/at-spi2-atk/2.15/at-spi2-atk-2.15.4.tar.xz" version="2.15.4"
>+    <branch module="pub/GNOME/sources/at-spi2-atk/2.25/at-spi2-atk-2.25.2.tar.xz" version="2.25.2"
>             repo="ftp.gnome.org"
>-            hash="sha256:3283aa5207b81e4c77d24c4e8b1c0abe6c850b11a2e62cd873cc07af0b403501">
>+            hash="sha256:dca41319d72915c40cce4ce59fdc0a33b922f974441ae8d60da125e2ee983ff0">
>     </branch>
>     <dependencies>
>       <dep package="glib"/>
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 50a0ca57e0d479470a2abd87b0d23aeb7cb9d417..bc911d1440ae9836948d142f82ea9a855270a3de 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,13 @@
>+2017-05-25  Joanmarie Diggs  <jdiggs@igalia.com>
>+
>+        [ATK] Expose doc-footnote ARIA role with ATK_ROLE_FOOTNOTE
>+        https://bugs.webkit.org/show_bug.cgi?id=172355
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * accessibility/gtk/xml-roles-exposed-expected.txt: Updated.
>+        * platform/gtk/accessibility/roles-exposed-expected.txt: Updated.
>+
> 2017-05-25  David Kilzer  <ddkilzer@apple.com>
> 
>         REGRESSION(r217390): "Broke internal Production builds that ran run-jsc-stress-tests" (Requested by ddkilzer on #webkit).
>diff --git a/LayoutTests/accessibility/gtk/xml-roles-exposed-expected.txt b/LayoutTests/accessibility/gtk/xml-roles-exposed-expected.txt
>index 57fbca3e4599e03cd8d6de6e8b8cc3aca4f9c875..fb3ad4e391cd5bb4e5cb25cbaa37c66f44cfaee8 100644
>--- a/LayoutTests/accessibility/gtk/xml-roles-exposed-expected.txt
>+++ b/LayoutTests/accessibility/gtk/xml-roles-exposed-expected.txt
>@@ -1241,7 +1241,7 @@ AXRequired: 0
> AXChecked: 0
> AXPlatformAttributes: computed-role:group, xml-roles:doc-example, tag:div, toolkit:WebKitGtk
> ------------
>-AXRole: AXSection
>+AXRole: AXFootnote
> AXParent: AXWebArea
> AXChildren: 0
> AXPosition: { 0.000000, 0.000000 }
>diff --git a/LayoutTests/platform/gtk/accessibility/roles-exposed-expected.txt b/LayoutTests/platform/gtk/accessibility/roles-exposed-expected.txt
>index dc3ecb0cee018cb503368ff3013f919b24df8ab4..197c75494cb0f3ef4578cf43fb826b62393b2871 100644
>--- a/LayoutTests/platform/gtk/accessibility/roles-exposed-expected.txt
>+++ b/LayoutTests/platform/gtk/accessibility/roles-exposed-expected.txt
>@@ -587,7 +587,7 @@ div[role=doc-example]
>       AXRole: AXSection
>       
> div[role=doc-footnote]
>-      AXRole: AXSection
>+      AXRole: AXFootnote
>       
> div[role=doc-foreword]
>       AXRole: AXLandmarkRegion

Actions: View | Formatted Diff | Diff

Attachments on bug 172355: 311214 | 311224