Title: [258438] trunk/Tools
- Revision
- 258438
- Author
- cdu...@apple.com
- Date
- 2020-03-13 15:32:28 -0700 (Fri, 13 Mar 2020)
Log 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
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (258437 => 258438)
--- trunk/Tools/ChangeLog 2020-03-13 22:18:04 UTC (rev 258437)
+++ trunk/Tools/ChangeLog 2020-03-13 22:32:28 UTC (rev 258438)
@@ -1,3 +1,16 @@
+2020-03-13 Chris Dumez <cdu...@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_che...@apple.com>
[ iOS and Mac wk2 ] http/tests/in-app-browser-privacy/ tests failing
Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm (258437 => 258438)
--- trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2020-03-13 22:18:04 UTC (rev 258437)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2020-03-13 22:32:28 UTC (rev 258438)
@@ -1907,6 +1907,8 @@
[WebCache clearCachedCredentials];
+ resetWebPreferencesToConsistentValues();
+ setWebPreferencesForTestOptions(options);
#if PLATFORM(MAC)
[webView setWantsLayer:options.layerBackedWebView];
#endif
@@ -1921,11 +1923,7 @@
// In the case that a test using the chrome input field failed, be sure to clean up for the next test.
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)
if (WebCore::Frame* frame = [webView _mainCoreFrame])
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
