Changeset 127370 in webkit

Timestamp:

Sep 1, 2012 3:51:25 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[Gtk] No accessible caret-moved events found in certain content
​https://bugs.webkit.org/show_bug.cgi?id=72811

Part of the bug was due to expected accessible objects of DivRole
and ParagraphRole being ignored, in favor of including child blocks.

Patch by Joanmarie Diggs <​jdiggs@igalia.com> on 2012-09-01
Reviewed by Chris Fleizach.

Source/WebCore:

Test: platform/gtk/accessibility/spans-paragraphs-and-divs.html

• accessibility/AccessibilityObject.cpp:

(WebCore::AccessibilityObject::firstAnonymousBlockChild):
(WebCore):

• accessibility/AccessibilityObject.h:

(AccessibilityObject):
New method to return the first child which is an anonymous block.

• accessibility/gtk/AccessibilityObjectAtk.cpp:

(WebCore::AccessibilityObject::accessibilityPlatformIncludesObject):
Include paragraphs and divs which contain a non-nested anonymous block.

LayoutTests:

Added new test to verify that paragraphs and divs which contain anonymous
blocks are included in the accessible object hierarchy and have the correct
number of children with the expected role.

• platform/gtk/accessibility/spans-paragraphs-and-divs-expected.txt: Added.
• platform/gtk/accessibility/spans-paragraphs-and-divs.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/gtk/accessibility/spans-paragraphs-and-divs-expected.txt (added)
• LayoutTests/platform/gtk/accessibility/spans-paragraphs-and-divs.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/accessibility/AccessibilityObject.cpp (modified) (1 diff)
• Source/WebCore/accessibility/AccessibilityObject.h (modified) (1 diff)
• Source/WebCore/accessibility/gtk/AccessibilityObjectAtk.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-09-01  Joanmarie Diggs  <jdiggs@igalia.com>
+
+        [Gtk] No accessible caret-moved events found in certain content
+        https://bugs.webkit.org/show_bug.cgi?id=72811
+
+        Part of the bug was due to expected accessible objects of DivRole
+        and ParagraphRole being ignored, in favor of including child blocks.
+
+        Reviewed by Chris Fleizach.
+
+        Added new test to verify that paragraphs and divs which contain anonymous
+        blocks are included in the accessible object hierarchy and have the correct
+        number of children with the expected role.
+
+        * platform/gtk/accessibility/spans-paragraphs-and-divs-expected.txt: Added.
+        * platform/gtk/accessibility/spans-paragraphs-and-divs.html: Added.
+
 2012-09-01  Zan Dobersek  <zandobersek@gmail.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-09-01  Joanmarie Diggs  <jdiggs@igalia.com>
+
+        [Gtk] No accessible caret-moved events found in certain content
+        https://bugs.webkit.org/show_bug.cgi?id=72811
+
+        Part of the bug was due to expected accessible objects of DivRole
+        and ParagraphRole being ignored, in favor of including child blocks.
+
+        Reviewed by Chris Fleizach.
+
+        Test: platform/gtk/accessibility/spans-paragraphs-and-divs.html
+
+        * accessibility/AccessibilityObject.cpp:
+        (WebCore::AccessibilityObject::firstAnonymousBlockChild):
+        (WebCore):
+        * accessibility/AccessibilityObject.h:
+        (AccessibilityObject):
+        New method to return the first child which is an anonymous block.
+        * accessibility/gtk/AccessibilityObjectAtk.cpp:
+        (WebCore::AccessibilityObject::accessibilityPlatformIncludesObject):
+        Include paragraphs and divs which contain a non-nested anonymous block.
+
 2012-09-01  Joanmarie Diggs  <jdiggs@igalia.com>
 

trunk/Source/WebCore/accessibility/AccessibilityObject.cpp

@@ -1352 +1352 @@
 
     return this == axObject || axObject->isDescendantOfObject(this);
+}
+
+AccessibilityObject* AccessibilityObject::firstAnonymousBlockChild() const
+{
+    for (AccessibilityObject* child = firstChild(); child; child = child->nextSibling()) {
+        if (child->renderer() && child->renderer()->isAnonymousBlock())
+            return child;
+    }
+    return 0;
 }
 

trunk/Source/WebCore/accessibility/AccessibilityObject.h

@@ -587 +587 @@
     bool isDescendantOfObject(const AccessibilityObject*) const;
     bool isAncestorOfObject(const AccessibilityObject*) const;
+    AccessibilityObject* firstAnonymousBlockChild() const;
     
     static AccessibilityRole ariaRoleToWebCoreRole(const String&);

trunk/Source/WebCore/accessibility/gtk/AccessibilityObjectAtk.cpp

@@ -79 +79 @@
         return IgnoreObject;
 
+    // Given a paragraph or div containing a non-nested anonymous block, WebCore
+    // ignores the paragraph or div and includes the block. We want the opposite:
+    // ATs are expecting accessible objects associated with textual elements. They
+    // usually have no need for the anonymous block. And when the wrong objects
+    // get included or ignored, needed accessibility signals do not get emitted.
+    if (role == ParagraphRole || role == DivRole) {
+        AccessibilityObject* child = firstAnonymousBlockChild();
+        if (!child)
+            return DefaultBehavior;
+
+        child = child->firstChild();
+        if (child->isLink() || !child->firstAnonymousBlockChild())
+            return IncludeObject;
+    }
+
     // Block spans result in objects of ATK_ROLE_PANEL which are almost always unwanted.
     // However, if we ignore block spans whose parent is the body, the child controls