diff options
| author | abarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-24 00:26:10 +0000 |
|---|---|---|
| committer | abarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-24 00:26:10 +0000 |
| commit | cb8fdc687c0207d726a22a6e5cdf813c93ba0137 (patch) | |
| tree | 342807844c5dfb023ec354b62002acb07a023237 /webkit | |
| parent | 54262760cd3200c6265be9ffc198aa9cf642634a (diff) | |
| download | chromium_src-cb8fdc687c0207d726a22a6e5cdf813c93ba0137.zip chromium_src-cb8fdc687c0207d726a22a6e5cdf813c93ba0137.tar.gz chromium_src-cb8fdc687c0207d726a22a6e5cdf813c93ba0137.tar.bz2 | |
Update src/webkit/plugins to reflect WEBKIT_FRAME_TO_DOCUMENT_API_MOVE
Review URL: http://codereview.chromium.org/7240010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90307 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/plugins/ppapi/ppb_file_system_impl.cc | 2 | ||||
| -rw-r--r-- | webkit/plugins/ppapi/ppb_url_util_impl.cc | 13 |
2 files changed, 4 insertions, 11 deletions
diff --git a/webkit/plugins/ppapi/ppb_file_system_impl.cc b/webkit/plugins/ppapi/ppb_file_system_impl.cc index 369ae34..f835ead 100644 --- a/webkit/plugins/ppapi/ppb_file_system_impl.cc +++ b/webkit/plugins/ppapi/ppb_file_system_impl.cc @@ -71,7 +71,7 @@ int32_t PPB_FileSystem_Impl::Open(int64_t expected_size, fileapi::kFileSystemTypeTemporary : fileapi::kFileSystemTypePersistent); if (!instance()->delegate()->OpenFileSystem( - instance()->container()->element().document().frame()->url(), + instance()->container()->element().document().url(), file_system_type, expected_size, new FileCallbacks(instance()->module()->AsWeakPtr(), GetReferenceNoAddRef(), diff --git a/webkit/plugins/ppapi/ppb_url_util_impl.cc b/webkit/plugins/ppapi/ppb_url_util_impl.cc index bf71b78..048c26e 100644 --- a/webkit/plugins/ppapi/ppb_url_util_impl.cc +++ b/webkit/plugins/ppapi/ppb_url_util_impl.cc @@ -55,11 +55,7 @@ bool SecurityOriginForInstance(PP_Instance instance_id, return false; WebKit::WebElement plugin_element = instance->container()->element(); - WebKit::WebFrame* plugin_frame = plugin_element.document().frame(); - if (!plugin_frame) - return false; - - *security_origin = plugin_frame->securityOrigin(); + *security_origin = plugin_element.document().securityOrigin(); return true; } @@ -137,13 +133,10 @@ PP_Var GetDocumentURL(PP_Instance instance_id, if (!instance) return PP_MakeNull(); - WebKit::WebFrame* frame = instance->container()->element().document().frame(); - if (!frame) - return PP_MakeNull(); - + WebKit::WebDocument document = instance->container()->element().document(); return URLUtilImpl::GenerateURLReturn(Var::GetInterface()->VarFromUtf8, instance->module()->pp_module(), - frame->url(), components); + document.url(), components); } PP_Var GetPluginInstanceURL(PP_Instance instance_id, |