- Revision
- 199988
- Author
- [email protected]
- Date
- 2016-04-25 03:32:43 -0700 (Mon, 25 Apr 2016)
Log Message
Merge r199110 - REGRESSION(r195463): [GTK] accessibility/roles-computedRoleString.html and accessibility/roles-exposed.html failing
https://bugs.webkit.org/show_bug.cgi?id=153696
Reviewed by Chris Fleizach.
Source/WebCore:
The failures were due to always mapping style format groups to GroupRole, even for
RenderInline objects. The fix is to expose inline style format groups as InlineRole,
add handling of GroupRole style groups to the ATK code, and InlineRole style groups
to the Mac code.
No new tests because we have sufficient coverage. Updated roles-computedRoleString.html
to reflect new exposure.
* accessibility/AccessibilityRenderObject.cpp:
(WebCore::AccessibilityRenderObject::determineAccessibilityRole):
* accessibility/atk/WebKitAccessibleWrapperAtk.cpp:
(atkRole):
* accessibility/mac/AccessibilityObjectMac.mm:
(WebCore::AccessibilityObject::accessibilityPlatformIncludesObject):
* accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
(createAccessibilityRoleMap):
(-[WebAccessibilityObjectWrapper subrole]):
LayoutTests:
Now that RenderInline style format groups are exposed as InlineRole, there is
no longer a corresponding computed role for ins, samp, and var elements. Updated
the roles-computedRoleString.html test and expectations accordingly. Also added
the now-correct results for Gtk for both of the previously-failing tests.
* accessibility/roles-computedRoleString-expected.txt: Updated.
* accessibility/roles-computedRoleString.html: Updated.
* platform/gtk/TestExpectations: Unskip the two tests which are now passing.
* platform/gtk/accessibility/roles-computedRoleString-expected.txt: Updated.
* platform/gtk/accessibility/roles-exposed-expected.txt: Updated.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog (199987 => 199988)
--- releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog 2016-04-25 10:30:31 UTC (rev 199987)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog 2016-04-25 10:32:43 UTC (rev 199988)
@@ -1,3 +1,21 @@
+2016-04-06 Joanmarie Diggs <[email protected]>
+
+ REGRESSION(r195463): [GTK] accessibility/roles-computedRoleString.html and accessibility/roles-exposed.html failing
+ https://bugs.webkit.org/show_bug.cgi?id=153696
+
+ Reviewed by Chris Fleizach.
+
+ Now that RenderInline style format groups are exposed as InlineRole, there is
+ no longer a corresponding computed role for ins, samp, and var elements. Updated
+ the roles-computedRoleString.html test and expectations accordingly. Also added
+ the now-correct results for Gtk for both of the previously-failing tests.
+
+ * accessibility/roles-computedRoleString-expected.txt: Updated.
+ * accessibility/roles-computedRoleString.html: Updated.
+ * platform/gtk/TestExpectations: Unskip the two tests which are now passing.
+ * platform/gtk/accessibility/roles-computedRoleString-expected.txt: Updated.
+ * platform/gtk/accessibility/roles-exposed-expected.txt: Updated.
+
2016-04-06 Zalan Bujtas <[email protected]>
ASSERTION FAILED: !floatingObject->originatingLine() in WebCore::RenderBlockFlow::linkToEndLineIfNeeded
Modified: releases/WebKitGTK/webkit-2.12/LayoutTests/accessibility/roles-computedRoleString-expected.txt (199987 => 199988)
--- releases/WebKitGTK/webkit-2.12/LayoutTests/accessibility/roles-computedRoleString-expected.txt 2016-04-25 10:30:31 UTC (rev 199987)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/accessibility/roles-computedRoleString-expected.txt 2016-04-25 10:32:43 UTC (rev 199988)
@@ -42,7 +42,7 @@
PASS: input[type='time'] -> .
PASS: input[type='url'] -> .
PASS: input[type='week'] -> .
-PASS: ins -> group.
+PASS: ins -> .
PASS: math -> math.
PASS: meter -> progressbar.
PASS: nav -> navigation.
@@ -51,7 +51,7 @@
PASS: p -> .
PASS: pre -> group.
PASS: progress -> progressbar.
-PASS: samp -> group.
+PASS: samp -> .
PASS: section -> region.
PASS: select:not([multiple]) -> .
PASS: select[multiple] -> listbox.
@@ -76,7 +76,7 @@
PASS: textarea -> textbox.
PASS: ul -> list.
PASS: li -> listitem.
-PASS: var -> group.
+PASS: var -> .
PASS: div[role="command"] -> .
PASS: div[role="composite"] -> .
PASS: div[role="input"] -> .
Modified: releases/WebKitGTK/webkit-2.12/LayoutTests/accessibility/roles-computedRoleString.html (199987 => 199988)
--- releases/WebKitGTK/webkit-2.12/LayoutTests/accessibility/roles-computedRoleString.html 2016-04-25 10:30:31 UTC (rev 199987)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/accessibility/roles-computedRoleString.html 2016-04-25 10:32:43 UTC (rev 199988)
@@ -52,7 +52,7 @@
<input type="time" value="X" data-role="" class="ex" data-note="[type='time']">
<input type="url" value="X" data-role="" class="ex" data-note="[type='url']">
<input type="week" value="X" data-role="" class="ex" data-note="[type='week']">
-<ins data-role="group" class="ex">X</ins>
+<ins data-role="" class="ex">X</ins>
<mark data-role="" class="ex">X</mark>
<math data-role="math" class="ex">X</math>
<!-- skipped <menu> -->
@@ -74,7 +74,7 @@
<q data-role="" class="ex">X</q>
<!-- skipped <ruby/rp/rt> -->
<s data-role="" class="ex">X</s>
-<samp data-role="group" class="ex">X</samp>
+<samp data-role="" class="ex">X</samp>
<!-- skipped <script> -->
<section data-role="region" class="ex">X</section>
<select data-role="" class="ex" data-note=":not([multiple])">
@@ -140,7 +140,7 @@
<ul data-role="list" class="ex">
<li data-role="listitem" class="ex">X</li>
</ul>
-<var data-role="group" class="ex">X</var>
+<var data-role="" class="ex">X</var>
<wbr data-role="" class="ex">X</wbr>
<!-- ==================================================================================================== -->
Modified: releases/WebKitGTK/webkit-2.12/LayoutTests/platform/gtk/TestExpectations (199987 => 199988)
--- releases/WebKitGTK/webkit-2.12/LayoutTests/platform/gtk/TestExpectations 2016-04-25 10:30:31 UTC (rev 199987)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/platform/gtk/TestExpectations 2016-04-25 10:32:43 UTC (rev 199988)
@@ -2609,9 +2609,6 @@
webkit.org/b/153602 fast/text/emoji.html [ Failure ]
webkit.org/b/153602 tables/mozilla_expected_failures/bugs/bug89315.html [ Failure ]
-webkit.org/b/153696 accessibility/roles-computedRoleString.html [ Failure ]
-webkit.org/b/153696 accessibility/roles-exposed.html [ Failure ]
-
webkit.org/b/153697 http/tests/security/contentSecurityPolicy/object-src-applet-archive-codebase.html [ Failure ]
webkit.org/b/153697 http/tests/security/contentSecurityPolicy/object-src-applet-archive.html [ Failure ]
webkit.org/b/153697 http/tests/security/contentSecurityPolicy/object-src-applet-code-codebase.html [ Failure ]
Modified: releases/WebKitGTK/webkit-2.12/LayoutTests/platform/gtk/accessibility/roles-computedRoleString-expected.txt (199987 => 199988)
--- releases/WebKitGTK/webkit-2.12/LayoutTests/platform/gtk/accessibility/roles-computedRoleString-expected.txt 2016-04-25 10:30:31 UTC (rev 199987)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/platform/gtk/accessibility/roles-computedRoleString-expected.txt 2016-04-25 10:32:43 UTC (rev 199988)
@@ -42,14 +42,16 @@
PASS: input[type='time'] -> .
PASS: input[type='url'] -> .
PASS: input[type='week'] -> .
+PASS: ins -> .
PASS: math -> math.
PASS: meter -> progressbar.
PASS: nav -> navigation.
PASS: ol -> list.
PASS: li -> listitem.
PASS: p -> .
-PASS: pre -> .
+PASS: pre -> group.
PASS: progress -> progressbar.
+PASS: samp -> .
PASS: section -> region.
PASS: select:not([multiple]) -> .
PASS: option -> .
@@ -77,6 +79,7 @@
PASS: textarea -> textbox.
PASS: ul -> list.
PASS: li -> listitem.
+PASS: var -> .
PASS: div[role="command"] -> .
PASS: div[role="composite"] -> .
PASS: div[role="input"] -> .
Modified: releases/WebKitGTK/webkit-2.12/LayoutTests/platform/gtk/accessibility/roles-exposed-expected.txt (199987 => 199988)
--- releases/WebKitGTK/webkit-2.12/LayoutTests/platform/gtk/accessibility/roles-exposed-expected.txt 2016-04-25 10:30:31 UTC (rev 199987)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/platform/gtk/accessibility/roles-exposed-expected.txt 2016-04-25 10:32:43 UTC (rev 199988)
@@ -44,13 +44,13 @@
AXRole:
cite
- AXRole:
+ AXRole: AXStatic
code
- AXRole:
+ AXRole: AXStatic
del:not([datetime])
- AXRole:
+ AXRole: AXStatic
del[datetime]
AXRole: AXStatic
@@ -203,7 +203,7 @@
AXRole: AXTextField
ins:not([datetime])
- AXRole:
+ AXRole: AXStatic
ins[datetime]
AXRole: AXStatic
@@ -347,7 +347,7 @@
AXRole:
samp
- AXRole:
+ AXRole: AXStatic
section
AXRole: AXGroup
@@ -440,7 +440,7 @@
AXRole: AXListItem
var
- AXRole:
+ AXRole: AXStatic
wbr
AXRole:
Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog (199987 => 199988)
--- releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-04-25 10:30:31 UTC (rev 199987)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-04-25 10:32:43 UTC (rev 199988)
@@ -1,3 +1,28 @@
+2016-04-06 Joanmarie Diggs <[email protected]>
+
+ REGRESSION(r195463): [GTK] accessibility/roles-computedRoleString.html and accessibility/roles-exposed.html failing
+ https://bugs.webkit.org/show_bug.cgi?id=153696
+
+ Reviewed by Chris Fleizach.
+
+ The failures were due to always mapping style format groups to GroupRole, even for
+ RenderInline objects. The fix is to expose inline style format groups as InlineRole,
+ add handling of GroupRole style groups to the ATK code, and InlineRole style groups
+ to the Mac code.
+
+ No new tests because we have sufficient coverage. Updated roles-computedRoleString.html
+ to reflect new exposure.
+
+ * accessibility/AccessibilityRenderObject.cpp:
+ (WebCore::AccessibilityRenderObject::determineAccessibilityRole):
+ * accessibility/atk/WebKitAccessibleWrapperAtk.cpp:
+ (atkRole):
+ * accessibility/mac/AccessibilityObjectMac.mm:
+ (WebCore::AccessibilityObject::accessibilityPlatformIncludesObject):
+ * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
+ (createAccessibilityRoleMap):
+ (-[WebAccessibilityObjectWrapper subrole]):
+
2016-04-06 Zalan Bujtas <[email protected]>
Add ASSERT_WITH_SECURITY_IMPLICATION when a float box is referenced by multiple RootInlineBoxes.
Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/accessibility/AccessibilityRenderObject.cpp (199987 => 199988)
--- releases/WebKitGTK/webkit-2.12/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2016-04-25 10:30:31 UTC (rev 199987)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2016-04-25 10:32:43 UTC (rev 199988)
@@ -2604,7 +2604,7 @@
return GroupRole;
if (isStyleFormatGroup())
- return GroupRole;
+ return is<RenderInline>(*m_renderer) ? InlineRole : GroupRole;
#if ENABLE(MATHML)
if (node && node->hasTagName(MathMLNames::mathTag))
Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp (199987 => 199988)
--- releases/WebKitGTK/webkit-2.12/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp 2016-04-25 10:30:31 UTC (rev 199987)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp 2016-04-25 10:32:43 UTC (rev 199988)
@@ -570,10 +570,11 @@
case ApplicationRole:
return ATK_ROLE_APPLICATION;
case DocumentRegionRole:
- case GroupRole:
case RadioGroupRole:
case TabPanelRole:
return ATK_ROLE_PANEL;
+ case GroupRole:
+ return coreObject->isStyleFormatGroup() ? ATK_ROLE_SECTION : ATK_ROLE_PANEL;
case RowHeaderRole:
return ATK_ROLE_ROW_HEADER;
case ColumnHeaderRole:
Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/accessibility/mac/AccessibilityObjectMac.mm (199987 => 199988)
--- releases/WebKitGTK/webkit-2.12/Source/WebCore/accessibility/mac/AccessibilityObjectMac.mm 2016-04-25 10:30:31 UTC (rev 199987)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/accessibility/mac/AccessibilityObjectMac.mm 2016-04-25 10:32:43 UTC (rev 199988)
@@ -92,7 +92,7 @@
if (roleValue() == UnknownRole && !isAttachment())
return IgnoreObject;
- if (roleValue() == InlineRole)
+ if (roleValue() == InlineRole && !isStyleFormatGroup())
return IgnoreObject;
if (RenderObject* renderer = this->renderer()) {
