Changeset 216457 in webkit

Timestamp:

May 8, 2017 3:16:27 PM (7 years ago)

Author:

jdiggs@igalia.com

Message:

AX: don't expose empty roledescription
​https://bugs.webkit.org/show_bug.cgi?id=163647

Reviewed by Chris Fleizach.

Source/WebCore:

If the value of aria-roledescription is empty or contains only whitespace
characters, ignore the value. Also strip out leading or trailing whitespace
characters in the value.

No new tests: We already had coverage for an empty aria-roledescription value.
That test was updated to reflect the new behavior. New test cases were added
to cover a value that contains only whitespace characters, and a value with
leading and trailing whitespace characters.

• accessibility/AccessibilityObject.cpp:

(WebCore::AccessibilityObject::roleDescription):

• accessibility/mac/WebAccessibilityObjectWrapperMac.mm:

(-[WebAccessibilityObjectWrapper roleDescription]):

LayoutTests:

• accessibility/aria-roledescription-expected.txt: New test cases, updated expectations.
• accessibility/aria-roledescription.html: New test cases, updated expectations.
• platform/gtk/accessibility/aria-roledescription-expected.txt: New test cases, updated expectations.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/accessibility/aria-roledescription-expected.txt (modified) (1 diff)
• LayoutTests/accessibility/aria-roledescription.html (modified) (1 diff)
• LayoutTests/platform/gtk/accessibility/aria-roledescription-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/accessibility/AccessibilityObject.cpp (modified) (1 diff)
• Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2017-05-08  Joanmarie Diggs  <jdiggs@igalia.com>
+
+        AX: don't expose empty roledescription
+        https://bugs.webkit.org/show_bug.cgi?id=163647
+
+        Reviewed by Chris Fleizach.
+
+        * accessibility/aria-roledescription-expected.txt: New test cases, updated expectations.
+        * accessibility/aria-roledescription.html: New test cases, updated expectations.
+        * platform/gtk/accessibility/aria-roledescription-expected.txt: New test cases, updated expectations.
+
 2017-05-08  Chris Dumez  <cdumez@apple.com>
 

trunk/LayoutTests/accessibility/aria-roledescription-expected.txt

@@ -5 +5 @@
 
 
-Role description: AXRoleDescription: Super Button
-Role description: AXRoleDescription: 
-Role description: AXRoleDescription: button
+Role description: AXRoleDescription: Super Button.
+Role description: AXRoleDescription: button.
+Role description: AXRoleDescription: button.
+Role description: AXRoleDescription: Super Button.
+Role description: AXRoleDescription: button.
 PASS successfullyParsed is true
 

trunk/LayoutTests/accessibility/aria-roledescription.html

@@ -18 +18 @@
 
         // Confirm we can override our role description.
-        debug("Role description: " + accessibilityController.accessibleElementById("btn").roleDescription);
+        debug("Role description: " + accessibilityController.accessibleElementById("btn").roleDescription + ".");
 
-        // Confirm our role description is empty when set to zero length.
+        // Confirm our role description returns to default when set to zero length.
         document.getElementById("btn").setAttribute("aria-roledescription", "");
-        debug("Role description: " + accessibilityController.accessibleElementById("btn").roleDescription);
+        debug("Role description: " + accessibilityController.accessibleElementById("btn").roleDescription + ".");
+
+        // Confirm our role description returns to default when set to whitespace only.
+        document.getElementById("btn").setAttribute("aria-roledescription", "     ");
+        debug("Role description: " + accessibilityController.accessibleElementById("btn").roleDescription + ".");
+
+        // Confirm our role description strips extraneous whitespace characters.
+        document.getElementById("btn").setAttribute("aria-roledescription", "          Super Button          ");
+        debug("Role description: " + accessibilityController.accessibleElementById("btn").roleDescription + ".");
 
         // Confirm our role description returns to default when removed.
         document.getElementById("btn").removeAttribute("aria-roledescription");
-        debug("Role description: " + accessibilityController.accessibleElementById("btn").roleDescription);
+        debug("Role description: " + accessibilityController.accessibleElementById("btn").roleDescription + ".");
     }
 }

trunk/LayoutTests/platform/gtk/accessibility/aria-roledescription-expected.txt

@@ -5 +5 @@
 
 
-Role description: AXRoleDescription: Super Button
-Role description: AXRoleDescription: 
-Role description: AXRoleDescription: 
+Role description: AXRoleDescription: Super Button.
+Role description: AXRoleDescription: .
+Role description: AXRoleDescription: .
+Role description: AXRoleDescription: Super Button.
+Role description: AXRoleDescription: .
 PASS successfullyParsed is true
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-05-08  Joanmarie Diggs  <jdiggs@igalia.com>
+
+        AX: don't expose empty roledescription
+        https://bugs.webkit.org/show_bug.cgi?id=163647
+
+        Reviewed by Chris Fleizach.
+
+        If the value of aria-roledescription is empty or contains only whitespace
+        characters, ignore the value. Also strip out leading or trailing whitespace
+        characters in the value.
+
+        No new tests: We already had coverage for an empty aria-roledescription value.
+        That test was updated to reflect the new behavior. New test cases were added
+        to cover a value that contains only whitespace characters, and a value with
+        leading and trailing whitespace characters.
+
+        * accessibility/AccessibilityObject.cpp:
+        (WebCore::AccessibilityObject::roleDescription):
+        * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
+        (-[WebAccessibilityObjectWrapper roleDescription]):
+
 2017-05-08  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/accessibility/AccessibilityObject.cpp

@@ -2333 +2333 @@
 String AccessibilityObject::roleDescription() const
 {
-    return getAttribute(aria_roledescriptionAttr);
+    return stripLeadingAndTrailingHTMLSpaces(getAttribute(aria_roledescriptionAttr));
 }
     

trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm

@@ -2208 +2208 @@
 
     const AtomicString& overrideRoleDescription = m_object->roleDescription();
-    if (!overrideRoleDescription.isNull())
+    if (!overrideRoleDescription.isNull() && !overrideRoleDescription.isEmpty())
         return overrideRoleDescription;