Changeset 292749 in webkit

Timestamp:

Apr 11, 2022 5:43:49 PM (2 years ago)

Author:

Alan Bujtas

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:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/ios/TestExpectations (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/DumpRenderTree/mac/DumpRenderTree.mm (modified) (1 diff)
• Tools/WebKitTestRunner/ios/TestControllerIOS.mm (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2022-04-11  Alan Bujtas  <zalan@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  <tsavell@apple.com>
 

trunk/LayoutTests/platform/ios/TestExpectations

@@ -3427 +3427 @@
 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 ]

trunk/Tools/ChangeLog

@@ +1 @@
+2022-04-11  Alan Bujtas  <zalan@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  <gsnedders@apple.com>
 

trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm

@@ -1733 +1733 @@
     adjustWebDocumentForStandardViewport(gWebBrowserView.get(), gWebScrollView.get());
     [webView _setAllowsMessaging:YES];
+    [[UIScreen mainScreen] _setScale:2.0];
 #endif
     [webView setEditable:NO];

trunk/Tools/WebKitTestRunner/ios/TestControllerIOS.mm

@@ -159 +159 @@
     [[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.