Changeset 69795 in webkit

Timestamp:

Oct 14, 2010 12:38:24 PM (14 years ago)

Author:

robert@webkit.org

Message:

2010-10-14 Robert Hogan <​robert@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@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):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/qt/Skipped (modified) (1 diff)
• WebKit/qt/ChangeLog (modified) (1 diff)
• WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-10-14  Robert Hogan  <robert@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@igalia.com>
 

trunk/LayoutTests/platform/qt/Skipped

@@ -723 +723 @@
 
 # timeout
-http/tests/misc/redirect-to-external-url.html
 http/tests/security/feed-urls-from-remote.html
 

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2010-10-14  Robert Hogan  <robert@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@nokia.com>
 

trunk/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp

@@ -709 +709 @@
 }
 
-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;
 }
@@ -1193 +1200 @@
 }
 
-void FrameLoaderClientQt::dispatchUnableToImplementPolicy(const WebCore::ResourceError&)
-{
-    notImplemented();
+void FrameLoaderClientQt::dispatchUnableToImplementPolicy(const WebCore::ResourceError& error)
+{
+    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());
+    }
 }