Browser Plugin: Renderer-side changes

content/renderer/render_view_impl.h

Index: content/renderer/render_view_impl.h
diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h
index 64085806118d287c739193f6de4aa3a704a384a5..d622356eeaa325c9253edf1b5161446a65dc8368 100644
--- a/content/renderer/render_view_impl.h
+++ b/content/renderer/render_view_impl.h
@@ -13,6 +13,7 @@
 #include <vector>
 
 #include "base/basictypes.h"
+#include "base/callback.h"
 #include "base/gtest_prod_util.h"
 #include "base/id_map.h"
 #include "base/memory/linked_ptr.h"
@@ -92,6 +93,7 @@ class WebUIBindings;
 
 namespace content {
 class DocumentState;
+class GuestToEmbedderChannel;
 class NavigationState;
 class P2PSocketDispatcher;
 class RenderViewObserver;
@@ -110,6 +112,7 @@ namespace webkit {
 
 namespace ppapi {
 class PluginInstance;
+class WebPluginImpl;
 }  // namespace ppapi
 
 }  // namespace webkit
@@ -200,7 +203,7 @@ class RenderViewImpl : public RenderWidget,
       bool swapped_out,
       int32 next_page_id,
       const WebKit::WebScreenInfo& screen_info,
-      bool guest,
+      content::GuestToEmbedderChannel* guest_to_embedder_channel,
       AccessibilityMode accessibility_mode);
 
   // Returns the RenderViewImpl containing the given WebView.
@@ -261,7 +264,20 @@ class RenderViewImpl : public RenderWidget,
   // Sets whether  the renderer should report load progress to the browser.
   void SetReportLoadProgressEnabled(bool enabled);
 
-  bool guest() const { return guest_; }
+  content::GuestToEmbedderChannel*
+  guest_to_embedder_channel() const { return guest_to_embedder_channel_; }

[jam, 2012/05/16 02:22:40]

nit: need to tab here

[Fady Samuel, 2012/05/16 04:43:54]

Done.

+  PP_Instance pp_instance() const { return pp_instance_; }
+  void set_host_resource(const ppapi::HostResource& host_resource) {
+    resource_ = host_resource;
+  }
+  const ppapi::HostResource& host_resource() const { return resource_; }
+
+  void GuestReady(PP_Instance instance);

[jam, 2012/05/16 02:22:40]

nit: please add documentation about these new functions.

[Fady Samuel, 2012/05/16 04:43:54]

Done.

+
+  webkit::ppapi::WebPluginImpl* CreateBrowserPlugin(
+      const IPC::ChannelHandle& channel_handle,
+      int guest_process_id,
+      const WebKit::WebPluginParams& params);
 
   void LoadNavigationErrorPage(
       WebKit::WebFrame* frame,
@@ -758,7 +774,7 @@ class RenderViewImpl : public RenderWidget,
                  bool swapped_out,
                  int32 next_page_id,
                  const WebKit::WebScreenInfo& screen_info,
-                 bool guest,
+                 content::GuestToEmbedderChannel* guest_to_embedder_channel,
                  AccessibilityMode accessibility_mode);
 
   // Do not delete directly.  This class is reference counted.
@@ -1334,11 +1350,22 @@ class RenderViewImpl : public RenderWidget,
 #endif
 
   // Allows JS to access DOM automation. The JS object is only exposed when the
-  // DOM automation bindings are enabled.
+  // DOM automation bendings are enabled.

[jam, 2012/05/16 02:22:40]

?

[Fady Samuel, 2012/05/16 04:43:54]

Done.

   scoped_ptr<DomAutomationController> dom_automation_controller_;
 
-  // Indicates whether this RenderView is a guest of another RenderView.
-  bool guest_;
+  // Channel for communication with embedding renderer, if it exists.
+  scoped_refptr<content::GuestToEmbedderChannel> guest_to_embedder_channel_;
+
+  // The pepper instance identifer for this guest RenderView.
+  PP_Instance pp_instance_;

[jam, 2012/05/16 02:22:40]

nit: this should be something like guest_pp_instance_ to make it clear what it
is

[Fady Samuel, 2012/05/16 04:43:54]

Done.

+
+  // The ppapi::HostResource associated with the on-screen context for this
+  // guest RenderView.
+  ppapi::HostResource resource_;

[jam, 2012/05/16 02:22:40]

ditto for all these parameters

[Fady Samuel, 2012/05/16 04:43:54]

Done.

+
+  WebGraphicsContext3DCommandBufferImpl* uninitialized_context_;
+
+  WebKit::WebGraphicsContext3D::Attributes attributes_;
 
   // The accessibility mode.
   AccessibilityMode accessibility_mode_;