Changeset 71938 in webkit


Ignore:
Timestamp:
Nov 12, 2010 1:07:26 PM (13 years ago)
Author:
benjamin.poulain@nokia.com
Message:

[Qt] Need to implement WebKit::pluginWillHandleLoadError for WebKit2
https://bugs.webkit.org/show_bug.cgi?id=48764

WebKit/qt:

Reviewed by Andreas Kling.

Add the missing error.

  • WebCoreSupport/FrameLoaderClientQt.cpp:

(WebCore::FrameLoaderClientQt::pluginWillHandleLoadError):

WebKit2:

Reviewed by NOBODY (OOPS!).

Add the missing error to Qt support.

  • WebProcess/WebCoreSupport/qt/WebErrorsQt.cpp:

(WebKit::pluginWillHandleLoadError):

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebKit/qt/ChangeLog

    r71818 r71938  
     12010-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
    1132010-11-11  Yi Shen  <yi.4.shen@nokia.com>
    214
  • trunk/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp

    r71803 r71938  
    897897    WebKitErrorCannotLoadPlugIn =                               201,
    898898    WebKitErrorJavaUnavailable =                                202,
     899    WebKitErrorPluginWillHandleLoad =                           203
    899900};
    900901
     
    930931}
    931932
    932 WebCore::ResourceError FrameLoaderClientQt::pluginWillHandleLoadError(const WebCore::ResourceResponse&)
    933 {
    934     notImplemented();
    935     return ResourceError();
     933WebCore::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));
    936937}
    937938
  • trunk/WebKit2/ChangeLog

    r71937 r71938  
     12010-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
    1132010-11-12  John Sullivan  <sullivan@apple.com>
    214
  • trunk/WebKit2/WebProcess/WebCoreSupport/qt/WebErrorsQt.cpp

    r71033 r71938  
    2727#include "WebErrors.h"
    2828
    29 #include "NotImplemented.h"
    3029#include <WebCore/ResourceRequest.h>
    3130#include <WebCore/ResourceResponse.h>
     
    4746    WebKitErrorCannotLoadPlugIn =                               201,
    4847    WebKitErrorJavaUnavailable =                                202,
     48    WebKitErrorPluginWillHandleLoad =                           203
    4949};
    5050
     
    8787}
    8888
    89 ResourceError pluginWillHandleLoadError(const ResourceResponse&)
     89ResourceError pluginWillHandleLoadError(const ResourceResponse& response)
    9090{
    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));
    9393}
    9494
Note: See TracChangeset for help on using the changeset viewer.