Changeset 71033 in webkit

Timestamp:

Nov 1, 2010 9:51:07 AM (14 years ago)

Author:

Adam Roben

Message:

Cancel main resource loads after we hand them off to the media engine

This is the WebKit2 equivalent of r51104. Clearly this code should be
moved to a cross-platform location someday.

Fixes <​http://webkit.org/b/48561> <rdar://problem/8606679> Assertion
failure in DocumentLoader::commitData when loading a media document in
WebKit2

Reviewed by Eric Carlson.

• WebProcess/WebCoreSupport/WebErrors.h: Added pluginWillHandleLoadError.

• WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:

(WebFrameLoaderClient::committedLoad): Cancel the main resource load
after handing off the load to the media engine. This code originally
came from -[WebHTMLRepresentation receivedData:withDataSource:].
(WebKit::WebFrameLoaderClient::pluginWillHandleLoadError): Call through to WebErrors.
(WebKit::WebFrameLoaderClient::shouldFallBack): Implemented. We fall
back for all errors except when the load was cancelled or we handed it
off to the media engine or a plugin.

• WebProcess/WebCoreSupport/mac/WebErrorsMac.mm:

(WebKit::pluginWillHandleLoadError): Implemented.

• WebProcess/WebCoreSupport/qt/WebErrorsQt.cpp:

(WebKit::pluginWillHandleLoadError): Stubbed out.

• WebProcess/WebCoreSupport/win/WebErrorsWin.cpp:

(WebKit::pluginWillHandleLoadError): Implemented.

Location:

trunk/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebCoreSupport/WebErrors.h (modified) (1 diff)
• WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (modified) (3 diffs)
• WebProcess/WebCoreSupport/mac/WebErrorsMac.mm (modified) (1 diff)
• WebProcess/WebCoreSupport/qt/WebErrorsQt.cpp (modified) (2 diffs)
• WebProcess/WebCoreSupport/win/WebErrorsWin.cpp (modified) (1 diff)

trunk/WebKit2/ChangeLog

@@ +1 @@
+2010-11-01  Adam Roben  <aroben@apple.com>
+
+        Cancel main resource loads after we hand them off to the media engine
+
+        This is the WebKit2 equivalent of r51104. Clearly this code should be
+        moved to a cross-platform location someday.
+
+        Fixes <http://webkit.org/b/48561> <rdar://problem/8606679> Assertion
+        failure in DocumentLoader::commitData when loading a media document in
+        WebKit2
+
+        Reviewed by Eric Carlson.
+
+        * WebProcess/WebCoreSupport/WebErrors.h: Added pluginWillHandleLoadError.
+
+        * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+        (WebFrameLoaderClient::committedLoad): Cancel the main resource load
+        after handing off the load to the media engine. This code originally
+        came from -[WebHTMLRepresentation receivedData:withDataSource:].
+        (WebKit::WebFrameLoaderClient::pluginWillHandleLoadError): Call through to WebErrors.
+        (WebKit::WebFrameLoaderClient::shouldFallBack): Implemented. We fall
+        back for all errors except when the load was cancelled or we handed it
+        off to the media engine or a plugin.
+
+        * WebProcess/WebCoreSupport/mac/WebErrorsMac.mm:
+        (WebKit::pluginWillHandleLoadError): Implemented.
+
+        * WebProcess/WebCoreSupport/qt/WebErrorsQt.cpp:
+        (WebKit::pluginWillHandleLoadError): Stubbed out.
+
+        * WebProcess/WebCoreSupport/win/WebErrorsWin.cpp:
+        (WebKit::pluginWillHandleLoadError): Implemented.
+
 2010-11-01  Andreas Kling  <kling@webkit.org>
 

trunk/WebKit2/WebProcess/WebCoreSupport/WebErrors.h

@@ -39 +39 @@
 WebCore::ResourceError cannotShowMIMETypeError(const WebCore::ResourceResponse&);
 WebCore::ResourceError fileDoesNotExistError(const WebCore::ResourceResponse&);
+WebCore::ResourceError pluginWillHandleLoadError(const WebCore::ResourceResponse&);
 
 } // namespace WebKit

trunk/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp

@@ -678 +678 @@
         loader->commitData(data, length);
 
+    // If the document is a stand-alone media document, now is the right time to cancel the WebKit load.
+    // FIXME: This code should be shared across all ports. <http://webkit.org/b/48762>.
+    if (m_frame->coreFrame()->document()->isMediaDocument())
+        loader->cancelMainResourceLoad(pluginWillHandleLoadError(loader->response()));
+
     // Calling commitData did not create the plug-in view.
     if (!m_pluginView)
@@ -683 +688 @@
 
     if (!m_hasSentResponseToPluginView) {
-        m_pluginView->manualLoadDidReceiveResponse(m_frame->coreFrame()->loader()->documentLoader()->response());
+        m_pluginView->manualLoadDidReceiveResponse(loader->response());
         // manualLoadDidReceiveResponse sets up a new stream to the plug-in. on a full-page plug-in, a failure in
         // setting up this stream can cause the main document load to be cancelled, setting m_pluginView
@@ -830 +835 @@
 }
 
-ResourceError WebFrameLoaderClient::pluginWillHandleLoadError(const ResourceResponse&)
-{
-    notImplemented();
-    return ResourceError();
-}
-
-bool WebFrameLoaderClient::shouldFallBack(const ResourceError&)
-{
-    notImplemented();
-    return false;
+ResourceError WebFrameLoaderClient::pluginWillHandleLoadError(const ResourceResponse& response)
+{
+    return WebKit::pluginWillHandleLoadError(response);
+}
+
+bool WebFrameLoaderClient::shouldFallBack(const ResourceError& error)
+{
+    DEFINE_STATIC_LOCAL(const ResourceError, cancelledError, (this->cancelledError(ResourceRequest())));
+    DEFINE_STATIC_LOCAL(const ResourceError, pluginWillHandleLoadError, (this->pluginWillHandleLoadError(ResourceResponse())));
+
+    if (error.errorCode() == cancelledError.errorCode() && error.domain() == cancelledError.domain())
+        return false;
+
+    if (error.errorCode() == pluginWillHandleLoadError.errorCode() && error.domain() == pluginWillHandleLoadError.domain())
+        return false;
+
+    return true;
 }
 

trunk/WebKit2/WebProcess/WebCoreSupport/mac/WebErrorsMac.mm

@@ -170 +170 @@
 }
 
+ResourceError pluginWillHandleLoadError(const ResourceResponse& response)
+{
+    return [NSError _webKitErrorWithDomain:WebError::webKitErrorDomain() code:kWKErrorCodePlugInWillHandleLoad URL:response.url()];
+}
+
 } // namespace WebKit

trunk/WebKit2/WebProcess/WebCoreSupport/qt/WebErrorsQt.cpp

@@ -27 +27 @@
 #include "WebErrors.h"
 
+#include "NotImplemented.h"
 #include <WebCore/ResourceRequest.h>
 #include <WebCore/ResourceResponse.h>
@@ -86 +87 @@
 }
 
+ResourceError pluginWillHandleLoadError(const ResourceResponse&)
+{
+    notImplemented();
+    return ResourceError();
+}
+
 } // namespace WebKit

trunk/WebKit2/WebProcess/WebCoreSupport/win/WebErrorsWin.cpp

@@ -73 +73 @@
 }
 
+ResourceError pluginWillHandleLoadError(const ResourceResponse& response)
+{
+    return ResourceError(WebError::webKitErrorDomain(), kWKErrorCodePlugInWillHandleLoad, response.url().string(), String());
+}
+
 } // namespace WebKit