Browser Plugin: Remove MapInstance from BrowserPluginHost + More cross-process navigation work

content/renderer/browser_plugin/guest_to_embedder_channel.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_RENDERER_BROWSER_PLUGIN_GUEST_TO_EMBEDDER_CHANNEL_H_
 #define CONTENT_RENDERER_BROWSER_PLUGIN_GUEST_TO_EMBEDDER_CHANNEL_H_
 #pragma once
 
 #include "base/memory/ref_counted.h"
 #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h"
@@ skipping 21 matching lines @@
 // a WebGraphicsContext3DCommandBufferImpl which is owned by WebKit. Since the
 // lifetime of this context is less than the lifetime of the RenderViewImpl, we
 // keep the GuestToEmbedderChannel alive as long as a RenderViewImpl has access
 // to it. If the context is lost, then the PpapiCommandBufferProxy is destroyed
 // and we can safely release the reference to this GuestToEmbedderChannel held
 // by RenderViewImpl.
 class GuestToEmbedderChannel
     : public ppapi::proxy::Dispatcher,
       public base::RefCounted<GuestToEmbedderChannel> {
  public:
-  explicit GuestToEmbedderChannel(const std::string& embedder_channel_manager);
+  GuestToEmbedderChannel(
+      const std::string& embedder_channel_name,
+      const IPC::ChannelHandle& embedder_channel_handle);
 
   // This must be called before anything else. Returns true on success.
   bool InitChannel(const IPC::ChannelHandle& channel_handle);
 
   // Creates a new WebGraphicsContext3DCommandBufferImpl and returns it.
   WebGraphicsContext3DCommandBufferImpl* CreateWebGraphicsContext3D(
       RenderViewImpl* render_view,
       const WebKit::WebGraphicsContext3D::Attributes& attributes,
       bool offscreen);
 
@@ skipping 10 matching lines @@
       bool offscreen,
       RenderViewImpl* render_view);
 
   // Register the given RenderView with the given PP_Instance.
   void AddGuest(PP_Instance instance, RenderViewImpl* render_view);
 
   // Removes the guest with the given instance identifier from the
   // InstanceMap.
   void RemoveGuest(PP_Instance instance);
 
+  const std::string& embedder_channel_name() const {
+    return embedder_channel_name_;
+  }
+
+  const IPC::ChannelHandle& embedder_channel_handle() const {
+    return embedder_channel_handle_;
+  }
+
   // ppapi::proxy::Dispatcher implementation.
   virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
   virtual bool Send(IPC::Message* message) OVERRIDE;
   virtual void OnChannelError() OVERRIDE;
   virtual bool IsPlugin() const OVERRIDE;
 
  private:
   friend class base::RefCounted<GuestToEmbedderChannel>;
   typedef std::map<PP_Instance, base::WeakPtr<RenderViewImpl> > InstanceMap;
   typedef std::map<int, int> RoutingIDToInstanceMap;
@@ skipping 20 matching lines @@
 
   void OnHandleFilteredInputEvent(PP_Instance instance,
                                   const ppapi::InputEventData& data,
                                   PP_Bool* result);
 
   void OnSwapBuffersACK(const ppapi::HostResource& context,
                         int32_t pp_error);
 
   void OnContextLost(PP_Instance instance);
 
+  void OnGuestReady(PP_Instance instance, int embedder_container_id);
+
   base::WeakPtr<RenderViewImpl> render_view_;
-  BrowserPluginChannelManager* channel_manager_;
   std::string embedder_channel_name_;
+  IPC::ChannelHandle embedder_channel_handle_;
   PepperProxyChannelDelegateImpl delegate_;
 
   InstanceMap render_view_instances_;
   RoutingIDToInstanceMap routing_id_instance_map_;
 
   DISALLOW_COPY_AND_ASSIGN(GuestToEmbedderChannel);
 };
 
 }  // namespace content
 
 #endif // CONTENT_RENDERER_BROWSER_PLUGIN_GUEST_TO_EMBEDDER_CHANNEL_H_