Changeset 248037 in webkit

Timestamp:

Jul 31, 2019, 7:36:06 AM (7 years ago)

Author:

commit-queue@webkit.org

Message:

AX: Re-enable accessibility/set-selected-text-range-after-newline.html test.
​https://bugs.webkit.org/show_bug.cgi?id=199431
<rdar://problem/52563340>

Patch by Andres Gonzalez <Andres Gonzalez> on 2019-07-31
Reviewed by Chris Fleizach.

Source/WebCore:

• Re-enabled LayoutTests/accessibility/set-selected-text-range-after-newline.html.
• Put back workaround in visiblePositionForIndexUsingCharacterIterator

that is needed for several accessibility issues.

• This workaround was rolled back because it was thought the cause of:

​https://bugs.webkit.org/show_bug.cgi?id=199434
It turned out that the actual cause of that hang was unrelated and was
fixed in:
​https://bugs.webkit.org/show_bug.cgi?id=199845

• editing/Editing.cpp:

(WebCore::visiblePositionForIndexUsingCharacterIterator):

LayoutTests:

• TestExpectations:
• accessibility/ios-simulator/set-selected-text-range-after-newline.html: Removed because it was the same as the one in the parent accessibility directory, so enabling it for iOS in ios-wk2/TestExpectations.
• platform/ios-wk2/TestExpectations:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/TestExpectations (modified) (1 diff)
• LayoutTests/accessibility/ios-simulator/set-selected-text-range-after-newline.html (deleted)
• LayoutTests/platform/ios-wk2/TestExpectations (modified) (2 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/editing/Editing.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-07-31  Andres Gonzalez  <andresg_22@apple.com>
+
+        AX: Re-enable accessibility/set-selected-text-range-after-newline.html test.
+        https://bugs.webkit.org/show_bug.cgi?id=199431
+        <rdar://problem/52563340>
+
+        Reviewed by Chris Fleizach.
+
+        * TestExpectations:
+        * accessibility/ios-simulator/set-selected-text-range-after-newline.html: Removed because it was the same as the one in the parent accessibility directory, so enabling it for iOS in ios-wk2/TestExpectations.
+        * platform/ios-wk2/TestExpectations:
+
 2019-07-31  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/LayoutTests/TestExpectations

@@ -2209 +2209 @@
 ### START OF -disabled tests
 
-webkit.org/b/199431 accessibility/set-selected-text-range-after-newline.html [ Skip ]
 webkit.org/b/20871 js/garbage-collect-after-string-appends.html [ Skip ]
 webkit.org/b/58323 compositing/objects/composited-object-alignment.html [ Skip ]

trunk/LayoutTests/platform/ios-wk2/TestExpectations

@@ -25 +25 @@
 editing/undo-manager [ Pass ]
 
+accessibility/set-selected-text-range-after-newline.html [ Pass ]
 accessibility/smart-invert.html [ Pass ]
 accessibility/smart-invert-reference.html [ Pass ]
@@ -997 +998 @@
 fast/replaced/border-radius-clip.html [ Failure ]
 accessibility/ios-simulator/press-fires-touch-events.html [ Skip ]
-webkit.org/b/199431 accessibility/ios-simulator/set-selected-text-range-after-newline.html [ Skip ]
 
 fast/text/combining-character-sequence-vertical.html [ ImageOnlyFailure ]

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-07-31  Andres Gonzalez  <andresg_22@apple.com>
+
+        AX: Re-enable accessibility/set-selected-text-range-after-newline.html test.
+        https://bugs.webkit.org/show_bug.cgi?id=199431
+        <rdar://problem/52563340>
+
+        Reviewed by Chris Fleizach.
+
+        - Re-enabled LayoutTests/accessibility/set-selected-text-range-after-newline.html.
+        - Put back workaround in visiblePositionForIndexUsingCharacterIterator
+        that is needed for several accessibility issues.
+        - This workaround was rolled back because it was thought the cause of:
+        https://bugs.webkit.org/show_bug.cgi?id=199434
+        It turned out that the actual cause of that hang was unrelated and was
+        fixed in:
+        https://bugs.webkit.org/show_bug.cgi?id=199845
+
+        * editing/Editing.cpp:
+        (WebCore::visiblePositionForIndexUsingCharacterIterator):
+
 2019-07-31  Devin Rousso  <drousso@apple.com>
 

trunk/Source/WebCore/editing/Editing.cpp

@@ -1123 +1123 @@
     it.advance(index - 1);
 
+    if (!it.atEnd() && it.text()[0] == '\n') {
+        // FIXME: workaround for collapsed range (where only start position is correct) emitted for some emitted newlines.
+        auto iteratorRange = it.range();
+        if (iteratorRange->startPosition() == iteratorRange->endPosition()) {
+            it.advance(1);
+            if (!it.atEnd())
+                return VisiblePosition(it.range()->startPosition());
+        }
+    }
+
     return { it.atEnd() ? range->endPosition() : it.range()->endPosition(), UPSTREAM };
 }