Changeset 251858 in webkit

Timestamp:

Oct 31, 2019 10:39:51 AM (4 years ago)

Author:

Wenson Hsieh

Message:

[iOS] imported/mozilla/svg/text/textpath-selection.svg is still flaky
​https://bugs.webkit.org/show_bug.cgi?id=203659
<rdar://problem/52124292>

Reviewed by Tim Horton.

This test still fails in some internal test runner configurations, because the iOS text selection grabber dots
sometimes show up in the actual result and not in the expectation. This still happens even after suppressing
UITextSelectionView during ref test snapshotting in r251526, since the selection grabber dots are embedded as
subviews of the text interaction container view, rather than UITextSelectionView itself, so hiding
UITextSelectionView does not affect the visibility of these grabber views (UITextRangeView's -startGrabber and
-endGrabber).

To address this, we augment the change made in r251526 to apply to the start and end grabber views as well.

• WebKitTestRunner/ios/PlatformWebViewIOS.mm:

(WTR::PlatformWebView::windowSnapshotImage):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• WebKitTestRunner/ios/PlatformWebViewIOS.mm (modified) (3 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2019-10-30  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        [iOS] imported/mozilla/svg/text/textpath-selection.svg is still flaky
+        https://bugs.webkit.org/show_bug.cgi?id=203659
+        <rdar://problem/52124292>
+
+        Reviewed by Tim Horton.
+
+        This test still fails in some internal test runner configurations, because the iOS text selection grabber dots
+        sometimes show up in the actual result and not in the expectation. This still happens even after suppressing
+        UITextSelectionView during ref test snapshotting in r251526, since the selection grabber dots are embedded as
+        subviews of the text interaction container view, rather than UITextSelectionView itself, so hiding
+        UITextSelectionView does not affect the visibility of these grabber views (UITextRangeView's -startGrabber and
+        -endGrabber).
+
+        To address this, we augment the change made in r251526 to apply to the start and end grabber views as well.
+
+        * WebKitTestRunner/ios/PlatformWebViewIOS.mm:
+        (WTR::PlatformWebView::windowSnapshotImage):
+
 2019-10-31  Alex Christensen  <achristensen@webkit.org>
 

trunk/Tools/WebKitTestRunner/ios/PlatformWebViewIOS.mm

@@ -38 +38 @@
 #import <wtf/BlockObjCExceptions.h>
 #import <wtf/RetainPtr.h>
+#import <wtf/Vector.h>
 #import <wtf/WeakObjCPtr.h>
 
@@ -325 +326 @@
     RELEASE_ASSERT(viewSize.height);
 
-    BOOL shouldUnhideSelectionView = NO;
-    WeakObjCPtr<UIView> selectionView = [platformView() valueForKeyPath:@"_currentContentView.interactionAssistant.selectionView"];
+    UIView *selectionView = [platformView() valueForKeyPath:@"_currentContentView.interactionAssistant.selectionView"];
+    UIView *startGrabberView = [selectionView valueForKeyPath:@"rangeView.startGrabber"];
+    UIView *endGrabberView = [selectionView valueForKeyPath:@"rangeView.endGrabber"];
+    Vector<WeakObjCPtr<UIView>, 3> viewsToUnhide;
     if (![selectionView isHidden]) {
-        shouldUnhideSelectionView = YES;
         [selectionView setHidden:YES];
+        viewsToUnhide.uncheckedAppend(selectionView);
+    }
+
+    if (![startGrabberView isHidden]) {
+        [startGrabberView setHidden:YES];
+        viewsToUnhide.uncheckedAppend(startGrabberView);
+    }
+
+    if (![endGrabberView isHidden]) {
+        [endGrabberView setHidden:YES];
+        viewsToUnhide.uncheckedAppend(endGrabberView);
     }
 
@@ -372 +385 @@
     RELEASE_ASSERT(result);
 #endif
-    if (shouldUnhideSelectionView)
-        [selectionView setHidden:NO];
+    for (auto view : viewsToUnhide)
+        [view setHidden:NO];
 
     return result;