Changeset 244668 in webkit

Timestamp:

Apr 25, 2019, 3:41:59 PM (6 years ago)

Author:

Simon Fraser

Message:

DumpRenderTree doesn't call Internals::resetToConsistentState() before the first test
​https://bugs.webkit.org/show_bug.cgi?id=197273

Reviewed by Dean Jackson.

Reorder code so that we create gTestRunner before calling resetWebViewToConsistentStateBeforeTesting(),
so that WebCoreTestSupport::resetInternalsObject() is always run.

• DumpRenderTree/mac/DumpRenderTree.mm:

(resetWebViewToConsistentStateBeforeTesting):
(runTest):

Location:

trunk/Tools

Files:

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

trunk/Tools/ChangeLog

@@ -118 +118 @@
         * TestWebKitAPI/Tests/WebKitCocoa/WKURLSchemeHandler-1.mm: Add a test that POSTs all sorts of things
           from an XHR to a custom protocol.
+
+2019-04-25  Simon Fraser  <simon.fraser@apple.com>
+
+        DumpRenderTree doesn't call Internals::resetToConsistentState() before the first test
+        https://bugs.webkit.org/show_bug.cgi?id=197273
+
+        Reviewed by Dean Jackson.
+
+        Reorder code so that we create gTestRunner before calling resetWebViewToConsistentStateBeforeTesting(),
+        so that WebCoreTestSupport::resetInternalsObject() is always run.
+
+        * DumpRenderTree/mac/DumpRenderTree.mm:
+        (resetWebViewToConsistentStateBeforeTesting):
+        (runTest):
 
 2019-04-24  John Wilander  <wilander@apple.com>

trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm

@@ -1883 +1883 @@
     setlocale(LC_ALL, "");
 
-    if (gTestRunner) {
-        gTestRunner->resetPageVisibility();
-        WebCoreTestSupport::resetInternalsObject([mainFrame globalContext]);
-        // in the case that a test using the chrome input field failed, be sure to clean up for the next test
-        gTestRunner->removeChromeInputField();
-    }
+    ASSERT(gTestRunner);
+    gTestRunner->resetPageVisibility();
+    // In the case that a test using the chrome input field failed, be sure to clean up for the next test.
+    gTestRunner->removeChromeInputField();
+
+    WebCoreTestSupport::resetInternalsObject([mainFrame globalContext]);
 
 #if !PLATFORM(IOS_FAMILY)
@@ -2006 +2006 @@
     mainFrameTestOptions = options;
 
-    resetWebViewToConsistentStateBeforeTesting(options);
-
     const char* testURL([[url absoluteString] UTF8String]);
-
-#if !PLATFORM(IOS_FAMILY)
-    changeWindowScaleIfNeeded(testURL);
-#endif
-
     gTestRunner = TestRunner::create(testURL, command.expectedPixelHash);
     gTestRunner->setAllowedHosts(allowedHosts);
     gTestRunner->setCustomTimeout(command.timeout);
     gTestRunner->setDumpJSConsoleLogInStdErr(command.dumpJSConsoleLogInStdErr || options.dumpJSConsoleLogInStdErr);
+
+    resetWebViewToConsistentStateBeforeTesting(options);
+
+#if !PLATFORM(IOS_FAMILY)
+    changeWindowScaleIfNeeded(testURL);
+#endif
+
     topLoadingFrame = nil;
 #if !PLATFORM(IOS_FAMILY)