Changeset 256232 in webkit

Timestamp:

Feb 10, 2020 4:53:36 PM (4 years ago)

Author:

Chris Dumez

Message:

[DRT] InternalSettingsGenerated::resetToConsistentState() may override TestOptions
​https://bugs.webkit.org/show_bug.cgi?id=207481

Reviewed by Alexey Proskuryakov.

InternalSettingsGenerated::resetToConsistentState() may override TestOptions such as enableBackForwardCache.
This is causing issues such as the back/forward cache sometimes getting enabled on tests where
TestOptions::enableBackForwardCache() is false, because a previous test has enabled the back/forward cache.

• DumpRenderTree/mac/DumpRenderTree.mm:

(resetWebViewToConsistentStateBeforeTesting):
Make sure we reset preferences after we call WebCoreTestSupport::resetInternalsObject(), since
resetInternalsObject() updates settings and TestOptions / DRT preferences should have priority
over internal settings.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• DumpRenderTree/mac/DumpRenderTree.mm (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2020-02-10  Chris Dumez  <cdumez@apple.com>
+
+        [DRT] InternalSettingsGenerated::resetToConsistentState() may override TestOptions
+        https://bugs.webkit.org/show_bug.cgi?id=207481
+
+        Reviewed by Alexey Proskuryakov.
+
+        InternalSettingsGenerated::resetToConsistentState() may override TestOptions such as enableBackForwardCache.
+        This is causing issues such as the back/forward cache sometimes getting enabled on tests where
+        TestOptions::enableBackForwardCache() is false, because a previous test has enabled the back/forward cache.
+
+        * DumpRenderTree/mac/DumpRenderTree.mm:
+        (resetWebViewToConsistentStateBeforeTesting):
+        Make sure we reset preferences after we call WebCoreTestSupport::resetInternalsObject(), since
+        resetInternalsObject() updates settings and TestOptions / DRT preferences should have priority
+        over internal settings.
+
 2020-02-10  Per Arne Vollan  <pvollan@apple.com>
 

trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm

@@ -1909 +1909 @@
     [WebCache clearCachedCredentials];
 
-    resetWebPreferencesToConsistentValues();
-    setWebPreferencesForTestOptions(options);
 #if PLATFORM(MAC)
     [webView setWantsLayer:options.layerBackedWebView];
@@ -1925 +1923 @@
     gTestRunner->removeChromeInputField();
 
+    // We need to call this first to reset internal settings.
     WebCoreTestSupport::resetInternalsObject([mainFrame globalContext]);
+    // And then we need to reset DRT preferences since they take precedence over internal settings.
+    resetWebPreferencesToConsistentValues();
+    setWebPreferencesForTestOptions(options);
 
 #if !PLATFORM(IOS_FAMILY)