summaryrefslogtreecommitdiffstats
path: root/content/worker
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-12 18:15:30 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-12 18:15:30 +0000
commit45316d6f9cd510bd1b4604c38713272b2c8a7c9e (patch)
tree4055d1f19f436e9f1bf0d44a648e95e45b1e82d3 /content/worker
parentfd59f820f28a384de8f880237979e7fe28854040 (diff)
downloadchromium_src-45316d6f9cd510bd1b4604c38713272b2c8a7c9e.zip
chromium_src-45316d6f9cd510bd1b4604c38713272b2c8a7c9e.tar.gz
chromium_src-45316d6f9cd510bd1b4604c38713272b2c8a7c9e.tar.bz2
Chrome side of having the WebKit FileSystem API use WebPermissionClient for checking if using file system is fine. Depends on https://bugs.webkit.org/show_bug.cgi?id=60683
BUG=76793 Review URL: http://codereview.chromium.org/7012007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85153 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/worker')
-rw-r--r--content/worker/webworkerclient_proxy.cc15
-rw-r--r--content/worker/webworkerclient_proxy.h2
2 files changed, 11 insertions, 6 deletions
diff --git a/content/worker/webworkerclient_proxy.cc b/content/worker/webworkerclient_proxy.cc
index 3f67170..f665de5 100644
--- a/content/worker/webworkerclient_proxy.cc
+++ b/content/worker/webworkerclient_proxy.cc
@@ -149,12 +149,17 @@ bool WebWorkerClientProxy::allowDatabase(WebFrame* frame,
if (origin.isEmpty())
return false;
- bool result;
- if (!Send(new WorkerProcessHostMsg_AllowDatabase(route_id_,
- GURL(origin.toString().utf8()), name, display_name, estimated_size,
- &result)))
- return false;
+ bool result = false;
+ Send(new WorkerProcessHostMsg_AllowDatabase(
+ route_id_, GURL(origin.toString().utf8()), name, display_name,
+ estimated_size, &result));
+ return result;
+}
+bool WebWorkerClientProxy::allowFileSystem() {
+ bool result = false;
+ Send(new WorkerProcessHostMsg_AllowFileSystem(
+ route_id_, stub_->url().GetOrigin(), &result));
return result;
}
diff --git a/content/worker/webworkerclient_proxy.h b/content/worker/webworkerclient_proxy.h
index 580738c..66268a2 100644
--- a/content/worker/webworkerclient_proxy.h
+++ b/content/worker/webworkerclient_proxy.h
@@ -73,7 +73,7 @@ class WebWorkerClientProxy : public WebKit::WebWorkerClient {
const WebKit::WebString& name,
const WebKit::WebString& display_name,
unsigned long estimated_size);
-
+ virtual bool allowFileSystem();
virtual void openFileSystem(WebKit::WebFileSystem::Type type,
long long size,
bool create,