Commit 7abc57cc authored by japhet@chromium.org's avatar japhet@chromium.org

Plumb net::ERR_ABORTED to Platform, so that it can be exposed to WebCore. This

will all ResourceError to create a cancallation error with the proper error
code, instead of having to call all the way out to RenderViewImpl.

This is required for https://codereview.chromium.org/14264012

BUG=none
TEST=none

Review URL: https://codereview.chromium.org/14297005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@194436 0039d316-1c4b-4281-b951-d872f2087c98
parent 43e9e420
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
#include "grit/webkit_chromium_resources.h" #include "grit/webkit_chromium_resources.h"
#include "grit/webkit_resources.h" #include "grit/webkit_resources.h"
#include "grit/webkit_strings.h" #include "grit/webkit_strings.h"
#include "net/base/net_errors.h"
#include "third_party/WebKit/Source/Platform/chromium/public/WebCookie.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebCookie.h"
#include "third_party/WebKit/Source/Platform/chromium/public/WebData.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebData.h"
#include "third_party/WebKit/Source/Platform/chromium/public/WebDiscardableMemory.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebDiscardableMemory.h"
...@@ -398,6 +399,10 @@ WebString WebKitPlatformSupportImpl::userAgent(const WebURL& url) { ...@@ -398,6 +399,10 @@ WebString WebKitPlatformSupportImpl::userAgent(const WebURL& url) {
return WebString::fromUTF8(webkit_glue::GetUserAgent(url)); return WebString::fromUTF8(webkit_glue::GetUserAgent(url));
} }
int WebKitPlatformSupportImpl::cancelledErrorCode() const {
return net::ERR_ABORTED;
}
void WebKitPlatformSupportImpl::getPluginList(bool refresh, void WebKitPlatformSupportImpl::getPluginList(bool refresh,
WebPluginListBuilder* builder) { WebPluginListBuilder* builder) {
std::vector<webkit::WebPluginInfo> plugins; std::vector<webkit::WebPluginInfo> plugins;
......
...@@ -83,6 +83,7 @@ class WEBKIT_GLUE_EXPORT WebKitPlatformSupportImpl : ...@@ -83,6 +83,7 @@ class WEBKIT_GLUE_EXPORT WebKitPlatformSupportImpl :
virtual WebKit::WebURLLoader* createURLLoader(); virtual WebKit::WebURLLoader* createURLLoader();
virtual WebKit::WebSocketStreamHandle* createSocketStreamHandle(); virtual WebKit::WebSocketStreamHandle* createSocketStreamHandle();
virtual WebKit::WebString userAgent(const WebKit::WebURL& url); virtual WebKit::WebString userAgent(const WebKit::WebURL& url);
virtual int cancelledErrorCode() const;
virtual void getPluginList(bool refresh, WebKit::WebPluginListBuilder*); virtual void getPluginList(bool refresh, WebKit::WebPluginListBuilder*);
virtual void decrementStatsCounter(const char* name); virtual void decrementStatsCounter(const char* name);
virtual void incrementStatsCounter(const char* name); virtual void incrementStatsCounter(const char* name);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment