[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[robert at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 70fbde05273890b5667cb3db4382c4f7c4a4e102
Author: robert at webkit.org <robert at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 14 19:38:24 2010 +0000

    2010-10-14  Robert Hogan  <robert at webkit.org>
    
            Reviewed by Antonio Gomes.
    
            [Qt] Fix http/tests/misc/redirect-to-external-url.html
    
            Support the test in FrameLoaderClientQt and unskip.
    
            https://bugs.webkit.org/show_bug.cgi?id=47609
    
            * platform/qt/Skipped:
    2010-10-14  Robert Hogan  <robert at webkit.org>
    
            Reviewed by Antonio Gomes.
    
            [Qt] Fix http/tests/misc/redirect-to-external-url.html
    
            Support the test in FrameLoaderClientQt and unskip.
    
            https://bugs.webkit.org/show_bug.cgi?id=47609
    
            * WebCoreSupport/FrameLoaderClientQt.cpp:
            (WebCore::FrameLoaderClientQt::canHandleRequest):
            (WebCore::FrameLoaderClientQt::dispatchUnableToImplementPolicy):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69795 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index dd33fd3..0e206ea 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2010-10-14  Robert Hogan  <robert at webkit.org>
+
+        Reviewed by Antonio Gomes.
+
+        [Qt] Fix http/tests/misc/redirect-to-external-url.html
+
+        Support the test in FrameLoaderClientQt and unskip.
+
+        https://bugs.webkit.org/show_bug.cgi?id=47609
+
+        * platform/qt/Skipped:
+
 2010-10-01  Martin Robinson  <mrobinson at igalia.com>
 
         Reviewed by Holger Freyther.
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index 321e551..aa4825f 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -722,7 +722,6 @@ http/tests/xmlhttprequest/default-content-type-dashboard.html
 http/tests/xmlhttprequest/svg-created-by-xhr-disallowed-in-dashboard.html
 
 # timeout
-http/tests/misc/redirect-to-external-url.html
 http/tests/security/feed-urls-from-remote.html
 
 # This requires didClearWindowObjectForFrameInIsolatedWorld foo in FrameLoaderClient
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 78bf3d7..a377e8a 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,17 @@
+2010-10-14  Robert Hogan  <robert at webkit.org>
+
+        Reviewed by Antonio Gomes.
+
+        [Qt] Fix http/tests/misc/redirect-to-external-url.html
+
+        Support the test in FrameLoaderClientQt and unskip.
+
+        https://bugs.webkit.org/show_bug.cgi?id=47609
+
+        * WebCoreSupport/FrameLoaderClientQt.cpp:
+        (WebCore::FrameLoaderClientQt::canHandleRequest):
+        (WebCore::FrameLoaderClientQt::dispatchUnableToImplementPolicy):
+
 2010-10-14  No'am Rosenthal  <noam.rosenthal at nokia.com>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp b/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
index 4ebc7e1..9ab4612 100644
--- a/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
+++ b/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
@@ -708,8 +708,15 @@ void FrameLoaderClientQt::frameLoaderDestroyed()
     delete this;
 }
 
-bool FrameLoaderClientQt::canHandleRequest(const WebCore::ResourceRequest&) const
+bool FrameLoaderClientQt::canHandleRequest(const WebCore::ResourceRequest& request) const
 {
+    if (QWebPagePrivate::drtRun) {
+        // Just reject the scheme used in
+        // LayoutTests/http/tests/misc/redirect-to-external-url.html
+        QUrl url = QUrl(request.url());
+        if (url.scheme() == "spaceballs")
+            return false;
+    }
     return true;
 }
 
@@ -1192,9 +1199,16 @@ void FrameLoaderClientQt::dispatchDecidePolicyForNavigationAction(FramePolicyFun
     callPolicyFunction(function, PolicyUse);
 }
 
-void FrameLoaderClientQt::dispatchUnableToImplementPolicy(const WebCore::ResourceError&)
+void FrameLoaderClientQt::dispatchUnableToImplementPolicy(const WebCore::ResourceError& error)
 {
-    notImplemented();
+    if (!m_webFrame)
+        return;
+
+    if (QWebPagePrivate::drtRun) {
+        printf("Policy delegate: unable to implement policy with error domain '%s', "
+              "error code %d, in frame '%s'\n",
+              error.domain().utf8().data(), error.errorCode(), m_webFrame->frameName().toUtf8().data());
+    }
 }
 
 void FrameLoaderClientQt::startDownload(const WebCore::ResourceRequest& request)

-- 
WebKit Debian packaging