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

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 8c84f8f4d9668326272d7b61f1942068599a5e8e
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 14 21:05:38 2010 +0000

    2010-10-14  Sheriff Bot  <webkit.review.bot at gmail.com>
    
            Unreviewed, rolling out r69795.
            http://trac.webkit.org/changeset/69795
            https://bugs.webkit.org/show_bug.cgi?id=47687
    
            'See discussion at webkit.org/b/47609' (Requested by mwenge on
            #webkit).
    
            * platform/qt/Skipped:
    2010-10-14  Sheriff Bot  <webkit.review.bot at gmail.com>
    
            Unreviewed, rolling out r69795.
            http://trac.webkit.org/changeset/69795
            https://bugs.webkit.org/show_bug.cgi?id=47687
    
            'See discussion at webkit.org/b/47609' (Requested by mwenge on
            #webkit).
    
            * WebCoreSupport/FrameLoaderClientQt.cpp:
            (WebCore::FrameLoaderClientQt::canHandleRequest):
            (WebCore::FrameLoaderClientQt::dispatchUnableToImplementPolicy):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69803 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 0d95326..5f35764 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2010-10-14  Sheriff Bot  <webkit.review.bot at gmail.com>
+
+        Unreviewed, rolling out r69795.
+        http://trac.webkit.org/changeset/69795
+        https://bugs.webkit.org/show_bug.cgi?id=47687
+
+        'See discussion at webkit.org/b/47609' (Requested by mwenge on
+        #webkit).
+
+        * platform/qt/Skipped:
+
 2010-10-14  Nikolas Zimmermann  <nzimmermann at rim.com>
 
         Reviewed by Gavin Barraclough.
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index aa4825f..321e551 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -722,6 +722,7 @@ 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 a377e8a..a4be8fd 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,16 @@
+2010-10-14  Sheriff Bot  <webkit.review.bot at gmail.com>
+
+        Unreviewed, rolling out r69795.
+        http://trac.webkit.org/changeset/69795
+        https://bugs.webkit.org/show_bug.cgi?id=47687
+
+        'See discussion at webkit.org/b/47609' (Requested by mwenge on
+        #webkit).
+
+        * WebCoreSupport/FrameLoaderClientQt.cpp:
+        (WebCore::FrameLoaderClientQt::canHandleRequest):
+        (WebCore::FrameLoaderClientQt::dispatchUnableToImplementPolicy):
+
 2010-10-14  Robert Hogan  <robert at webkit.org>
 
         Reviewed by Antonio Gomes.
diff --git a/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp b/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
index 9ab4612..4ebc7e1 100644
--- a/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
+++ b/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
@@ -708,15 +708,8 @@ void FrameLoaderClientQt::frameLoaderDestroyed()
     delete this;
 }
 
-bool FrameLoaderClientQt::canHandleRequest(const WebCore::ResourceRequest& request) const
+bool FrameLoaderClientQt::canHandleRequest(const WebCore::ResourceRequest&) 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;
 }
 
@@ -1199,16 +1192,9 @@ void FrameLoaderClientQt::dispatchDecidePolicyForNavigationAction(FramePolicyFun
     callPolicyFunction(function, PolicyUse);
 }
 
-void FrameLoaderClientQt::dispatchUnableToImplementPolicy(const WebCore::ResourceError& error)
+void FrameLoaderClientQt::dispatchUnableToImplementPolicy(const WebCore::ResourceError&)
 {
-    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());
-    }
+    notImplemented();
 }
 
 void FrameLoaderClientQt::startDownload(const WebCore::ResourceRequest& request)

-- 
WebKit Debian packaging