Changeset 71938 in webkit
- Timestamp:
- Nov 12, 2010 1:07:26 PM (13 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebKit/qt/ChangeLog
r71818 r71938 1 2010-11-12 Benjamin Poulain <benjamin.poulain@nokia.com> 2 3 Reviewed by Andreas Kling. 4 5 [Qt] Need to implement WebKit::pluginWillHandleLoadError for WebKit2 6 https://bugs.webkit.org/show_bug.cgi?id=48764 7 8 Add the missing error. 9 10 * WebCoreSupport/FrameLoaderClientQt.cpp: 11 (WebCore::FrameLoaderClientQt::pluginWillHandleLoadError): 12 1 13 2010-11-11 Yi Shen <yi.4.shen@nokia.com> 2 14 -
trunk/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
r71803 r71938 897 897 WebKitErrorCannotLoadPlugIn = 201, 898 898 WebKitErrorJavaUnavailable = 202, 899 WebKitErrorPluginWillHandleLoad = 203 899 900 }; 900 901 … … 930 931 } 931 932 932 WebCore::ResourceError FrameLoaderClientQt::pluginWillHandleLoadError(const WebCore::ResourceResponse& )933 { 934 notImplemented();935 return ResourceError();933 WebCore::ResourceError FrameLoaderClientQt::pluginWillHandleLoadError(const WebCore::ResourceResponse& response) 934 { 935 return ResourceError("WebKit", WebKitErrorPluginWillHandleLoad, response.url().string(), 936 QCoreApplication::translate("QWebFrame", "Loading is handled by the media engine", 0, QCoreApplication::UnicodeUTF8)); 936 937 } 937 938 -
trunk/WebKit2/ChangeLog
r71937 r71938 1 2010-11-12 Benjamin Poulain <benjamin.poulain@nokia.com> 2 3 Reviewed by Andreas Kling. 4 5 [Qt] Need to implement WebKit::pluginWillHandleLoadError for WebKit2 6 https://bugs.webkit.org/show_bug.cgi?id=48764 7 8 Add the missing error to Qt support. 9 10 * WebProcess/WebCoreSupport/qt/WebErrorsQt.cpp: 11 (WebKit::pluginWillHandleLoadError): 12 1 13 2010-11-12 John Sullivan <sullivan@apple.com> 2 14 -
trunk/WebKit2/WebProcess/WebCoreSupport/qt/WebErrorsQt.cpp
r71033 r71938 27 27 #include "WebErrors.h" 28 28 29 #include "NotImplemented.h"30 29 #include <WebCore/ResourceRequest.h> 31 30 #include <WebCore/ResourceResponse.h> … … 47 46 WebKitErrorCannotLoadPlugIn = 201, 48 47 WebKitErrorJavaUnavailable = 202, 48 WebKitErrorPluginWillHandleLoad = 203 49 49 }; 50 50 … … 87 87 } 88 88 89 ResourceError pluginWillHandleLoadError(const ResourceResponse& )89 ResourceError pluginWillHandleLoadError(const ResourceResponse& response) 90 90 { 91 notImplemented();92 return ResourceError();91 return ResourceError("WebKit", WebKitErrorPluginWillHandleLoad, response.url().string(), 92 QCoreApplication::translate("QWebFrame", "Loading is handled by the media engine", 0, QCoreApplication::UnicodeUTF8)); 93 93 } 94 94
Note: See TracChangeset
for help on using the changeset viewer.