Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7809)

Unified Diff: content/renderer/pepper/renderer_ppapi_host_impl.cc

Issue 605593002: PPAPI: Support sending browser-hosted resources synchronously Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix content_browsertests Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/pepper/renderer_ppapi_host_impl.h ('k') | content/renderer/pepper/resource_converter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/pepper/renderer_ppapi_host_impl.cc
diff --git a/content/renderer/pepper/renderer_ppapi_host_impl.cc b/content/renderer/pepper/renderer_ppapi_host_impl.cc
index b6e6e9e7e46d08d3789a082ddf88d87788a68da4..5925e9dceb8b3d194a736a3087fb8c2cb8f8d56e 100644
--- a/content/renderer/pepper/renderer_ppapi_host_impl.cc
+++ b/content/renderer/pepper/renderer_ppapi_host_impl.cc
@@ -241,19 +241,20 @@ void RendererPpapiHostImpl::SetToExternalPluginHost() {
is_external_plugin_host_ = true;
}
-void RendererPpapiHostImpl::CreateBrowserResourceHosts(
+int32_t RendererPpapiHostImpl::CreateBrowserResourceHosts(
PP_Instance instance,
const std::vector<IPC::Message>& nested_msgs,
- const base::Callback<void(const std::vector<int>&)>& callback) const {
+ const PendingResourceCallback& callback) const {
RenderFrame* render_frame = GetRenderFrameForInstance(instance);
PepperBrowserConnection* browser_connection =
PepperBrowserConnection::Get(render_frame);
if (!browser_connection) {
+ ppapi::proxy::CompletedBrowserResourceHosts empty;
base::MessageLoop::current()->PostTask(
- FROM_HERE,
- base::Bind(callback, std::vector<int>(nested_msgs.size(), 0)));
+ FROM_HERE, base::Bind(callback, empty));
+ return -1;
} else {
- browser_connection->SendBrowserCreate(
+ return browser_connection->SendBrowserCreate(
module_->GetPluginChildId(), instance, nested_msgs, callback);
}
}
@@ -266,6 +267,19 @@ GURL RendererPpapiHostImpl::GetDocumentURL(PP_Instance instance) const {
return instance_object->container()->element().document().url();
}
+void RendererPpapiHostImpl::GetAllPendingBrowserHosts(
+ PP_Instance instance,
+ std::vector<ppapi::proxy::CompletedBrowserResourceHosts>* result) {
+ RenderFrame* render_frame = GetRenderFrameForInstance(instance);
+ PepperBrowserConnection* browser_connection =
+ PepperBrowserConnection::Get(render_frame);
+ if (!browser_connection)
+ return;
+ browser_connection->GetAllPendingBrowserHosts(instance,
+ module_->GetPluginChildId(),
+ result);
+}
+
PepperPluginInstanceImpl* RendererPpapiHostImpl::GetAndValidateInstance(
PP_Instance pp_instance) const {
PepperPluginInstanceImpl* instance =
« no previous file with comments | « content/renderer/pepper/renderer_ppapi_host_impl.h ('k') | content/renderer/pepper/resource_converter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698