Changeset 189958 in webkit

Timestamp:

Sep 17, 2015 6:58:37 PM (9 years ago)

Author:

Simon Fraser

Message:

[iOS WK2] When loading viewport tests, use the normal web page viewport configuration
​https://bugs.webkit.org/show_bug.cgi?id=149321

Reviewed by Tim Horton.

InjectedBundlePage::platformDidStartProvisionalLoadForFrame() unconditionally
enabled the "testing" viewport configuration, which disables page scaling.

If we're running viewport tests, we want the normal web page configuration.
Do that by passing a flag in the dictionary sent to InjectedBundle::beginTesting(),
based on whether the test is in a "viewport" directory.

• WebKitTestRunner/InjectedBundle/InjectedBundle.cpp:

(WTR::InjectedBundle::beginTesting):

• WebKitTestRunner/InjectedBundle/cocoa/InjectedBundlePageCocoa.mm:

(WTR::InjectedBundlePage::platformDidStartProvisionalLoadForFrame): Deleted.

• WebKitTestRunner/TestInvocation.cpp:

(WTR::TestInvocation::shouldLogFrameLoadDelegates):
(WTR::TestInvocation::shouldLogHistoryClientCallbacks):
(WTR::TestInvocation::shouldMakeViewportFlexible):
(WTR::TestInvocation::invoke):

• WebKitTestRunner/TestInvocation.h:
• WebKitTestRunner/ios/TestControllerIOS.mm:

(WTR::TestController::platformConfigureViewForTest):
(WTR::shouldMakeViewportFlexible): Deleted.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• WebKitTestRunner/InjectedBundle/InjectedBundle.cpp (modified) (1 diff)
• WebKitTestRunner/InjectedBundle/cocoa/InjectedBundlePageCocoa.mm (modified) (1 diff)
• WebKitTestRunner/TestInvocation.cpp (modified) (2 diffs)
• WebKitTestRunner/TestInvocation.h (modified) (2 diffs)
• WebKitTestRunner/ios/TestControllerIOS.mm (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2015-09-17  Simon Fraser  <simon.fraser@apple.com>
+
+        [iOS WK2] When loading viewport tests, use the normal web page viewport configuration
+        https://bugs.webkit.org/show_bug.cgi?id=149321
+
+        Reviewed by Tim Horton.
+        
+        InjectedBundlePage::platformDidStartProvisionalLoadForFrame() unconditionally 
+        enabled the "testing" viewport configuration, which disables page scaling.
+        
+        If we're running viewport tests, we want the normal web page configuration.
+        Do that by passing a flag in the dictionary sent to InjectedBundle::beginTesting(),
+        based on whether the test is in a "viewport" directory.
+
+        * WebKitTestRunner/InjectedBundle/InjectedBundle.cpp:
+        (WTR::InjectedBundle::beginTesting):
+        * WebKitTestRunner/InjectedBundle/cocoa/InjectedBundlePageCocoa.mm:
+        (WTR::InjectedBundlePage::platformDidStartProvisionalLoadForFrame): Deleted.
+        * WebKitTestRunner/TestInvocation.cpp:
+        (WTR::TestInvocation::shouldLogFrameLoadDelegates):
+        (WTR::TestInvocation::shouldLogHistoryClientCallbacks):
+        (WTR::TestInvocation::shouldMakeViewportFlexible):
+        (WTR::TestInvocation::invoke):
+        * WebKitTestRunner/TestInvocation.h:
+        * WebKitTestRunner/ios/TestControllerIOS.mm:
+        (WTR::TestController::platformConfigureViewForTest):
+        (WTR::shouldMakeViewportFlexible): Deleted.
+
 2015-09-17  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp

@@ -284 +284 @@
     WKBundlePageRemoveAllUserContent(page()->page());
 
+#if PLATFORM(IOS)
+    WKBundlePageSetUseTestingViewportConfiguration(page()->page(), !booleanForKey(settings, "UseFlexibleViewport"));
+#endif
+
     m_testRunner->setShouldDumpFrameLoadCallbacks(booleanForKey(settings, "DumpFrameLoadDelegates"));
     m_testRunner->setUserStyleSheetEnabled(false);

trunk/Tools/WebKitTestRunner/InjectedBundle/cocoa/InjectedBundlePageCocoa.mm

@@ -44 +44 @@
 
     setCrashReportApplicationSpecificInformationToURL(InjectedBundle::singleton().testRunner()->testURL());
-
-#if PLATFORM(IOS)
-    WKBundlePageSetUseTestingViewportConfiguration(page(), true);
-#endif
 }
 

