Attachment 340212 Details for Bug 185521 – Patch

[patch] Patch

bug-185521-20180511151648.patch (text/plain), 13.90 KB, created by Joanmarie Diggs on 2018-05-11 12:16:49 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Joanmarie Diggs

Created: 2018-05-11 12:16:49 PDT

Size: 13.90 KB

patch

obsolete

>Subversion Revision: 231637
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index cd794e4d4c9ea2e6629d5edc6029c53dfbdcb726..9043e177bd0a6a7fb2f0e4a0081c8b0c6b82226d 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,23 @@
>+2018-05-11  Joanmarie Diggs  <jdiggs@igalia.com>
>+
>+        AX: Listbox and Combobox roles embedded in labels should participate in name calculation
>+        https://bugs.webkit.org/show_bug.cgi?id=185521
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Take selected children into account when computing the name in
>+        accessibleNameForNode. Also add ListBox to the roles for which
>+        accessibleNameDerivesFromContent returns false. The latter is
>+        needed so that native select elements with size > 1 are treated
>+        the same way as ARIA listbox.
>+
>+        Test: accessibility/text-alternative-calculation-from-listbox.html
>+
>+        * accessibility/AccessibilityNodeObject.cpp:
>+        (WebCore::accessibleNameForNode):
>+        * accessibility/AccessibilityObject.cpp:
>+        (WebCore::AccessibilityObject::accessibleNameDerivesFromContent const):
>+
> 2018-05-10  Yacine Bandou  <yacine.bandou_ext@softathome.com>
> 
>         [EME][GStreamer] Add a handler for GStreamer protection event
>diff --git a/Source/WebCore/accessibility/AccessibilityNodeObject.cpp b/Source/WebCore/accessibility/AccessibilityNodeObject.cpp
>index 4ad50050362fb38ddc1e4bf54c258af8bc302697..12dce85fd7e6d69a7be745cd51aa5b03c89f390c 100644
>--- a/Source/WebCore/accessibility/AccessibilityNodeObject.cpp
>+++ b/Source/WebCore/accessibility/AccessibilityNodeObject.cpp
>@@ -1952,6 +1952,29 @@ static String accessibleNameForNode(Node* node, Node* labelledbyNode)
>         String valueDescription = axObject->valueDescription();
>         if (!valueDescription.isEmpty())
>             return valueDescription;
>+
>+        // The Accname specification states that if the name is being calculated for a combobox
>+        // or listbox inside a labeling element, return the text alternative of the chosen option.
>+        AccessibilityObject::AccessibilityChildrenVector children;
>+        if (axObject->isListBox())
>+            axObject->selectedChildren(children);
>+        else if (axObject->isComboBox()) {
>+            for (const auto& child : axObject->children()) {
>+                if (child->isListBox()) {
>+                    child->selectedChildren(children);
>+                    break;
>+                }
>+            }
>+        }
>+
>+        StringBuilder builder;
>+        String childText;
>+        for (const auto& child : children)
>+            appendNameToStringBuilder(builder, accessibleNameForNode(child->node()));
>+
>+        childText = builder.toString();
>+        if (!childText.isEmpty())
>+            return childText;
>     }
>     
>     if (is<HTMLInputElement>(*node))
>diff --git a/Source/WebCore/accessibility/AccessibilityObject.cpp b/Source/WebCore/accessibility/AccessibilityObject.cpp
>index 990c4c7291af537d4ffb1ff20ada20af514023a3..c6e262531102461530ae559b7aeb42c8211ba437 100644
>--- a/Source/WebCore/accessibility/AccessibilityObject.cpp
>+++ b/Source/WebCore/accessibility/AccessibilityObject.cpp
>@@ -354,6 +354,7 @@ bool AccessibilityObject::accessibleNameDerivesFromContent() const
>     // Now check for generically derived elements now that we know the element does not match a specific ARIA role.
>     switch (roleValue()) {
>     case AccessibilityRole::Slider:
>+    case AccessibilityRole::ListBox:
>         return false;
>     default:
>         break;
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 1da4521785c36dd2e60117a8de87c2be6f950d02..22d4f5a73a3a93ba84321474e8cef5706d52ad40 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,15 @@
>+2018-05-11  Joanmarie Diggs  <jdiggs@igalia.com>
>+
>+        AX: Listbox and Combobox roles embedded in labels should participate in name calculation
>+        https://bugs.webkit.org/show_bug.cgi?id=185521
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * accessibility/text-alternative-calculation-from-listbox-expected.txt: Added.
>+        * accessibility/text-alternative-calculation-from-listbox.html: Added.
>+        * platform/gtk/accessibility/text-alternative-calculation-from-listbox-expected.txt: Added.
>+        * platform/win/TestExpectations:
>+
> 2018-05-10  Yacine Bandou  <yacine.bandou_ext@softathome.com>
> 
>         [wpe] update the TestExpectations for encrypted-media after some fixes
>diff --git a/LayoutTests/accessibility/text-alternative-calculation-from-listbox-expected.txt b/LayoutTests/accessibility/text-alternative-calculation-from-listbox-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..513e48e4ea5acb101db414c54c58976b6d6b5cc0
>--- /dev/null
>+++ b/LayoutTests/accessibility/text-alternative-calculation-from-listbox-expected.txt
>@@ -0,0 +1,100 @@
>+This tests text alternative calculation from label with an embedded listbox.
>+
>+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
>+
>+
>+
>+Test 1
>+AXRole: AXCheckBox
>+AXDescription: 
>+AXTitle: 
>+AXValue: 0
>+AXTitleUIElement - AXRole: AXGroup
>+AXTitleUIElement - AXDescription: 
>+AXTitleUIElement - AXTitle: 
>+AXTitleUIElement - AXValue: 
>+AXTitleUIElement Child 1 - AXRole: AXStaticText
>+AXTitleUIElement Child 1 - AXDescription: 
>+AXTitleUIElement Child 1 - AXTitle: 
>+AXTitleUIElement Child 1 - AXValue: Flash the screen
>+AXTitleUIElement Child 2 - AXRole: AXList
>+AXTitleUIElement Child 2 - AXDescription: 
>+AXTitleUIElement Child 2 - AXTitle: 
>+AXTitleUIElement Child 2 - AXValue: 
>+AXTitleUIElement Child 3 - AXRole: AXStaticText
>+AXTitleUIElement Child 3 - AXDescription: 
>+AXTitleUIElement Child 3 - AXTitle: 
>+AXTitleUIElement Child 3 - AXValue: times.
>+
>+Test 2
>+AXRole: AXCheckBox
>+AXDescription: 
>+AXTitle: 
>+AXValue: 0
>+AXTitleUIElement - AXRole: AXGroup
>+AXTitleUIElement - AXDescription: 
>+AXTitleUIElement - AXTitle: 
>+AXTitleUIElement - AXValue: 
>+AXTitleUIElement Child 1 - AXRole: AXStaticText
>+AXTitleUIElement Child 1 - AXDescription: 
>+AXTitleUIElement Child 1 - AXTitle: 
>+AXTitleUIElement Child 1 - AXValue: Flash the screen
>+AXTitleUIElement Child 2 - AXRole: AXComboBox
>+AXTitleUIElement Child 2 - AXDescription: 
>+AXTitleUIElement Child 2 - AXTitle: 
>+AXTitleUIElement Child 2 - AXValue: 1
>+2
>+3
>+
>+AXTitleUIElement Child 3 - AXRole: AXStaticText
>+AXTitleUIElement Child 3 - AXDescription: 
>+AXTitleUIElement Child 3 - AXTitle: 
>+AXTitleUIElement Child 3 - AXValue: times.
>+
>+Test 3
>+AXRole: AXCheckBox
>+AXDescription: 
>+AXTitle: 
>+AXValue: 0
>+AXTitleUIElement - AXRole: AXGroup
>+AXTitleUIElement - AXDescription: 
>+AXTitleUIElement - AXTitle: 
>+AXTitleUIElement - AXValue: 
>+AXTitleUIElement Child 1 - AXRole: AXStaticText
>+AXTitleUIElement Child 1 - AXDescription: 
>+AXTitleUIElement Child 1 - AXTitle: 
>+AXTitleUIElement Child 1 - AXValue: Flash the screen 
>+AXTitleUIElement Child 2 - AXRole: AXPopUpButton
>+AXTitleUIElement Child 2 - AXDescription: 
>+AXTitleUIElement Child 2 - AXTitle: 
>+AXTitleUIElement Child 2 - AXValue: 2
>+AXTitleUIElement Child 3 - AXRole: AXStaticText
>+AXTitleUIElement Child 3 - AXDescription: 
>+AXTitleUIElement Child 3 - AXTitle: 
>+AXTitleUIElement Child 3 - AXValue:  times.
>+
>+Test 4
>+AXRole: AXCheckBox
>+AXDescription: 
>+AXTitle: 
>+AXValue: 0
>+AXTitleUIElement - AXRole: AXGroup
>+AXTitleUIElement - AXDescription: 
>+AXTitleUIElement - AXTitle: 
>+AXTitleUIElement - AXValue: 
>+AXTitleUIElement Child 1 - AXRole: AXStaticText
>+AXTitleUIElement Child 1 - AXDescription: 
>+AXTitleUIElement Child 1 - AXTitle: 
>+AXTitleUIElement Child 1 - AXValue: Flash the screen 
>+AXTitleUIElement Child 2 - AXRole: AXList
>+AXTitleUIElement Child 2 - AXDescription: 
>+AXTitleUIElement Child 2 - AXTitle: 
>+AXTitleUIElement Child 2 - AXValue: 
>+AXTitleUIElement Child 3 - AXRole: AXStaticText
>+AXTitleUIElement Child 3 - AXDescription: 
>+AXTitleUIElement Child 3 - AXTitle: 
>+AXTitleUIElement Child 3 - AXValue:  times.
>+PASS successfullyParsed is true
>+
>+TEST COMPLETE
>+
>diff --git a/LayoutTests/accessibility/text-alternative-calculation-from-listbox.html b/LayoutTests/accessibility/text-alternative-calculation-from-listbox.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..6bb553d5d7462cd117f7162826b023701fa3198c
>--- /dev/null
>+++ b/LayoutTests/accessibility/text-alternative-calculation-from-listbox.html
>@@ -0,0 +1,92 @@
>+<!DOCTYPE html>
>+<html>
>+<head>
>+<script src="../resources/js-test-pre.js"></script>
>+<script src="../resources/accessibility-helper.js"></script>
>+</head>
>+<body>
>+<div id="content">
>+  <div>
>+    <input type="checkbox" id="test1" />
>+    <label for="test1" id="label">Flash the screen
>+      <ul role="listbox" style="list-style-type: none;">
>+	<li role="option" aria-selected="false">1</li>
>+	<li role="option" aria-selected="true">2</li>
>+	<li role="option">3</li>
>+      </ul>
>+      times.
>+    </label>
>+  </div>
>+  <div>
>+    <input type="checkbox" id="test2" />
>+    <label for="test2">Flash the screen
>+      <div role="combobox" id="combobox">
>+	<div role="textbox" id="textbox"></div>
>+	<ul role="listbox" id="listbox" style="list-style-type: none;">
>+	  <li role="option" id="option1" aria-selected="false">1</li>
>+	  <li role="option" id="option2" aria-selected="true">2</li>
>+	  <li role="option" id="option3">3</li>
>+	</ul>
>+      </div>
>+      times.
>+    </label>
>+  </div>
>+  <div>
>+    <input type="checkbox" id="test3" />
>+    <label for="test3">Flash the screen
>+      <select size="1">
>+	<option>1</option>
>+	<option selected>2</option>
>+	<option>3</option>
>+      </select>
>+      times.
>+    </label>
>+  </div>
>+  <div>
>+    <input type="checkbox" id="test4" />
>+    <label for="test4">Flash the screen
>+      <select size="3">
>+	<option>1</option>
>+	<option selected>2</option>
>+	<option>3</option>
>+      </select>
>+      times.
>+    </label>
>+  </div>
>+</div>
>+<p id="description"></p>
>+<div id="console"></div>
>+
>+<script>
>+    function details(axElement, prefix="") {
>+    if (!axElement)
>+        return;
>+
>+    debug(prefix + axElement.role);
>+    debug(prefix + axElement.description);
>+    debug(prefix + axElement.title);
>+    debug(prefix + axElement.stringValue);
>+    }
>+
>+    description("This tests text alternative calculation from label with an embedded listbox.");
>+    if (window.accessibilityController) {
>+        for (var i = 1; i <= 4; i++) {
>+            var axElement = accessibilityController.accessibleElementById("test" + i);
>+            debug("\nTest " + i);
>+            details(axElement);
>+
>+            var titleUIElement = axElement.titleUIElement();
>+            details(titleUIElement, "AXTitleUIElement - ");
>+
>+            var childrenCount = titleUIElement.childrenCount;
>+            for (var j = 0; j < childrenCount; j++) {
>+               details(titleUIElement.childAtIndex(j), "AXTitleUIElement Child " + (j+1) + " - ");
>+            }
>+        }
>+        document.getElementById("content").style.visibility = "hidden";
>+    }
>+</script>
>+
>+<script src="../resources/js-test-post.js"></script>
>+</body>
>+</html>
>diff --git a/LayoutTests/platform/gtk/accessibility/text-alternative-calculation-from-listbox-expected.txt b/LayoutTests/platform/gtk/accessibility/text-alternative-calculation-from-listbox-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..ac637465ff6fc167063d17b92a277cf5ab733310
>--- /dev/null
>+++ b/LayoutTests/platform/gtk/accessibility/text-alternative-calculation-from-listbox-expected.txt
>@@ -0,0 +1,65 @@
>+This tests text alternative calculation from label with an embedded listbox.
>+
>+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
>+
>+
>+
>+Test 1
>+AXRole: AXCheckBox
>+AXDescription: 
>+AXTitle: Flash the screen 2 times.
>+AXValue: 
>+AXTitleUIElement - AXRole: AXLabel
>+AXTitleUIElement - AXDescription: 
>+AXTitleUIElement - AXTitle: 
>+AXTitleUIElement - AXValue: Flash the screen<\n>1<\n>2<\n>3<\n>times.
>+AXTitleUIElement Child 1 - AXRole: AXListBox
>+AXTitleUIElement Child 1 - AXDescription: 
>+AXTitleUIElement Child 1 - AXTitle: 
>+AXTitleUIElement Child 1 - 
>+
>+Test 2
>+AXRole: AXCheckBox
>+AXDescription: 
>+AXTitle: Flash the screen 2 times.
>+AXValue: 
>+AXTitleUIElement - AXRole: AXLabel
>+AXTitleUIElement - AXDescription: 
>+AXTitleUIElement - AXTitle: 
>+AXTitleUIElement - AXValue: Flash the screen<\n>1<\n>2<\n>3<\n>times.
>+AXTitleUIElement Child 1 - AXRole: AXComboBox
>+AXTitleUIElement Child 1 - AXDescription: 
>+AXTitleUIElement Child 1 - AXTitle: 
>+AXTitleUIElement Child 1 - AXValue: 1<\n>2<\n>3<\n>
>+
>+Test 3
>+AXRole: AXCheckBox
>+AXDescription: 
>+AXTitle: Flash the screen 2 times.
>+AXValue: 
>+AXTitleUIElement - AXRole: AXLabel
>+AXTitleUIElement - AXDescription: 
>+AXTitleUIElement - AXTitle: 
>+AXTitleUIElement - AXValue: Flash the screen   times.
>+AXTitleUIElement Child 1 - AXRole: AXComboBox
>+AXTitleUIElement Child 1 - AXDescription: 
>+AXTitleUIElement Child 1 - AXTitle: Flash the screen 2 times.
>+AXTitleUIElement Child 1 - 
>+
>+Test 4
>+AXRole: AXCheckBox
>+AXDescription: 
>+AXTitle: Flash the screen 2 times.
>+AXValue: 
>+AXTitleUIElement - AXRole: AXLabel
>+AXTitleUIElement - AXDescription: 
>+AXTitleUIElement - AXTitle: 
>+AXTitleUIElement - AXValue: Flash the screen   times.
>+AXTitleUIElement Child 1 - AXRole: AXListBox
>+AXTitleUIElement Child 1 - AXDescription: 
>+AXTitleUIElement Child 1 - AXTitle: Flash the screen 2 times.
>+AXTitleUIElement Child 1 - AXValue: 
>+PASS successfullyParsed is true
>+
>+TEST COMPLETE
>+
>diff --git a/LayoutTests/platform/win/TestExpectations b/LayoutTests/platform/win/TestExpectations
>index d83d77df329d385416223a7ce21248cad6492abd..83662466f986ddd050454596708f26f3bb474253 100644
>--- a/LayoutTests/platform/win/TestExpectations
>+++ b/LayoutTests/platform/win/TestExpectations
>@@ -48,6 +48,7 @@ http/tests/gzip-content-encoding [ Pass ]
> accessibility/media-emits-object-replacement.html [ Failure ]
> accessibility/aria-liveregions-attributes.html [ Failure ]
> accessibility/aria-liveregion-marquee-default.html [ Failure ]
>+accessibility/text-alternative-calculation-from-listbox.html [ Failure ]
> 
> 
> # <rdar://problem/5075790> Layout tests that depend on certain fonts don't match Mac results:

Actions: View | Formatted Diff | Diff

Attachments on bug 185521: 340115 | 340125 | 340192 | 340193 | 340196 | 340211 | 340212 | 340368 | 340380