| 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 afb5f1264f834c2c3c48e316e127f5a8fd15db12..22e7f46f3622564cc62abc03d83cdf2e82601b69 100644
|
| --- a/content/renderer/pepper/renderer_ppapi_host_impl.cc
|
| +++ b/content/renderer/pepper/renderer_ppapi_host_impl.cc
|
| @@ -31,8 +31,8 @@
|
|
|
| namespace content {
|
| // static
|
| -CONTENT_EXPORT RendererPpapiHost*
|
| -RendererPpapiHost::GetForPPInstance(PP_Instance instance) {
|
| +CONTENT_EXPORT RendererPpapiHost* RendererPpapiHost::GetForPPInstance(
|
| + PP_Instance instance) {
|
| return RendererPpapiHostImpl::GetForPPInstance(instance);
|
| }
|
|
|
| @@ -41,11 +41,9 @@ RendererPpapiHostImpl::RendererPpapiHostImpl(
|
| PluginModule* module,
|
| ppapi::proxy::HostDispatcher* dispatcher,
|
| const ppapi::PpapiPermissions& permissions)
|
| - : module_(module),
|
| - dispatcher_(dispatcher) {
|
| + : module_(module), dispatcher_(dispatcher) {
|
| // Hook the PpapiHost up to the dispatcher for out-of-process communication.
|
| - ppapi_host_.reset(
|
| - new ppapi::host::PpapiHost(dispatcher, permissions));
|
| + ppapi_host_.reset(new ppapi::host::PpapiHost(dispatcher, permissions));
|
| ppapi_host_->AddHostFactoryFilter(scoped_ptr<ppapi::host::HostFactory>(
|
| new ContentRendererPepperHostFactory(this)));
|
| dispatcher->AddFilter(ppapi_host_.get());
|
| @@ -56,8 +54,7 @@ RendererPpapiHostImpl::RendererPpapiHostImpl(
|
| RendererPpapiHostImpl::RendererPpapiHostImpl(
|
| PluginModule* module,
|
| const ppapi::PpapiPermissions& permissions)
|
| - : module_(module),
|
| - dispatcher_(NULL) {
|
| + : module_(module), dispatcher_(NULL) {
|
| // Hook the host up to the in-process router.
|
| in_process_router_.reset(new PepperInProcessRouter(this));
|
| ppapi_host_.reset(new ppapi::host::PpapiHost(
|
| @@ -80,8 +77,8 @@ RendererPpapiHostImpl* RendererPpapiHostImpl::CreateOnModuleForOutOfProcess(
|
| ppapi::proxy::HostDispatcher* dispatcher,
|
| const ppapi::PpapiPermissions& permissions) {
|
| DCHECK(!module->renderer_ppapi_host());
|
| - RendererPpapiHostImpl* result = new RendererPpapiHostImpl(
|
| - module, dispatcher, permissions);
|
| + RendererPpapiHostImpl* result =
|
| + new RendererPpapiHostImpl(module, dispatcher, permissions);
|
|
|
| // Takes ownership of pointer.
|
| module->SetRendererPpapiHost(scoped_ptr<RendererPpapiHostImpl>(result));
|
| @@ -94,8 +91,8 @@ RendererPpapiHostImpl* RendererPpapiHostImpl::CreateOnModuleForInProcess(
|
| PluginModule* module,
|
| const ppapi::PpapiPermissions& permissions) {
|
| DCHECK(!module->renderer_ppapi_host());
|
| - RendererPpapiHostImpl* result = new RendererPpapiHostImpl(
|
| - module, permissions);
|
| + RendererPpapiHostImpl* result =
|
| + new RendererPpapiHostImpl(module, permissions);
|
|
|
| // Takes ownership of pointer.
|
| module->SetRendererPpapiHost(scoped_ptr<RendererPpapiHostImpl>(result));
|
| @@ -133,7 +130,7 @@ ppapi::host::PpapiHost* RendererPpapiHostImpl::GetPpapiHost() {
|
| }
|
|
|
| RenderFrame* RendererPpapiHostImpl::GetRenderFrameForInstance(
|
| - PP_Instance instance) const {
|
| + PP_Instance instance) const {
|
| PepperPluginInstanceImpl* instance_object = GetAndValidateInstance(instance);
|
| if (!instance_object)
|
| return NULL;
|
| @@ -164,7 +161,7 @@ PepperPluginInstance* RendererPpapiHostImpl::GetPluginInstance(
|
| }
|
|
|
| blink::WebPluginContainer* RendererPpapiHostImpl::GetContainerForInstance(
|
| - PP_Instance instance) const {
|
| + PP_Instance instance) const {
|
| PepperPluginInstanceImpl* instance_object = GetAndValidateInstance(instance);
|
| if (!instance_object)
|
| return NULL;
|
| @@ -220,9 +217,8 @@ IPC::PlatformFileForTransit RendererPpapiHostImpl::ShareHandleWithRemote(
|
| // Duplicate the file handle for in process mode so this function
|
| // has the same semantics for both in process mode and out of
|
| // process mode (i.e., the remote side must cloes the handle).
|
| - return BrokerGetFileHandleForProcess(handle,
|
| - base::GetCurrentProcId(),
|
| - should_close_source);
|
| + return BrokerGetFileHandleForProcess(
|
| + handle, base::GetCurrentProcId(), should_close_source);
|
| }
|
| return dispatcher_->ShareHandleWithRemote(handle, should_close_source);
|
| }
|
| @@ -239,13 +235,12 @@ void RendererPpapiHostImpl::CreateBrowserResourceHosts(
|
| PepperBrowserConnection* browser_connection =
|
| PepperBrowserConnection::Get(render_frame);
|
| if (!browser_connection) {
|
| - base::MessageLoop::current()->PostTask(FROM_HERE,
|
| + base::MessageLoop::current()->PostTask(
|
| + FROM_HERE,
|
| base::Bind(callback, std::vector<int>(nested_msgs.size(), 0)));
|
| } else {
|
| - browser_connection->SendBrowserCreate(module_->GetPluginChildId(),
|
| - instance,
|
| - nested_msgs,
|
| - callback);
|
| + browser_connection->SendBrowserCreate(
|
| + module_->GetPluginChildId(), instance, nested_msgs, callback);
|
| }
|
| }
|
|
|
|
|