trunk/Tools/WebKitTestRunner/TestInvocation.cpp

@@ -133 +133 @@
 }
 
-bool TestInvocation::shouldLogFrameLoadDelegates()
+bool TestInvocation::shouldLogFrameLoadDelegates() const
 {
     return urlContains("loading/");
 }
 
-bool TestInvocation::shouldLogHistoryClientCallbacks()
+bool TestInvocation::shouldLogHistoryClientCallbacks() const
 {
     return urlContains("globalhistory/");
+}
+
+bool TestInvocation::shouldMakeViewportFlexible() const
+{
+    return urlContains("viewport/");
 }
 
@@ -163 +168 @@
     WKRetainPtr<WKBooleanRef> dumpFrameLoadDelegatesValue = adoptWK(WKBooleanCreate(shouldLogFrameLoadDelegates()));
     WKDictionarySetItem(beginTestMessageBody.get(), dumpFrameLoadDelegatesKey.get(), dumpFrameLoadDelegatesValue.get());
+
+    WKRetainPtr<WKStringRef> useFlexibleViewportKey = adoptWK(WKStringCreateWithUTF8CString("UseFlexibleViewport"));
+    WKRetainPtr<WKBooleanRef> useFlexibleViewportValue = adoptWK(WKBooleanCreate(shouldMakeViewportFlexible()));
+    WKDictionarySetItem(beginTestMessageBody.get(), useFlexibleViewportKey.get(), useFlexibleViewportValue.get());
 
     WKRetainPtr<WKStringRef> dumpPixelsKey = adoptWK(WKStringCreateWithUTF8CString("DumpPixels"));

trunk/Tools/WebKitTestRunner/TestInvocation.h

@@ -61 +61 @@
     void didRemoveSwipeSnapshot();
 
+    bool shouldMakeViewportFlexible() const;
+
 private:
     void dumpResults();
@@ -71 +73 @@
     static void forceRepaintDoneCallback(WKErrorRef, void* context);
 
-    bool shouldLogFrameLoadDelegates();
-    bool shouldLogHistoryClientCallbacks();
+    bool shouldLogFrameLoadDelegates() const;
+    bool shouldLogHistoryClientCallbacks() const;
 
     WKRetainPtr<WKURLRef> m_url;

trunk/Tools/WebKitTestRunner/ios/TestControllerIOS.mm

@@ -75 +75 @@
 }
 
-static bool shouldMakeViewportFlexible(const TestInvocation& test)
-{
-    return test.urlContains("viewport/");
-}
-
 void TestController::platformResetPreferencesToConsistentValues()
 {
@@ -94 +89 @@
 void TestController::platformConfigureViewForTest(const TestInvocation& test)
 {
-    if (shouldMakeViewportFlexible(test)) {
+    if (test.shouldMakeViewportFlexible()) {
         const unsigned phoneViewHeight = 480;
         const unsigned phoneViewWidth = 320;
 
         mainWebView()->resizeTo(phoneViewWidth, phoneViewHeight);
-        // FIXME: more viewport config to do here.
+        // We also pass data to InjectedBundle::beginTesting() to have it call
+        // WKBundlePageSetUseTestingViewportConfiguration(false).
     }
 }