Changeset 51104 in webkit

Timestamp:

Nov 18, 2009 4:48:47 AM (14 years ago)

Author:

kov@webkit.org

Message:

Reviewed by Xan Lopez.

[GTK] Failing test media/video-document-types.html
​https://bugs.webkit.org/show_bug.cgi?id=31352

Match what Mac has been doing since r36001: cancel the main load,
and handle failures caused by 'will be handled by plugin' errors.

Covered by test media/video-document-types.html

• WebCoreSupport/FrameLoaderClientGtk.cpp:

(WebKit::FrameLoaderClient::committedLoad):
(WebKit::FrameLoaderClient::shouldFallBack):

Location:

trunk/WebKit/gtk

Files:

• ChangeLog (modified) (1 diff)
• WebCoreSupport/FrameLoaderClientGtk.cpp (modified) (2 diffs)

trunk/WebKit/gtk/ChangeLog

@@ +1 @@
+2009-11-18  Gustavo Noronha Silva  <gustavo.noronha@collabora.co.uk>
+
+        Reviewed by Xan Lopez.
+
+        [GTK] Failing test media/video-document-types.html
+        https://bugs.webkit.org/show_bug.cgi?id=31352
+
+        Match what Mac has been doing since r36001: cancel the main load,
+        and handle failures caused by 'will be handled by plugin' errors.
+
+        Covered by test media/video-document-types.html
+
+        * WebCoreSupport/FrameLoaderClientGtk.cpp:
+        (WebKit::FrameLoaderClient::committedLoad):
+        (WebKit::FrameLoaderClient::shouldFallBack):
+
 2009-11-17  Pavel Feldman  <pfeldman@chromium.org>
 

trunk/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp

@@ -150 +150 @@
         if (data)
             frameLoader->addData(data, length);
+
+        Frame* coreFrame = loader->frame();
+        if (coreFrame->document() && coreFrame->document()->isMediaDocument())
+            loader->cancelMainResourceLoad(frameLoader->client()->pluginWillHandleLoadError(loader->response()));
     }
 
@@ -987 +991 @@
 bool FrameLoaderClient::shouldFallBack(const ResourceError& error)
 {
-    // FIXME: Mac checks for WebKitErrorPlugInWillHandleLoad here to avoid
-    // loading plugin content twice. Do we need it?
-    return !(error.isCancellation() || error.errorCode() == WEBKIT_POLICY_ERROR_FRAME_LOAD_INTERRUPTED_BY_POLICY_CHANGE);
+    return !(error.isCancellation() || error.errorCode() == WEBKIT_POLICY_ERROR_FRAME_LOAD_INTERRUPTED_BY_POLICY_CHANGE || error.errorCode() == WEBKIT_PLUGIN_ERROR_WILL_HANDLE_LOAD);
 }