Changeset 122322 in webkit


Ignore:
Timestamp:
Jul 11, 2012 2:54:23 AM (12 years ago)
Author:
commit-queue@webkit.org
Message:

[EFL][Wk2] WebErrorsEfl.cpp needs to return non-empty errors
https://bugs.webkit.org/show_bug.cgi?id=90688

Patch by Keunsoon Lee <keunsoon.lee@samsung.com> on 2012-07-11
Reviewed by Hajime Morita.

Return meaningful error for each case.

  • WebProcess/WebCoreSupport/efl/WebErrorsEfl.cpp:

(WebKit::cancelledError): create ResourceError for "request canceled".
(WebKit::blockedError): create ResourceError for "request blocked".
(WebKit::cannotShowURLError): create ResourceError for "cannot show url".
(WebKit::interruptedForPolicyChangeError): create ResourceError for "Frame load interrupted by policy change".
(WebKit::cannotShowMIMETypeError): create ResourceError for "Cannot show mimetype".
(WebKit::fileDoesNotExistError): create ResourceError for "File does not exist".
(WebKit::pluginWillHandleLoadError): create ResourceError for "Plugin will handle load".

Location:
trunk/Source/WebKit2
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit2/ChangeLog

    r122321 r122322  
     12012-07-11  Keunsoon Lee  <keunsoon.lee@samsung.com>
     2
     3        [EFL][Wk2] WebErrorsEfl.cpp needs to return non-empty errors
     4        https://bugs.webkit.org/show_bug.cgi?id=90688
     5
     6        Reviewed by Hajime Morita.
     7
     8        Return meaningful error for each case.
     9
     10        * WebProcess/WebCoreSupport/efl/WebErrorsEfl.cpp:
     11        (WebKit::cancelledError): create ResourceError for "request canceled".
     12        (WebKit::blockedError): create ResourceError for "request blocked".
     13        (WebKit::cannotShowURLError): create ResourceError for "cannot show url".
     14        (WebKit::interruptedForPolicyChangeError): create ResourceError for "Frame load interrupted by policy change".
     15        (WebKit::cannotShowMIMETypeError): create ResourceError for "Cannot show mimetype".
     16        (WebKit::fileDoesNotExistError): create ResourceError for "File does not exist".
     17        (WebKit::pluginWillHandleLoadError): create ResourceError for "Plugin will handle load".
     18
    1192012-07-11  Andras Becsi  <andras.becsi@nokia.com>
    220
  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/efl/WebErrorsEfl.cpp

    r97739 r122322  
    2727#include "WebErrors.h"
    2828
    29 #include <WebCore/NotImplemented.h>
     29#include "WKError.h"
     30#include "WebError.h"
    3031#include <WebCore/ResourceError.h>
    3132#include <WebCore/ResourceRequest.h>
     
    3637namespace WebKit {
    3738
     39// FIXME: Export following error codes so that application can understand.
     40// We should establish Efl port's error system because application cannot understand those local define.
     41// See https://bugs.webkit.org/show_bug.cgi?id=90783 for detail.
     42enum {
     43    kWKErrorCodeCancelled =                             300,
     44    kWKErrorCodeFileDoesNotExist =                      301,
     45};
     46
    3847ResourceError cancelledError(const ResourceRequest& request)
    3948{
    40     notImplemented();
    41     return ResourceError();
     49    return ResourceError(WebError::webKitErrorDomain(), kWKErrorCodeCancelled, request.url().string(), "Request cancelled");
    4250}
    4351
    4452ResourceError blockedError(const ResourceRequest& request)
    4553{
    46     notImplemented();
    47     return ResourceError();
     54    return ResourceError(WebError::webKitErrorDomain(), kWKErrorCodeCannotUseRestrictedPort, request.url().string(), "Request blocked");
    4855}
    4956
    5057ResourceError cannotShowURLError(const ResourceRequest& request)
    5158{
    52     notImplemented();
    53     return ResourceError();
     59    return ResourceError(WebError::webKitErrorDomain(), kWKErrorCodeCannotShowURL, request.url().string(), "Cannot show URL");
    5460}
    5561
    5662ResourceError interruptedForPolicyChangeError(const ResourceRequest& request)
    5763{
    58     notImplemented();
    59     return ResourceError();
     64    return ResourceError(WebError::webKitErrorDomain(), kWKErrorCodeFrameLoadInterruptedByPolicyChange, request.url().string(), "Frame load interrupted by policy change");
    6065}
    6166
    6267ResourceError cannotShowMIMETypeError(const ResourceResponse& response)
    6368{
    64     notImplemented();
    65     return ResourceError();
     69    return ResourceError(WebError::webKitErrorDomain(), kWKErrorCodeCannotShowMIMEType, response.url().string(), "Cannot show mimetype");
    6670}
    6771
    6872ResourceError fileDoesNotExistError(const ResourceResponse& response)
    6973{
    70     notImplemented();
    71     return ResourceError();
     74    return ResourceError(WebError::webKitErrorDomain(), kWKErrorCodeFileDoesNotExist, response.url().string(), "File does not exist");
    7275}
    7376
    7477ResourceError pluginWillHandleLoadError(const ResourceResponse& response)
    7578{
    76     notImplemented();
    77     return ResourceError();
     79    return ResourceError(WebError::webKitErrorDomain(), kWKErrorCodePlugInWillHandleLoad, response.url().string(), "Plugin will handle load");
    7880}
    7981
Note: See TracChangeset for help on using the changeset viewer.