From 4923a338552b0b10747a7ee3c5d424089db2293d Mon Sep 17 00:00:00 2001 From: "brettw@chromium.org" Date: Tue, 7 Dec 2010 17:35:45 +0000 Subject: Revert 68482 - Make webkit/glue/plugins no longer depend on ppapi/proxy directly. This causes things that use webkit but otherwise don't need IPC to include the IPC directory. This patch moves the set-up of the proxy into the renderer. I also did a lot of clean-up of the initialization and it seems much nicer now. BUG=63684 TEST=manual PPAPI proxy testing Review URL: http://codereview.chromium.org/5592005 TBR=brettw@chromium.org Review URL: http://codereview.chromium.org/5616004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68486 0039d316-1c4b-4281-b951-d872f2087c98 --- ppapi/proxy/host_dispatcher.cc | 12 +----------- ppapi/proxy/host_dispatcher.h | 5 +---- 2 files changed, 2 insertions(+), 15 deletions(-) (limited to 'ppapi/proxy') diff --git a/ppapi/proxy/host_dispatcher.cc b/ppapi/proxy/host_dispatcher.cc index 6e7a1f4..fd9801c 100644 --- a/ppapi/proxy/host_dispatcher.cc +++ b/ppapi/proxy/host_dispatcher.cc @@ -7,7 +7,6 @@ #include #include "base/logging.h" -#include "ppapi/c/dev/ppb_var_deprecated.h" #include "ppapi/proxy/host_var_serialization_rules.h" #include "ppapi/proxy/ppapi_messages.h" @@ -22,13 +21,10 @@ InstanceToDispatcherMap* g_instance_to_dispatcher = NULL; } // namespace HostDispatcher::HostDispatcher(base::ProcessHandle remote_process_handle, + const PPB_Var_Deprecated* var_interface, PP_Module module, GetInterfaceFunc local_get_interface) : Dispatcher(remote_process_handle, local_get_interface) { - set_pp_module(module); - const PPB_Var_Deprecated* var_interface = - static_cast( - local_get_interface(PPB_VAR_DEPRECATED_INTERFACE)); SetSerializationRules(new HostVarSerializationRules(var_interface, module)); } @@ -37,12 +33,6 @@ HostDispatcher::~HostDispatcher() { Send(new PpapiMsg_Shutdown()); } -bool HostDispatcher::InitializeModule() { - bool init_result = false; - Send(new PpapiMsg_InitializeModule(pp_module(), &init_result)); - return init_result; -} - // static HostDispatcher* HostDispatcher::GetForInstance(PP_Instance instance) { if (!g_instance_to_dispatcher) diff --git a/ppapi/proxy/host_dispatcher.h b/ppapi/proxy/host_dispatcher.h index f5b91b4..f968652 100644 --- a/ppapi/proxy/host_dispatcher.h +++ b/ppapi/proxy/host_dispatcher.h @@ -38,14 +38,11 @@ class HostDispatcher : public Dispatcher { // // You must call Dispatcher::InitWithChannel after the constructor. HostDispatcher(base::ProcessHandle host_process_handle, + const PPB_Var_Deprecated* var_interface, PP_Module module, GetInterfaceFunc local_get_interface); ~HostDispatcher(); - // Calls the plugin's PPP_InitializeModule function and returns true if - // the call succeeded. - bool InitializeModule(); - // The host side maintains a mapping from PP_Instance to Dispatcher so // that we can send the messages to the right channel. static HostDispatcher* GetForInstance(PP_Instance instance); -- cgit v1.1