Title: [128600] trunk
Revision
128600
Author
[email protected]
Date
2012-09-14 06:09:06 -0700 (Fri, 14 Sep 2012)

Log Message

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

Patch by Mikhail Pozdnyakov <[email protected]> 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:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (128599 => 128600)


--- trunk/LayoutTests/ChangeLog	2012-09-14 13:08:34 UTC (rev 128599)
+++ trunk/LayoutTests/ChangeLog	2012-09-14 13:09:06 UTC (rev 128600)
@@ -1,3 +1,14 @@
+2012-09-14  Mikhail Pozdnyakov  <[email protected]>
+
+        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  <[email protected]>
 
         Make time input lang attribute aware for testing

Modified: trunk/LayoutTests/platform/wk2/Skipped (128599 => 128600)


--- trunk/LayoutTests/platform/wk2/Skipped	2012-09-14 13:08:34 UTC (rev 128599)
+++ trunk/LayoutTests/platform/wk2/Skipped	2012-09-14 13:09:06 UTC (rev 128600)
@@ -330,16 +330,6 @@
 fast/dom/Geolocation/watch.html
 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>
 fast/canvas/canvas-gradient-addStop-error.html
@@ -354,6 +344,7 @@
 # <https://bugs.webkit.org/show_bug.cgi?id=42672>
 fast/css/compare-content-style.html
 fast/frames/frame-display-none-focus.html
+fast/loader/reload-policy-delegate.html
 
 # WebKitTestRunner needs layoutTestController.queueLoad
 # <https://bugs.webkit.org/show_bug.cgi?id=42674>
@@ -620,6 +611,11 @@
 inspector/geolocation-success.html
 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,6 +865,13 @@
 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)
 ########################################
 
@@ -1123,6 +1126,9 @@
 fast/loader/file-protocol-fragment.html
 http/tests/loading/pdf-commit-load-callbacks.html
 
+# Times out unexpectedly.
+http/tests/security/feed-urls-from-remote.html
+
 ### END OF (3) Unclassified failures
 ########################################
 

Modified: trunk/Tools/ChangeLog (128599 => 128600)


--- trunk/Tools/ChangeLog	2012-09-14 13:08:34 UTC (rev 128599)
+++ trunk/Tools/ChangeLog	2012-09-14 13:09:06 UTC (rev 128600)
@@ -1,3 +1,17 @@
+2012-09-14  Mikhail Pozdnyakov  <[email protected]>
+
+        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  <[email protected]>
 
         [GTK] Clear application cache between tests in DumpRenderTree

Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl (128599 => 128600)


--- trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl	2012-09-14 13:08:34 UTC (rev 128599)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl	2012-09-14 13:09:06 UTC (rev 128600)
@@ -64,6 +64,7 @@
         void setPrivateBrowsingEnabled(in boolean value);
         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);
         void setUserStyleSheetEnabled(in boolean value);

Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp (128599 => 128600)


--- trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp	2012-09-14 13:08:34 UTC (rev 128599)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp	2012-09-14 13:09:06 UTC (rev 128600)
@@ -1264,23 +1264,21 @@
     if (!InjectedBundle::shared().testRunner()->isPolicyDelegateEnabled())
         return WKBundlePagePolicyActionUse;
 
-    if (InjectedBundle::shared().testRunner()->waitToDump()) {
-        WKRetainPtr<WKStringRef> url = ""
-        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 = ""
+    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())
         return WKBundlePagePolicyActionUse;
     return WKBundlePagePolicyActionPassThrough;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to