Changeset 99071 in webkit

Timestamp:

Nov 2, 2011 9:44:38 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

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

Patch by Deepak Sherveghar <​bpwv64@motorola.com> on 2011-11-02
Reviewed by Simon Hausmann.

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

• WebCoreSupport/FrameLoaderClientQt.cpp:

(WebCore::FrameLoaderClientQt::committedLoad):
(WebCore::FrameLoaderClientQt::shouldFallBack):

Location:

trunk/Source/WebKit/qt

Files:

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

trunk/Source/WebKit/qt/ChangeLog

@@ +1 @@
+2011-11-02  Deepak Sherveghar  <bpwv64@motorola.com>
+
+        [Qt] Failing test media/video-document-types.html
+        https://bugs.webkit.org/show_bug.cgi?id=62108
+
+        Reviewed by Simon Hausmann.
+
+        Match what Mac has been doing since r36001: cancel the main load,
+        and handle failures caused by 'will be handled by plugin' errors.
+
+        * WebCoreSupport/FrameLoaderClientQt.cpp:
+        (WebCore::FrameLoaderClientQt::committedLoad):
+        (WebCore::FrameLoaderClientQt::shouldFallBack):
+
 2011-11-01  Simon Hausmann  <simon.hausmann@nokia.com>
 

trunk/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp

@@ -900 +900 @@
     if (!m_pluginView)
         loader->commitData(data, length);
-    
+
+    // If we are sending data to MediaDocument, we should stop here and cancel the request.
+    if (m_frame->document()->isMediaDocument())
+        loader->cancelMainResourceLoad(pluginWillHandleLoadError(loader->response()));
+
     // We re-check here as the plugin can have been created.
     if (m_pluginView && m_pluginView->isPluginView()) {
@@ -975 +979 @@
 bool FrameLoaderClientQt::shouldFallBack(const WebCore::ResourceError& error)
 {
-    return !(error.isCancellation() || (error.errorCode() == WebKitErrorFrameLoadInterruptedByPolicyChange));
+    return !(error.isCancellation() || (error.errorCode() == WebKitErrorFrameLoadInterruptedByPolicyChange) || (error.errorCode() == WebKitErrorPluginWillHandleLoad));
 }