[ iOS Simulator] REGRESSION (r241821) Layout Test platform/ipad/fast/viewport/viewpor...
authorcdumez@apple.com <cdumez@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 22 Mar 2019 17:02:13 +0000 (17:02 +0000)
committercdumez@apple.com <cdumez@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 22 Mar 2019 17:02:13 +0000 (17:02 +0000)
https://bugs.webkit.org/show_bug.cgi?id=195348
<rdar://problem/48622090>

Reviewed by Alex Christensen.

Make sure webView.configuration.preferences._shouldIgnoreMetaViewport gets reset
to NO when test.options().shouldIgnoreMetaViewport is false.

* WebKitTestRunner/ios/TestControllerIOS.mm:
(WTR::TestController::platformConfigureViewForTest):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@243385 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/WebKitTestRunner/ios/TestControllerIOS.mm

index 68d40a6..383a631 100644 (file)
@@ -1,5 +1,19 @@
 2019-03-22  Chris Dumez  <cdumez@apple.com>
 
+        [ iOS Simulator] REGRESSION (r241821) Layout Test platform/ipad/fast/viewport/viewport-unchanged-by-minimum-effective-width-if-not-ignore-meta-viewport.html is a flaky failure on bots
+        https://bugs.webkit.org/show_bug.cgi?id=195348
+        <rdar://problem/48622090>
+
+        Reviewed by Alex Christensen.
+
+        Make sure webView.configuration.preferences._shouldIgnoreMetaViewport gets reset
+        to NO when test.options().shouldIgnoreMetaViewport is false.
+
+        * WebKitTestRunner/ios/TestControllerIOS.mm:
+        (WTR::TestController::platformConfigureViewForTest):
+
+2019-03-22  Chris Dumez  <cdumez@apple.com>
+
         Prewarmed processes should be usable with any website data store
         https://bugs.webkit.org/show_bug.cgi?id=196104
 
index d4058f3..eaf1f5a 100644 (file)
@@ -178,8 +178,7 @@ void TestController::platformConfigureViewForTest(const TestInvocation& test)
         
     TestRunnerWKWebView *webView = mainWebView()->platformView();
 
-    if (test.options().shouldIgnoreMetaViewport)
-        webView.configuration.preferences._shouldIgnoreMetaViewport = YES;
+    webView.configuration.preferences._shouldIgnoreMetaViewport = test.options().shouldIgnoreMetaViewport;
 
     CGRect screenBounds = [UIScreen mainScreen].bounds;
     CGSize oldSize = webView.bounds.size;