diff options
| author | tapted@chromium.org <tapted@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-22 02:05:38 +0000 |
|---|---|---|
| committer | tapted@chromium.org <tapted@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-22 02:05:38 +0000 |
| commit | 0ef2ca320551b318b35b4b6bf1f8b2cd19d33485 (patch) | |
| tree | bec772c25785a824e62d788e8476bda433ed07f5 /content/worker | |
| parent | fec3e01108c3fcbc657da43d54699e2c66da2738 (diff) | |
| download | chromium_src-0ef2ca320551b318b35b4b6bf1f8b2cd19d33485.zip chromium_src-0ef2ca320551b318b35b4b6bf1f8b2cd19d33485.tar.gz chromium_src-0ef2ca320551b318b35b4b6bf1f8b2cd19d33485.tar.bz2 | |
Revert 189731 "Proxy queryUsageAndQuota from worker process"
Probably cause of test failures:
FileWriterAbort
FileWriterEvents
> Proxy queryUsageAndQuota from worker process
>
> BUG=88490
>
> Review URL: https://codereview.chromium.org/12948002
TBR=alecflett@chromium.org
Review URL: https://codereview.chromium.org/12634018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@189736 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/worker')
| -rw-r--r-- | content/worker/websharedworkerclient_proxy.cc | 9 | ||||
| -rw-r--r-- | content/worker/websharedworkerclient_proxy.h | 4 |
2 files changed, 0 insertions, 13 deletions
diff --git a/content/worker/websharedworkerclient_proxy.cc b/content/worker/websharedworkerclient_proxy.cc index 049361e..01913cb 100644 --- a/content/worker/websharedworkerclient_proxy.cc +++ b/content/worker/websharedworkerclient_proxy.cc @@ -9,7 +9,6 @@ #include "base/message_loop.h" #include "content/common/fileapi/file_system_dispatcher.h" #include "content/common/fileapi/webfilesystem_callback_dispatcher.h" -#include "content/common/quota_dispatcher.h" #include "content/common/webmessageportchannel_impl.h" #include "content/common/worker_messages.h" #include "content/public/common/content_switches.h" @@ -178,14 +177,6 @@ bool WebSharedWorkerClientProxy::allowIndexedDB(const WebKit::WebString& name) { return result; } -void WebSharedWorkerClientProxy::queryUsageAndQuota( - WebKit::WebStorageQuotaType type, - WebKit::WebStorageQuotaCallbacks* callbacks) { - ChildThread::current()->quota_dispatcher()->QueryStorageUsageAndQuota( - stub_->url().GetOrigin(), static_cast<quota::StorageType>(type), - QuotaDispatcher::CreateWebStorageQuotaCallbacksWrapper(callbacks)); -} - void WebSharedWorkerClientProxy::dispatchDevToolsMessage( const WebString& message) { if (devtools_agent_) diff --git a/content/worker/websharedworkerclient_proxy.h b/content/worker/websharedworkerclient_proxy.h index d560628..bc26a29 100644 --- a/content/worker/websharedworkerclient_proxy.h +++ b/content/worker/websharedworkerclient_proxy.h @@ -11,8 +11,6 @@ #include "third_party/WebKit/Source/Platform/chromium/public/WebFileSystem.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebFileSystemType.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebSharedWorkerClient.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebStorageQuotaCallbacks.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebStorageQuotaType.h" namespace WebKit { class WebApplicationCacheHost; @@ -83,8 +81,6 @@ class WebSharedWorkerClientProxy : public WebKit::WebSharedWorkerClient { bool create, WebKit::WebFileSystemCallbacks* callbacks); virtual bool allowIndexedDB(const WebKit::WebString&); - virtual void queryUsageAndQuota(WebKit::WebStorageQuotaType, - WebKit::WebStorageQuotaCallbacks*); virtual void dispatchDevToolsMessage(const WebKit::WebString&); virtual void saveDevToolsAgentState(const WebKit::WebString&); |