Changeset 258438 in webkit

Timestamp:

Mar 13, 2020 3:32:28 PM (4 years ago)

Author:

Chris Dumez

Message:

Unreviewed, reverting r256232.

Caused ResizeObserver tests to become flaky

Reverted changeset:

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

Location:

trunk/Tools

Files:

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

trunk/Tools/ChangeLog

@@ +1 @@
+2020-03-13  Chris Dumez  <cdumez@apple.com>
+
+        Unreviewed, reverting r256232.
+
+        Caused ResizeObserver tests to become flaky
+
+        Reverted changeset:
+
+        "[DRT] InternalSettingsGenerated::resetToConsistentState() may
+        override TestOptions"
+        https://bugs.webkit.org/show_bug.cgi?id=207481
+        https://trac.webkit.org/changeset/256232
+
 2020-03-13  Kate Cheney  <katherine_cheney@apple.com>
 

trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm

@@ -1908 +1908 @@
     [WebCache clearCachedCredentials];
 
+    resetWebPreferencesToConsistentValues();
+    setWebPreferencesForTestOptions(options);
 #if PLATFORM(MAC)
     [webView setWantsLayer:options.layerBackedWebView];
@@ -1922 +1924 @@
     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)