Changeset 128600 in webkit

Timestamp:

Sep 14, 2012 6:09:06 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

WebKitTestRunner needs layoutTestController.setCustomPolicyDelegate
​https://bugs.webkit.org/show_bug.cgi?id=42546

Patch by Mikhail Pozdnyakov <​mikhail.pozdnyakov@intel.com> on 2012-09-14
Reviewed by Kenneth Rohde Christiansen.

Tools:

Exported TestRunner::setCustomPolicyDelegate() method.
Allowed Policy Delegate dumping even if we're not in 'waitUntilDone' mode.

• WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl:
• WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:

(WTR::InjectedBundlePage::decidePolicyForNavigationAction):

LayoutTests:

Unskipped corresponding test cases. Distributed those which still not passing to appropriate groups in Skipped file.

• platform/wk2/Skipped:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/wk2/Skipped (modified) (5 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl (modified) (1 diff)
• Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-09-14  Mikhail Pozdnyakov  <mikhail.pozdnyakov@intel.com>
+
+        WebKitTestRunner needs layoutTestController.setCustomPolicyDelegate
+        https://bugs.webkit.org/show_bug.cgi?id=42546
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Unskipped corresponding test cases. Distributed those which still not passing to appropriate groups in Skipped file.
+
+        * platform/wk2/Skipped:
+
 2012-09-14  Keishi Hattori  <keishi@webkit.org>
 

trunk/LayoutTests/platform/wk2/Skipped

@@ -331 +331 @@
 fast/dom/Geolocation/window-close-crash.html
 
-# WebKitTestRunner needs layoutTestController.setCustomPolicyDelegate
-# <https://bugs.webkit.org/show_bug.cgi?id=42546>
-fast/loader/javascript-url-hierarchical-execution.html
-fast/loader/onload-policy-ignore-for-frame.html
-fast/loader/reload-policy-delegate.html
-http/tests/misc/policy-delegate-called-twice.html
-http/tests/misc/redirect-to-external-url.html
-http/tests/security/feed-urls-from-remote.html
-http/tests/download
-
 # WebKitTestRunner needs layoutTestController.setDashboardCompatibilityMode
 # <https://bugs.webkit.org/show_bug.cgi?id=42547>
@@ -355 +345 @@
 fast/css/compare-content-style.html
 fast/frames/frame-display-none-focus.html
+fast/loader/reload-policy-delegate.html
 
 # WebKitTestRunner needs layoutTestController.queueLoad
@@ -621 +612 @@
 inspector/geolocation-watchPosition.html
 
+# WebFrameLoaderClient::dispatchDecidePolicy methods should consider 
+# 'WKBundlePagePolicyActionPassThrough' policy action 
+# https://bugs.webkit.org/show_bug.cgi?id=95974
+fast/loader/onload-policy-ignore-for-frame.html
+
 ### END OF (1) Classified failures with bug reports
 ########################################
@@ -869 +865 @@
 fast/spatial-navigation/snav-iframe-no-scrollable-content.html
 fast/spatial-navigation/snav-imagemap-overlapped-areas.html
+
+# WK2 is missing API for getting header fields from HTTP responses
+# which have to be serialized.
+http/tests/download
+
+# WebFrameLoaderClient::canHandleRequest() has to be implemented.
+http/tests/misc/redirect-to-external-url.html
 
 ### END OF (2) Classified failures without bug reports (yet)
@@ -1124 +1127 @@
 http/tests/loading/pdf-commit-load-callbacks.html
 
+# Times out unexpectedly.
+http/tests/security/feed-urls-from-remote.html
+
 ### END OF (3) Unclassified failures
 ########################################

trunk/Tools/ChangeLog

@@ +1 @@
+2012-09-14  Mikhail Pozdnyakov  <mikhail.pozdnyakov@intel.com>
+
+        WebKitTestRunner needs layoutTestController.setCustomPolicyDelegate
+        https://bugs.webkit.org/show_bug.cgi?id=42546
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Exported TestRunner::setCustomPolicyDelegate() method.
+        Allowed Policy Delegate dumping even if we're not in 'waitUntilDone' mode.
+
+        * WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl:
+        * WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
+        (WTR::InjectedBundlePage::decidePolicyForNavigationAction):
+
 2012-09-14  Zan Dobersek  <zandobersek@gmail.com>
 

trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl

@@ -65 +65 @@
         void setPopupBlockingEnabled(in boolean value);
         void setAuthorAndUserStylesEnabled(in boolean value);
+        void setCustomPolicyDelegate(in boolean enabled, in boolean permissive);
         void addOriginAccessWhitelistEntry(in DOMString sourceOrigin, in DOMString destinationProtocol, in DOMString destinationHost, in boolean allowDestinationSubdomains);
         void removeOriginAccessWhitelistEntry(in DOMString sourceOrigin, in DOMString destinationProtocol, in DOMString destinationHost, in boolean allowDestinationSubdomains);

trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp

@@ -1265 +1265 @@
         return WKBundlePagePolicyActionUse;
 
-    if (InjectedBundle::shared().testRunner()->waitToDump()) {
-        WKRetainPtr<WKStringRef> url = adoptWK(WKURLCopyString(WKURLRequestCopyURL(request)));
-        InjectedBundle::shared().stringBuilder()->appendLiteral("Policy delegate: attempt to load ");
-        InjectedBundle::shared().stringBuilder()->append(toWTFString(url));
-        InjectedBundle::shared().stringBuilder()->appendLiteral(" with navigation type \'");
-        InjectedBundle::shared().stringBuilder()->append(toWTFString(NavigationTypeToString(WKBundleNavigationActionGetNavigationType(navigationAction))));
-        InjectedBundle::shared().stringBuilder()->appendLiteral("\'");
-        WKBundleHitTestResultRef hitTestResultRef = WKBundleNavigationActionCopyHitTestResult(navigationAction);
-        if (hitTestResultRef) {
-            InjectedBundle::shared().stringBuilder()->appendLiteral(" originating from ");
-            InjectedBundle::shared().stringBuilder()->append(dumpPath(m_page, m_world.get(), WKBundleHitTestResultCopyNodeHandle(hitTestResultRef)));
-        }
-
-        InjectedBundle::shared().stringBuilder()->append('\n');
-        InjectedBundle::shared().testRunner()->notifyDone();
-    }
+    WKRetainPtr<WKStringRef> url = adoptWK(WKURLCopyString(WKURLRequestCopyURL(request)));
+    InjectedBundle::shared().stringBuilder()->appendLiteral("Policy delegate: attempt to load ");
+    InjectedBundle::shared().stringBuilder()->append(toWTFString(url));
+    InjectedBundle::shared().stringBuilder()->appendLiteral(" with navigation type \'");
+    InjectedBundle::shared().stringBuilder()->append(toWTFString(NavigationTypeToString(WKBundleNavigationActionGetNavigationType(navigationAction))));
+    InjectedBundle::shared().stringBuilder()->appendLiteral("\'");
+    WKBundleHitTestResultRef hitTestResultRef = WKBundleNavigationActionCopyHitTestResult(navigationAction);
+    if (hitTestResultRef) {
+        InjectedBundle::shared().stringBuilder()->appendLiteral(" originating from ");
+        InjectedBundle::shared().stringBuilder()->append(dumpPath(m_page, m_world.get(), WKBundleHitTestResultCopyNodeHandle(hitTestResultRef)));
+    }
+
+    InjectedBundle::shared().stringBuilder()->append('\n');
+    InjectedBundle::shared().testRunner()->notifyDone();
 
     if (InjectedBundle::shared().testRunner()->isPolicyDelegatePermissive())