Changeset 244105 in webkit

Timestamp:

Apr 10, 2019 12:59:14 AM (5 years ago)

Author:

Carlos Garcia Campos

Message:

[ATK] Test accessibility/insert-children-assert.html is crashing since added in r216980
​https://bugs.webkit.org/show_bug.cgi?id=172281
<rdar://problem/37030990>

Reviewed by Joanmarie Diggs.

Source/WebCore:

The crash happens because at some point the test tries to get the anonymous block text, getting the RenderText as
first child and RenderFullScreen as last child and the latter doesn't have a node. This is because in atk we do
things differently, we don't include the static text elements individually, but parent element uses
textUnderElement() to get all the pieces together. We can just turn the asserts into actual nullptr checks.

Fixes: accessibility/insert-children-assert.html

• accessibility/AccessibilityRenderObject.cpp:

(WebCore::AccessibilityRenderObject::textUnderElement const):

LayoutTests:

Update the test to expect the whole content text on atk and remove the test expectations.

• accessibility/insert-children-assert.html:
• platform/gtk/TestExpectations:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/accessibility/insert-children-assert.html (modified) (1 diff)
• LayoutTests/platform/gtk/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/accessibility/AccessibilityRenderObject.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-04-10  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [ATK] Test accessibility/insert-children-assert.html is crashing since added in r216980
+        https://bugs.webkit.org/show_bug.cgi?id=172281
+        <rdar://problem/37030990>
+
+        Reviewed by Joanmarie Diggs.
+
+        Update the test to expect the whole content text on atk and remove the test expectations.
+
+        * accessibility/insert-children-assert.html:
+        * platform/gtk/TestExpectations:
+
 2019-04-09  John Wilander  <wilander@apple.com>
 

trunk/LayoutTests/accessibility/insert-children-assert.html

@@ -28 +28 @@
     if ("webkitRequestFullScreen" in Element.prototype) {
         var content = accessibilityController.accessibleElementById("content");
-        var value = "AXValue: d";
+        var value;
+        if (accessibilityController.platformName == "atk")
+            value = "AXValue: ab<\\n>c<\\n>de<\\n>";
+        else
+            value = "AXValue: d";
         document.body.offsetTop;
         var span = document.getElementsByTagName('span')[0];

trunk/LayoutTests/platform/gtk/TestExpectations

@@ -1288 +1288 @@
 webkit.org/b/163782 media/video-played-ranges-1.html [ Crash Pass Failure ]
 
-webkit.org/b/172281 accessibility/insert-children-assert.html [ Crash ]
-
 webkit.org/b/172955 media/video-preload.html [ Crash Pass ]
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-04-10  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [ATK] Test accessibility/insert-children-assert.html is crashing since added in r216980
+        https://bugs.webkit.org/show_bug.cgi?id=172281
+        <rdar://problem/37030990>
+
+        Reviewed by Joanmarie Diggs.
+
+        The crash happens because at some point the test tries to get the anonymous block text, getting the RenderText as
+        first child and RenderFullScreen as last child and the latter doesn't have a node. This is because in atk we do
+        things differently, we don't include the static text elements individually, but parent element uses
+        textUnderElement() to get all the pieces together. We can just turn the asserts into actual nullptr checks.
+
+        Fixes: accessibility/insert-children-assert.html
+
+        * accessibility/AccessibilityRenderObject.cpp:
+        (WebCore::AccessibilityRenderObject::textUnderElement const):
+
 2019-04-09  Keith Rollin  <krollin@apple.com>
 

trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp

@@ -641 +641 @@
             RenderObject* firstChildRenderer = m_renderer->firstChildSlow();
             RenderObject* lastChildRenderer = m_renderer->lastChildSlow();
-            if (firstChildRenderer && lastChildRenderer) {
-                ASSERT(firstChildRenderer->node());
-                ASSERT(lastChildRenderer->node());
-
+            if (firstChildRenderer && firstChildRenderer->node() && lastChildRenderer && lastChildRenderer->node()) {
                 // We define the start and end positions for the range as the ones right before and after
                 // the first and the last nodes in the DOM tree that is wrapped inside the anonymous block.