diff options
| author | abarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-24 01:27:16 +0000 |
|---|---|---|
| committer | abarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-24 01:27:16 +0000 |
| commit | 57278b9b305fd6dac68f6b66700cf817e3a1c0f5 (patch) | |
| tree | 8e033e6efb3524647cdd370487635eb5656ae1fd /content | |
| parent | 1a5c132f8e235153307b0c8224d96b0746e44744 (diff) | |
| download | chromium_src-57278b9b305fd6dac68f6b66700cf817e3a1c0f5.zip chromium_src-57278b9b305fd6dac68f6b66700cf817e3a1c0f5.tar.gz chromium_src-57278b9b305fd6dac68f6b66700cf817e3a1c0f5.tar.bz2 | |
Update src/content to reflect WEBKIT_FRAME_TO_DOCUMENT_API_MOVE
Review URL: http://codereview.chromium.org/7240012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90322 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/worker/webworkerclient_proxy.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/content/worker/webworkerclient_proxy.cc b/content/worker/webworkerclient_proxy.cc index dde6be2..3493b32 100644 --- a/content/worker/webworkerclient_proxy.cc +++ b/content/worker/webworkerclient_proxy.cc @@ -20,6 +20,7 @@ #include "content/worker/worker_thread.h" #include "content/worker/worker_webapplicationcachehost_impl.h" #include "ipc/ipc_logging.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileSystemCallbacks.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h" @@ -143,11 +144,14 @@ WebApplicationCacheHost* WebWorkerClientProxy::createApplicationCacheHost( return host; } +// TODO(abarth): Security checks should use WebDocument or WebSecurityOrigin, +// not WebFrame as the context object because WebFrames can contain different +// WebDocuments at different times. bool WebWorkerClientProxy::allowDatabase(WebFrame* frame, const WebString& name, const WebString& display_name, unsigned long estimated_size) { - WebSecurityOrigin origin = frame->securityOrigin(); + WebSecurityOrigin origin = frame->document().securityOrigin(); if (origin.isEmpty()) return false; |