Title: [99071] trunk/Source/WebKit/qt
- Revision
- 99071
- Author
- [email protected]
- Date
- 2011-11-02 09:44:38 -0700 (Wed, 02 Nov 2011)
Log Message
[Qt] Failing test media/video-document-types.html
https://bugs.webkit.org/show_bug.cgi?id=62108
Patch by Deepak Sherveghar <[email protected]> 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):
Modified Paths
Diff
Modified: trunk/Source/WebKit/qt/ChangeLog (99070 => 99071)
--- trunk/Source/WebKit/qt/ChangeLog 2011-11-02 16:40:47 UTC (rev 99070)
+++ trunk/Source/WebKit/qt/ChangeLog 2011-11-02 16:44:38 UTC (rev 99071)
@@ -1,3 +1,17 @@
+2011-11-02 Deepak Sherveghar <[email protected]>
+
+ [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 <[email protected]>
[Qt][WK2] Fix build of WebKitTestRunner with ELF symbol visibility
Modified: trunk/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp (99070 => 99071)
--- trunk/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp 2011-11-02 16:40:47 UTC (rev 99070)
+++ trunk/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp 2011-11-02 16:44:38 UTC (rev 99071)
@@ -899,7 +899,11 @@
{
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()) {
if (!m_hasSentResponseToPlugin) {
@@ -974,7 +978,7 @@
bool FrameLoaderClientQt::shouldFallBack(const WebCore::ResourceError& error)
{
- return !(error.isCancellation() || (error.errorCode() == WebKitErrorFrameLoadInterruptedByPolicyChange));
+ return !(error.isCancellation() || (error.errorCode() == WebKitErrorFrameLoadInterruptedByPolicyChange) || (error.errorCode() == WebKitErrorPluginWillHandleLoad));
}
WTF::PassRefPtr<WebCore::DocumentLoader> FrameLoaderClientQt::createDocumentLoader(const WebCore::ResourceRequest& request, const SubstituteData& substituteData)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
