Changeset 216980 in webkit

Timestamp:

May 17, 2017 10:34:27 AM (7 years ago)

Author:

n_wang@apple.com

Message:

ASSERTION FAILED in WebCore::AccessibilityNodeObject::insertChild()
​https://bugs.webkit.org/show_bug.cgi?id=171927
<rdar://problem/32109781>

Reviewed by Chris Fleizach.

Source/WebCore:

The nextSibling() logic might include the continuation sibling that's not
the child of the current renderer. Make sure we only insert the valid child.

Test: accessibility/insert-children-assert.html

• accessibility/AccessibilityObject.cpp:

(WebCore::AccessibilityObject::setIsIgnoredFromParentDataForChild):

• accessibility/AccessibilityRenderObject.cpp:

(WebCore::AccessibilityRenderObject::nextSibling):

LayoutTests:

• accessibility/insert-children-assert-expected.txt: Added.
• accessibility/insert-children-assert.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/accessibility/insert-children-assert-expected.txt (added)
• LayoutTests/accessibility/insert-children-assert.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/accessibility/AccessibilityObject.cpp (modified) (1 diff)
• Source/WebCore/accessibility/AccessibilityRenderObject.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2017-05-17  Nan Wang  <n_wang@apple.com>
+
+        ASSERTION FAILED in WebCore::AccessibilityNodeObject::insertChild()
+        https://bugs.webkit.org/show_bug.cgi?id=171927
+        <rdar://problem/32109781>
+
+        Reviewed by Chris Fleizach.
+
+        * accessibility/insert-children-assert-expected.txt: Added.
+        * accessibility/insert-children-assert.html: Added.
+
 2017-05-17  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-05-17  Nan Wang  <n_wang@apple.com>
+
+        ASSERTION FAILED in WebCore::AccessibilityNodeObject::insertChild()
+        https://bugs.webkit.org/show_bug.cgi?id=171927
+        <rdar://problem/32109781>
+
+        Reviewed by Chris Fleizach.
+
+        The nextSibling() logic might include the continuation sibling that's not
+        the child of the current renderer. Make sure we only insert the valid child.
+
+        Test: accessibility/insert-children-assert.html
+
+        * accessibility/AccessibilityObject.cpp:
+        (WebCore::AccessibilityObject::setIsIgnoredFromParentDataForChild):
+        * accessibility/AccessibilityRenderObject.cpp:
+        (WebCore::AccessibilityRenderObject::nextSibling):
+
 2017-05-17  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/accessibility/AccessibilityObject.cpp

@@ -3316 +3316 @@
 void AccessibilityObject::setIsIgnoredFromParentDataForChild(AccessibilityObject* child)
 {
-    if (!child || child->parentObject() != this)
+    if (!child)
         return;
+    
+    if (child->parentObject() != this) {
+        child->clearIsIgnoredFromParentData();
+        return;
+    }
     
     AccessibilityIsIgnoredFromParentData result = AccessibilityIsIgnoredFromParentData(this);

trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp

@@ -411 +411 @@
         return nullptr;
     
-    return axObjectCache()->getOrCreate(nextSibling);
+    // Make sure next sibling has the same parent.
+    AccessibilityObject* nextObj = axObjectCache()->getOrCreate(nextSibling);
+    if (nextObj && nextObj->parentObject() != this->parentObject())
+        return nullptr;
+    
+    return nextObj;
 }