Changeset 178179 in webkit

Timestamp:

Jan 9, 2015 11:29:40 AM (9 years ago)

Author:

ap@apple.com

Message:

platform/mac-wk2/tiled-drawing/tiled-drawing-scroll-position-page-cache-restoration.html fails on Retina machines
​https://bugs.webkit.org/show_bug.cgi?id=140300

Reviewed by Simon Fraser.

• WebKitTestRunner/TestController.cpp:

(WTR::TestController::createOtherPage):
(WTR::TestController::updateWindowScaleForTest):
(WTR::TestController::configureViewForTest):

• WebKitTestRunner/TestController.h:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• WebKitTestRunner/TestController.cpp (modified) (3 diffs)
• WebKitTestRunner/TestController.h (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2015-01-09  Alexey Proskuryakov  <ap@apple.com>
+
+        platform/mac-wk2/tiled-drawing/tiled-drawing-scroll-position-page-cache-restoration.html fails on Retina machines
+        https://bugs.webkit.org/show_bug.cgi?id=140300
+
+        Reviewed by Simon Fraser.
+
+        * WebKitTestRunner/TestController.cpp:
+        (WTR::TestController::createOtherPage):
+        (WTR::TestController::updateWindowScaleForTest):
+        (WTR::TestController::configureViewForTest):
+        * WebKitTestRunner/TestController.h:
+
 2015-01-09  Tibor Meszaros  <tmeszaros.u-szeged@partner.samsung.com>
 

trunk/Tools/WebKitTestRunner/TestController.cpp

@@ -314 +314 @@
 
     view->didInitializeClients();
+
+    TestController::shared().updateWindowScaleForTest(view, *TestController::shared().m_currentInvocation);
 
     WKRetain(newPage);
@@ -779 +781 @@
 }
 
-void TestController::updateWindowScaleForTest(const TestInvocation& test)
+void TestController::updateWindowScaleForTest(PlatformWebView* view, const TestInvocation& test)
 {
     WTF::String localPathOrUrl = String(test.pathOrURL());
     bool needsHighDPIWindow = localPathOrUrl.findIgnoringCase("/hidpi-") != notFound;
-    mainWebView()->changeWindowScaleIfNeeded(needsHighDPIWindow ? 2 : 1);
+    view->changeWindowScaleIfNeeded(needsHighDPIWindow ? 2 : 1);
 }
 
@@ -826 +828 @@
 {
     updateWebViewSizeForTest(test);
-    updateWindowScaleForTest(test);
+    updateWindowScaleForTest(mainWebView(), test);
     updateLayoutTypeForTest(test);
 

trunk/Tools/WebKitTestRunner/TestController.h

@@ -137 +137 @@
 
     void updateWebViewSizeForTest(const TestInvocation&);
-    void updateWindowScaleForTest(const TestInvocation&);
+    void updateWindowScaleForTest(PlatformWebView*, const TestInvocation&);
     void updateLayoutTypeForTest(const TestInvocation&);