Title: [292749] trunk
Revision
292749
Author
za...@apple.com
Date
2022-04-11 17:43:49 -0700 (Mon, 11 Apr 2022)

Log Message

[ iOS iPhone 12 ] fast/hidpi & fast/layers/hidpi tests are flaky text/image failing
https://bugs.webkit.org/show_bug.cgi?id=232384
<rdar://problem/84714121>

Reviewed by Wenson Hsieh.

Tools:

Rotation (initiated by UiController::simulateRotationLikeSafari) may confuse UIScreen and produce unexpected scale value.
This patch ensures that we set the scale value back to the default (2) in between test runs.
(Currently we only set this value in TestController::platformInitialize/dumpRenderTree.)

* DumpRenderTree/mac/DumpRenderTree.mm:
(resetWebViewToConsistentState):
* WebKitTestRunner/ios/TestControllerIOS.mm:
(WTR::TestController::platformResetStateToConsistentValues):

LayoutTests:

* platform/ios/TestExpectations:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (292748 => 292749)


--- trunk/LayoutTests/ChangeLog	2022-04-12 00:40:29 UTC (rev 292748)
+++ trunk/LayoutTests/ChangeLog	2022-04-12 00:43:49 UTC (rev 292749)
@@ -1,3 +1,13 @@
+2022-04-11  Alan Bujtas  <za...@apple.com>
+
+        [ iOS iPhone 12 ] fast/hidpi & fast/layers/hidpi tests are flaky text/image failing
+        https://bugs.webkit.org/show_bug.cgi?id=232384
+        <rdar://problem/84714121>
+
+        Reviewed by Wenson Hsieh.
+
+        * platform/ios/TestExpectations:
+
 2022-04-11  Truitt Savell  <tsav...@apple.com>
 
         REGRESSION (249023-249029@main): [ Monterey ] http/wpt/cache-storage/cache-storage-networkprocess-crash.html is a flaky CRASH with ASSERTION FAILED: m_pageMap.isEmpty()

Modified: trunk/LayoutTests/platform/ios/TestExpectations (292748 => 292749)


--- trunk/LayoutTests/platform/ios/TestExpectations	2022-04-12 00:40:29 UTC (rev 292748)
+++ trunk/LayoutTests/platform/ios/TestExpectations	2022-04-12 00:43:49 UTC (rev 292749)
@@ -3426,11 +3426,6 @@
 model-element/model-element-camera.html [ Skip ]
 model-element/model-element-interactive-dragging.html [ Skip ]
 
-# webkit.org/b/232384 these are flaky failures on iOS
-fast/hidpi/image-srcset-simple-1x.html [ Pass Failure ]
-fast/hidpi/image-srcset-simple-in-variable-1x.html [ Pass Failure ]
-fast/hidpi/pdf-image-scaled.html [ Pass Failure ]
-
 # webkit.org/b/201982 These are flaky failures on iOS
 fast/images/exif-orientation-svg-feimage.html [ Pass Failure ]
 fast/images/exif-orientation-background-image-repeat.html [ Pass Failure ]

Modified: trunk/Tools/ChangeLog (292748 => 292749)


--- trunk/Tools/ChangeLog	2022-04-12 00:40:29 UTC (rev 292748)
+++ trunk/Tools/ChangeLog	2022-04-12 00:43:49 UTC (rev 292749)
@@ -1,3 +1,20 @@
+2022-04-11  Alan Bujtas  <za...@apple.com>
+
+        [ iOS iPhone 12 ] fast/hidpi & fast/layers/hidpi tests are flaky text/image failing
+        https://bugs.webkit.org/show_bug.cgi?id=232384
+        <rdar://problem/84714121>
+
+        Reviewed by Wenson Hsieh.
+
+        Rotation (initiated by UiController::simulateRotationLikeSafari) may confuse UIScreen and produce unexpected scale value.
+        This patch ensures that we set the scale value back to the default (2) in between test runs.
+        (Currently we only set this value in TestController::platformInitialize/dumpRenderTree.)
+
+        * DumpRenderTree/mac/DumpRenderTree.mm:
+        (resetWebViewToConsistentState):
+        * WebKitTestRunner/ios/TestControllerIOS.mm:
+        (WTR::TestController::platformResetStateToConsistentValues):
+
 2022-04-11  Sam Sneddon  <gsnedd...@apple.com>
 
         webkitpy.w3c.test_exporter assumes all exceptions are HTTPError

Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm (292748 => 292749)


--- trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm	2022-04-12 00:40:29 UTC (rev 292748)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm	2022-04-12 00:43:49 UTC (rev 292749)
@@ -1732,6 +1732,7 @@
 #if PLATFORM(IOS_FAMILY)
     adjustWebDocumentForStandardViewport(gWebBrowserView.get(), gWebScrollView.get());
     [webView _setAllowsMessaging:YES];
+    [[UIScreen mainScreen] _setScale:2.0];
 #endif
     [webView setEditable:NO];
     [(EditingDelegate *)[webView editingDelegate] setAcceptsEditing:YES];

Modified: trunk/Tools/WebKitTestRunner/ios/TestControllerIOS.mm (292748 => 292749)


--- trunk/Tools/WebKitTestRunner/ios/TestControllerIOS.mm	2022-04-12 00:40:29 UTC (rev 292748)
+++ trunk/Tools/WebKitTestRunner/ios/TestControllerIOS.mm	2022-04-12 00:43:49 UTC (rev 292749)
@@ -158,6 +158,7 @@
     [pasteboardConsistencyEnforcer() clearPasteboard];
     [[UIApplication sharedApplication] _cancelAllTouches];
     [[UIDevice currentDevice] setOrientation:UIDeviceOrientationPortrait animated:NO];
+    [[UIScreen mainScreen] _setScale:2.0];
 
     // Ensures that only the UCB is on-screen when showing the keyboard, if the hardware keyboard is attached.
     TIPreferencesController *textInputPreferences = [getTIPreferencesControllerClass() sharedPreferencesController];
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to