Changeset 246276 in webkit

Timestamp:

Jun 10, 2019 1:11:17 PM (5 years ago)

Author:

Wenson Hsieh

Message:

[iOS] fast/xsl tests are flaky when run after certain viewport shrink-to-fit tests
​https://bugs.webkit.org/show_bug.cgi?id=198699
<rdar://problem/50501718>

Reviewed by Simon Fraser.

Source/WebKit:

Lift logic that sets the "IsKnownToLayOutWiderThanViewport" flag out of resetViewportDefaultConfiguration, and
into didCommitLoad instead (along with other logic for resetting viewport arguments). The previous method,
resetViewportDefaultConfiguration, was being triggered very frequently undo didReceiveMobileDocType, causing the
shrink-to-fit heuristic to sometimes take no effect. The original intention here was simply to reset the flag
upon page load.

• WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::didCommitLoad):

• WebProcess/WebPage/ios/WebPageIOS.mm:

(WebKit::WebPage::resetViewportDefaultConfiguration):

Tools:

Add logic to platformResetPreferencesToConsistentValues, to reset the "ShouldIgnoreMetaViewport" preference.
While this is already being adjusted in platformConfigureViewForTest using the correct, TestOptions, this might
happen too late, allowing the shrink-to-fit-content heuristic to unexpectedly kick in on tests where testing
viewport parameters are used.

• WebKitTestRunner/ios/TestControllerIOS.mm:

(WTR::TestController::platformResetPreferencesToConsistentValues):
(WTR::TestController::platformConfigureViewForTest):

Location:

trunk

Files:

• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/WebProcess/WebPage/WebPage.cpp (modified) (1 diff)
• Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/WebKitTestRunner/ios/TestControllerIOS.mm (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-06-10  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        [iOS] fast/xsl tests are flaky when run after certain viewport shrink-to-fit tests
+        https://bugs.webkit.org/show_bug.cgi?id=198699
+        <rdar://problem/50501718>
+
+        Reviewed by Simon Fraser.
+
+        Lift logic that sets the "IsKnownToLayOutWiderThanViewport" flag out of resetViewportDefaultConfiguration, and
+        into didCommitLoad instead (along with other logic for resetting viewport arguments). The previous method,
+        resetViewportDefaultConfiguration, was being triggered very frequently undo didReceiveMobileDocType, causing the
+        shrink-to-fit heuristic to sometimes take no effect. The original intention here was simply to reset the flag
+        upon page load.
+
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::didCommitLoad):
+        * WebProcess/WebPage/ios/WebPageIOS.mm:
+        (WebKit::WebPage::resetViewportDefaultConfiguration):
+
 2019-06-10  Timothy Hatcher  <timothy@apple.com>
 

trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp

@@ -5756 +5756 @@
         viewportChanged = true;
 
+    if (m_viewportConfiguration.setIsKnownToLayOutWiderThanViewport(false))
+        viewportChanged = true;
+
     if (viewportChanged)
         viewportConfigurationChanged();

trunk/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm

@@ -3211 +3211 @@
     else
         m_viewportConfiguration.setDefaultConfiguration(parametersForStandardFrame());
-    m_viewportConfiguration.setIsKnownToLayOutWiderThanViewport(false);
 
     if (auto overriddenViewLayoutWidth = document->quirks().overriddenViewLayoutWidth(m_viewportConfiguration.layoutWidth()))

trunk/Tools/ChangeLog

@@ +1 @@
+2019-06-10  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        [iOS] fast/xsl tests are flaky when run after certain viewport shrink-to-fit tests
+        https://bugs.webkit.org/show_bug.cgi?id=198699
+        <rdar://problem/50501718>
+
+        Reviewed by Simon Fraser.
+
+        Add logic to platformResetPreferencesToConsistentValues, to reset the "ShouldIgnoreMetaViewport" preference.
+        While this is already being adjusted in platformConfigureViewForTest using the correct, TestOptions, this might
+        happen too late, allowing the shrink-to-fit-content heuristic to unexpectedly kick in on tests where testing
+        viewport parameters are used.
+
+        * WebKitTestRunner/ios/TestControllerIOS.mm:
+        (WTR::TestController::platformResetPreferencesToConsistentValues):
+        (WTR::TestController::platformConfigureViewForTest):
+
 2019-06-10  Yusuke Suzuki  <ysuzuki@apple.com>
 

trunk/Tools/WebKitTestRunner/ios/TestControllerIOS.mm

@@ -135 +135 @@
     WKPreferencesSetTextAutosizingEnabled(preferences, false);
     WKPreferencesSetContentChangeObserverEnabled(preferences, false);
+    [(__bridge WKPreferences *)preferences _setShouldIgnoreMetaViewport:NO];
 }
 
@@ -190 +191 @@
     TestRunnerWKWebView *webView = mainWebView()->platformView();
 
-    webView.configuration.preferences._shouldIgnoreMetaViewport = test.options().shouldIgnoreMetaViewport;
+    if (test.options().shouldIgnoreMetaViewport)
+        webView.configuration.preferences._shouldIgnoreMetaViewport = YES;
 
     if (!test.options().useFlexibleViewport)