diff options
| author | pilgrim@chromium.org <pilgrim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-19 16:37:53 +0000 |
|---|---|---|
| committer | pilgrim@chromium.org <pilgrim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-19 16:37:53 +0000 |
| commit | 18cdb0e4680927e33e8484364a6ec1cf9f77d91e (patch) | |
| tree | f1b7d5a168940029844577d1e93c4ff8d3e8e827 /content/worker | |
| parent | 363b7ab54e301110dfb6c823a7a51d53871132af (diff) | |
| download | chromium_src-18cdb0e4680927e33e8484364a6ec1cf9f77d91e.zip chromium_src-18cdb0e4680927e33e8484364a6ec1cf9f77d91e.tar.gz chromium_src-18cdb0e4680927e33e8484364a6ec1cf9f77d91e.tar.bz2 | |
Add support for WEBKIT_USE_NEW_WEBFILESYSTEMTYPE
Upstream WebKit is migrating from WebFileSystem::Type to a new top-level WebFileSystemType (unconnected to the WebFileSystem class) in order to make other filesystem-related refactoring easier. This is behind an #ifdef so that we can make the necessary changes upstream and downstream all at once.
Review URL: https://chromiumcodereview.appspot.com/12886018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@189038 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/worker')
| -rw-r--r-- | content/worker/websharedworkerclient_proxy.cc | 4 | ||||
| -rw-r--r-- | content/worker/websharedworkerclient_proxy.h | 8 |
2 files changed, 11 insertions, 1 deletions
diff --git a/content/worker/websharedworkerclient_proxy.cc b/content/worker/websharedworkerclient_proxy.cc index f17cdbd..469f8dd 100644 --- a/content/worker/websharedworkerclient_proxy.cc +++ b/content/worker/websharedworkerclient_proxy.cc @@ -161,7 +161,11 @@ bool WebSharedWorkerClientProxy::allowFileSystem() { } void WebSharedWorkerClientProxy::openFileSystem( +#ifdef WEBKIT_USE_NEW_WEBFILESYSTEMTYPE + WebKit::WebFileSystemType type, +#else WebKit::WebFileSystem::Type type, +#endif long long size, bool create, WebKit::WebFileSystemCallbacks* callbacks) { diff --git a/content/worker/websharedworkerclient_proxy.h b/content/worker/websharedworkerclient_proxy.h index 504cad8..cfbcaf5 100644 --- a/content/worker/websharedworkerclient_proxy.h +++ b/content/worker/websharedworkerclient_proxy.h @@ -9,6 +9,7 @@ #include "base/memory/weak_ptr.h" #include "ipc/ipc_channel.h" #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" namespace WebKit { @@ -74,7 +75,12 @@ class WebSharedWorkerClientProxy : public WebKit::WebSharedWorkerClient { const WebKit::WebString& display_name, unsigned long estimated_size); virtual bool allowFileSystem(); - virtual void openFileSystem(WebKit::WebFileSystem::Type type, + virtual void openFileSystem( +#ifdef WEBKIT_USE_NEW_WEBFILESYSTEMTYPE + WebKit::WebFileSystemType type, +#else + WebKit::WebFileSystem::Type type, +#endif long long size, bool create, WebKit::WebFileSystemCallbacks* callbacks); |