diff options
4 files changed, 24 insertions, 0 deletions
diff --git a/chrome/browser/in_process_webkit/browser_webkitclient_impl.cc b/chrome/browser/in_process_webkit/browser_webkitclient_impl.cc index e0af7ee..b9cd9a5 100644 --- a/chrome/browser/in_process_webkit/browser_webkitclient_impl.cc +++ b/chrome/browser/in_process_webkit/browser_webkitclient_impl.cc @@ -10,6 +10,10 @@ #include "third_party/WebKit/WebKit/chromium/public/WebString.h" #include "third_party/WebKit/WebKit/chromium/public/WebURL.h" +BrowserWebKitClientImpl::BrowserWebKitClientImpl() { + file_system_.set_sandbox_enabled(false); +} + WebKit::WebClipboard* BrowserWebKitClientImpl::clipboard() { NOTREACHED(); return NULL; @@ -20,6 +24,10 @@ WebKit::WebMimeRegistry* BrowserWebKitClientImpl::mimeRegistry() { return NULL; } +WebKit::WebFileSystem* BrowserWebKitClientImpl::fileSystem() { + return &file_system_; +} + WebKit::WebSandboxSupport* BrowserWebKitClientImpl::sandboxSupport() { NOTREACHED(); return NULL; diff --git a/chrome/browser/in_process_webkit/browser_webkitclient_impl.h b/chrome/browser/in_process_webkit/browser_webkitclient_impl.h index 831296f..c81503a9 100644 --- a/chrome/browser/in_process_webkit/browser_webkitclient_impl.h +++ b/chrome/browser/in_process_webkit/browser_webkitclient_impl.h @@ -5,13 +5,17 @@ #ifndef CHROME_BROWSER_IN_PROCESS_WEBKIT_BROWSER_WEBKITCLIENT_IMPL_H_ #define CHROME_BROWSER_IN_PROCESS_WEBKIT_BROWSER_WEBKITCLIENT_IMPL_H_ +#include "webkit/glue/webfilesystem_impl.h" #include "webkit/glue/webkitclient_impl.h" class BrowserWebKitClientImpl : public webkit_glue::WebKitClientImpl { public: + BrowserWebKitClientImpl(); + // WebKitClient methods: virtual WebKit::WebClipboard* clipboard(); virtual WebKit::WebMimeRegistry* mimeRegistry(); + virtual WebKit::WebFileSystem* fileSystem(); virtual WebKit::WebSandboxSupport* sandboxSupport(); virtual bool sandboxEnabled(); virtual unsigned long long visitedLinkHash(const char* canonicalURL, @@ -38,6 +42,9 @@ class BrowserWebKitClientImpl : public webkit_glue::WebKitClientImpl { const WebKit::WebString& origin, const WebKit::WebURL& url, bool isLocalStorage); virtual WebKit::WebSharedWorkerRepository* sharedWorkerRepository(); + + private: + webkit_glue::WebFileSystemImpl file_system_; }; #endif // CHROME_BROWSER_IN_PROCESS_WEBKIT_BROWSER_WEBKITCLIENT_IMPL_H_ diff --git a/chrome/worker/worker_webkitclient_impl.cc b/chrome/worker/worker_webkitclient_impl.cc index 7160b4b..4af2cf2 100644 --- a/chrome/worker/worker_webkitclient_impl.cc +++ b/chrome/worker/worker_webkitclient_impl.cc @@ -31,6 +31,10 @@ WebMimeRegistry* WorkerWebKitClientImpl::mimeRegistry() { return this; } +WebKit::WebFileSystem* WorkerWebKitClientImpl::fileSystem() { + return &file_system_; +} + WebSandboxSupport* WorkerWebKitClientImpl::sandboxSupport() { NOTREACHED(); return NULL; diff --git a/chrome/worker/worker_webkitclient_impl.h b/chrome/worker/worker_webkitclient_impl.h index a48eef3..deb76c2 100644 --- a/chrome/worker/worker_webkitclient_impl.h +++ b/chrome/worker/worker_webkitclient_impl.h @@ -6,6 +6,7 @@ #define CHROME_WORKER_WORKER_WEBKITCLIENT_IMPL_H_ #include "third_party/WebKit/WebKit/chromium/public/WebMimeRegistry.h" +#include "webkit/glue/webfilesystem_impl.h" #include "webkit/glue/webkitclient_impl.h" class WorkerWebKitClientImpl : public webkit_glue::WebKitClientImpl, @@ -14,6 +15,7 @@ class WorkerWebKitClientImpl : public webkit_glue::WebKitClientImpl, // WebKitClient methods: virtual WebKit::WebClipboard* clipboard(); virtual WebKit::WebMimeRegistry* mimeRegistry(); + virtual WebKit::WebFileSystem* fileSystem(); virtual WebKit::WebSandboxSupport* sandboxSupport(); virtual bool sandboxEnabled(); virtual unsigned long long visitedLinkHash(const char* canonicalURL, @@ -62,6 +64,9 @@ class WorkerWebKitClientImpl : public webkit_glue::WebKitClientImpl, virtual WebKit::WebString mimeTypeFromFile(const WebKit::WebString&); virtual WebKit::WebString preferredExtensionForMIMEType( const WebKit::WebString&); + + private: + webkit_glue::WebFileSystemImpl file_system_; }; #endif // CHROME_WORKER_WORKER_WEBKITCLIENT_IMPL_H_ |