Changeset 227523 in webkit

Timestamp:

Jan 24, 2018 8:09:52 AM (6 years ago)

Author:

Ms2ger@igalia.com

Message:

[GTK] Fix some test failures in ATK selection handling.
​https://bugs.webkit.org/show_bug.cgi?id=168369
<rdar://problem/30534881>

Reviewed by Joanmarie Diggs.

Source/WebCore:

In r208479, selectionBelongsToObject was changed to return false if the
intersectsNode call returns an exception.

In particular, this caused accessibility/gtk/text-at-offset-textarea.html
to fail. In this test, the selection is situated in the shadow DOM of the
textarea, while the node that is checked for intersection is the textarea
itself. In line with the standard, intersectsNode returns an exception in
this case.

This caused webkitAccessibleText{Word, Line, Sentence}ForBoundary to stop
returning the expected text in the tested case. Removing this check fixes
the test, along with some others.

Tests: accessibility/gtk/text-at-offset-textarea.html

accessibility/gtk/text-at-offset-textinput.html
accessibility/selected-text-range-aria-elements.html
accessibility/textarea-selected-text-range.html

• accessibility/atk/WebKitAccessibleInterfaceText.cpp:

(getSelectionOffsetsForObject): Remove the selectionBelongsToObject() call.

LayoutTests:

Update test expectations for tests that pass again.

• platform/gtk/TestExpectations:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/gtk/TestExpectations (modified) (2 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceText.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2018-01-24  Ms2ger  <Ms2ger@igalia.com>
+
+        [GTK] Fix some test failures in ATK selection handling.
+        https://bugs.webkit.org/show_bug.cgi?id=168369
+        <rdar://problem/30534881>
+
+        Reviewed by Joanmarie Diggs.
+
+        Update test expectations for tests that pass again.
+
+        * platform/gtk/TestExpectations:
+
 2018-01-24  Manuel Rego Casasnovas  <rego@igalia.com>
 

trunk/LayoutTests/platform/gtk/TestExpectations

@@ -2936 +2936 @@
 webkit.org/b/151267 imported/blink/webexposed/webkit-focus-ring-exposed-to-quirks-mode.html [ ImageOnlyFailure ]
 
-webkit.org/b/152057 accessibility/textarea-selected-text-range.html [ Failure Timeout ]
-
 webkit.org/b/152788 imported/mozilla/svg/filter-scaled-02.html [ ImageOnlyFailure Pass ]
 
@@ -3080 +3078 @@
 webkit.org/b/168192 http/tests/media/hls/video-duration-accessibility.html [ Timeout Failure ]
 
-webkit.org/b/168369 accessibility/gtk/text-at-offset-textarea.html [ Failure ]
-webkit.org/b/168369 accessibility/gtk/text-at-offset-textinput.html [ Failure ]
 webkit.org/b/168370 accessibility/hidden-th-still-column-header.html [ Failure ]
-webkit.org/b/168370 accessibility/selected-text-range-aria-elements.html [ Failure ]
 
 webkit.org/b/168373 fullscreen/video-controls-rtl.html [ Failure ]

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-01-24  Ms2ger  <Ms2ger@igalia.com>
+
+        [GTK] Fix some test failures in ATK selection handling.
+        https://bugs.webkit.org/show_bug.cgi?id=168369
+        <rdar://problem/30534881>
+
+        Reviewed by Joanmarie Diggs.
+
+        In r208479, selectionBelongsToObject was changed to return false if the
+        intersectsNode call returns an exception.
+
+        In particular, this caused accessibility/gtk/text-at-offset-textarea.html
+        to fail. In this test, the selection is situated in the shadow DOM of the
+        textarea, while the node that is checked for intersection is the textarea
+        itself. In line with the standard, intersectsNode returns an exception in
+        this case.
+
+        This caused webkitAccessibleText{Word, Line, Sentence}ForBoundary to stop
+        returning the expected text in the tested case. Removing this check fixes
+        the test, along with some others.
+
+        Tests: accessibility/gtk/text-at-offset-textarea.html
+               accessibility/gtk/text-at-offset-textinput.html
+               accessibility/selected-text-range-aria-elements.html
+               accessibility/textarea-selected-text-range.html
+
+        * accessibility/atk/WebKitAccessibleInterfaceText.cpp:
+        (getSelectionOffsetsForObject): Remove the selectionBelongsToObject() call.
+
 2018-01-18  Sergio Villar Senin  <svillar@igalia.com>
 

trunk/Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceText.cpp

@@ -392 +392 @@
     Position lastValidPosition = lastPositionInOrAfterNode(node->lastDescendant());
 
-    // Early return with proper values if the selection falls entirely out of the object.
-    if (!selectionBelongsToObject(coreObject, selection)) {
-        startOffset = comparePositions(selection.start(), firstValidPosition) <= 0 ? 0 : accessibilityObjectLength(coreObject);
-        endOffset = startOffset;
-        return;
-    }
-
     // Find the proper range for the selection that falls inside the object.
     Position nodeRangeStart = selection.start();