REGRESSION (r104174): 500+ tests failing on Windows
authorpeavo@outlook.com <peavo@outlook.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 6 Jun 2016 19:16:20 +0000 (19:16 +0000)
committerpeavo@outlook.com <peavo@outlook.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 6 Jun 2016 19:16:20 +0000 (19:16 +0000)
https://bugs.webkit.org/show_bug.cgi?id=75965

Reviewed by Michael Catanzaro.

Reset WebView scale factors before running next test.

* DumpRenderTree/win/DumpRenderTree.cpp:
(resetWebViewToConsistentStateBeforeTesting):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@201720 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/DumpRenderTree/win/DumpRenderTree.cpp

index 52f05a6..3895f5b 100644 (file)
@@ -1,3 +1,15 @@
+2016-06-06  Per Arne Vollan  <pvollan@apple.com>
+
+        REGRESSION (r104174): 500+ tests failing on Windows
+        https://bugs.webkit.org/show_bug.cgi?id=75965
+
+        Reviewed by Michael Catanzaro.
+
+        Reset WebView scale factors before running next test.
+
+        * DumpRenderTree/win/DumpRenderTree.cpp:
+        (resetWebViewToConsistentStateBeforeTesting):
+
 2016-06-04  Alexey Proskuryakov  <ap@apple.com>
 
         REGRESSION (r201263): Some tests have become flaky timeouts.
index e2103ca..6b5e723 100644 (file)
@@ -893,8 +893,12 @@ static void resetWebViewToConsistentStateBeforeTesting()
     }
 
     COMPtr<IWebViewPrivate2> webViewPrivate(Query, webView);
-    if (webViewPrivate)
+    if (webViewPrivate) {
+        POINT origin = { 0, 0 };
+        webViewPrivate->scaleWebView(1.0, origin);
+        webViewPrivate->setCustomBackingScaleFactor(0);
         webViewPrivate->setTabKeyCyclesThroughElements(TRUE);
+    }
 
     webView->setPolicyDelegate(nullptr);
     policyDelegate->setPermissive(false);