Changeset 122322 in webkit
- Timestamp:
- Jul 11, 2012 2:54:23 AM (12 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r122321 r122322 1 2012-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 1 19 2012-07-11 Andras Becsi <andras.becsi@nokia.com> 2 20 -
trunk/Source/WebKit2/WebProcess/WebCoreSupport/efl/WebErrorsEfl.cpp
r97739 r122322 27 27 #include "WebErrors.h" 28 28 29 #include <WebCore/NotImplemented.h> 29 #include "WKError.h" 30 #include "WebError.h" 30 31 #include <WebCore/ResourceError.h> 31 32 #include <WebCore/ResourceRequest.h> … … 36 37 namespace WebKit { 37 38 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. 42 enum { 43 kWKErrorCodeCancelled = 300, 44 kWKErrorCodeFileDoesNotExist = 301, 45 }; 46 38 47 ResourceError cancelledError(const ResourceRequest& request) 39 48 { 40 notImplemented(); 41 return ResourceError(); 49 return ResourceError(WebError::webKitErrorDomain(), kWKErrorCodeCancelled, request.url().string(), "Request cancelled"); 42 50 } 43 51 44 52 ResourceError blockedError(const ResourceRequest& request) 45 53 { 46 notImplemented(); 47 return ResourceError(); 54 return ResourceError(WebError::webKitErrorDomain(), kWKErrorCodeCannotUseRestrictedPort, request.url().string(), "Request blocked"); 48 55 } 49 56 50 57 ResourceError cannotShowURLError(const ResourceRequest& request) 51 58 { 52 notImplemented(); 53 return ResourceError(); 59 return ResourceError(WebError::webKitErrorDomain(), kWKErrorCodeCannotShowURL, request.url().string(), "Cannot show URL"); 54 60 } 55 61 56 62 ResourceError interruptedForPolicyChangeError(const ResourceRequest& request) 57 63 { 58 notImplemented(); 59 return ResourceError(); 64 return ResourceError(WebError::webKitErrorDomain(), kWKErrorCodeFrameLoadInterruptedByPolicyChange, request.url().string(), "Frame load interrupted by policy change"); 60 65 } 61 66 62 67 ResourceError cannotShowMIMETypeError(const ResourceResponse& response) 63 68 { 64 notImplemented(); 65 return ResourceError(); 69 return ResourceError(WebError::webKitErrorDomain(), kWKErrorCodeCannotShowMIMEType, response.url().string(), "Cannot show mimetype"); 66 70 } 67 71 68 72 ResourceError fileDoesNotExistError(const ResourceResponse& response) 69 73 { 70 notImplemented(); 71 return ResourceError(); 74 return ResourceError(WebError::webKitErrorDomain(), kWKErrorCodeFileDoesNotExist, response.url().string(), "File does not exist"); 72 75 } 73 76 74 77 ResourceError pluginWillHandleLoadError(const ResourceResponse& response) 75 78 { 76 notImplemented(); 77 return ResourceError(); 79 return ResourceError(WebError::webKitErrorDomain(), kWKErrorCodePlugInWillHandleLoad, response.url().string(), "Plugin will handle load"); 78 80 } 79 81
Note: See TracChangeset
for help on using the changeset viewer.