Changeset 174992 in webkit

Timestamp:

Oct 21, 2014 11:44:20 AM (10 years ago)

Author:

jdiggs@igalia.com

Message:

AX: [ATK] CSS-generated text content not exposed to assistive technologies
​https://bugs.webkit.org/show_bug.cgi?id=137669

Reviewed by Chris Fleizach.

Source/WebCore:

Do not use a text iterator to get the text for elements which include
pseudo elements.

Test: accessibility/css-content-attribute.html

• accessibility/AccessibilityRenderObject.cpp:

(WebCore::AccessibilityRenderObject::textUnderElement):

LayoutTests:

Moved the Mac platform test and modified it to dump the accessible tree
and string values rather than a platform-specific hierarchy so that it
could be shared across platforms.

• accessibility/css-content-attribute.html: Added.
• platform/gtk/accessibility/css-content-attribute-expected.txt: Added.
• platform/mac/accessibility/css-content-attribute-expected.txt: Modified to reflect new output.
• platform/mac/accessibility/css-content-attribute.html: Removed.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/accessibility/css-content-attribute.html (added)
• LayoutTests/platform/gtk/accessibility/css-content-attribute-expected.txt (added)
• LayoutTests/platform/mac/accessibility/css-content-attribute-expected.txt (modified) (2 diffs)
• LayoutTests/platform/mac/accessibility/css-content-attribute.html (deleted)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/accessibility/AccessibilityRenderObject.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2014-10-21  Joanmarie Diggs  <jdiggs@igalia.com>
+
+        AX: [ATK] CSS-generated text content not exposed to assistive technologies
+        https://bugs.webkit.org/show_bug.cgi?id=137669
+
+        Reviewed by Chris Fleizach.
+
+        Moved the Mac platform test and modified it to dump the accessible tree
+        and string values rather than a platform-specific hierarchy so that it
+        could be shared across platforms.
+
+        * accessibility/css-content-attribute.html: Added.
+        * platform/gtk/accessibility/css-content-attribute-expected.txt: Added.
+        * platform/mac/accessibility/css-content-attribute-expected.txt: Modified to reflect new output.
+        * platform/mac/accessibility/css-content-attribute.html: Removed.
+
 2014-10-21  Zalan Bujtas  <zalan@apple.com>
 

trunk/LayoutTests/platform/mac/accessibility/css-content-attribute-expected.txt

@@ -1 +1 @@
 SAMPLE
 
+End of test
 This tests that when the content attribute in CSS is used, the correct values are returned.
 
@@ -6 +7 @@
 
 
-PASS body.childAtIndex(0).childAtIndex(0).role is 'AXRole: AXStaticText'
-PASS body.childAtIndex(0).childAtIndex(1).role is 'AXRole: AXStaticText'
-PASS body.childAtIndex(0).childAtIndex(2).role is 'AXRole: AXStaticText'
-PASS body.childAtIndex(0).childAtIndex(0).stringValue is 'AXValue: This is a'
-PASS body.childAtIndex(0).childAtIndex(1).stringValue is 'AXValue: SAMPLE'
-PASS body.childAtIndex(0).childAtIndex(2).stringValue is 'AXValue: Headline'
+AXRole: AXWebArea AXValue: 
+  AXRole: AXHeading AXValue: 1
+    AXRole: AXStaticText AXValue: This is a
+    AXRole: AXStaticText AXValue: SAMPLE
+    AXRole: AXStaticText AXValue: Headline
+  AXRole: AXGroup AXValue: 
 PASS successfullyParsed is true
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-10-21  Joanmarie Diggs  <jdiggs@igalia.com>
+
+        AX: [ATK] CSS-generated text content not exposed to assistive technologies
+        https://bugs.webkit.org/show_bug.cgi?id=137669
+
+        Reviewed by Chris Fleizach.
+
+        Do not use a text iterator to get the text for elements which include
+        pseudo elements.
+
+        Test: accessibility/css-content-attribute.html
+
+        * accessibility/AccessibilityRenderObject.cpp:
+        (WebCore::AccessibilityRenderObject::textUnderElement):
+
 2014-10-21  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp

@@ -638 +638 @@
 #endif
 
+    // rangeOfContents does not include CSS-generated content.
+    if (m_renderer->isBeforeOrAfterContent())
+        return AccessibilityNodeObject::textUnderElement(mode);
+
     // We use a text iterator for text objects AND for those cases where we are
     // explicitly asking for the full text under a given element.
@@ -646 +650 @@
         RefPtr<Range> textRange;
         if (Node* node = m_renderer->node()) {
+            // rangeOfContents does not include CSS-generated content.
+            Node* firstChild = node->pseudoAwareFirstChild();
+            Node* lastChild = node->pseudoAwareLastChild();
+            if ((firstChild && firstChild->isPseudoElement()) || (lastChild && lastChild->isPseudoElement()))
+                return AccessibilityNodeObject::textUnderElement(mode);
+
             nodeDocument = &node->document();
             textRange = rangeOfContents(*node);