Browser Plugin: Renderer-side changes

content/renderer/render_view_impl.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_RENDER_VIEW_IMPL_H_
 #define CONTENT_RENDERER_RENDER_VIEW_IMPL_H_
 #pragma once
 
 #include <deque>
 #include <map>
 #include <set>
 #include <string>
 #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"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "base/timer.h"
 #include "build/build_config.h"
 #include "content/common/content_export.h"
 #include "content/common/edit_command.h"
 #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h"
@@ skipping 59 matching lines @@
 struct ViewMsg_PostMessage_Params;
 struct ViewMsg_StopFinding_Params;
 struct ViewMsg_SwapOut_Params;
 struct WebDropData;
 class WebIntentsHost;
 class WebPluginDelegateProxy;
 class WebUIBindings;
 
 namespace content {
 class DocumentState;
+class GuestToEmbedderChannel;
 class NavigationState;
 class P2PSocketDispatcher;
 class RenderViewObserver;
 class RenderViewTest;
 struct CustomContextMenuContext;
 struct FileChooserParams;
 struct SelectedFileInfo;
 }  // namespace content
 
 namespace gfx {
 class Point;
 class Rect;
 }  // namespace gfx
 
 namespace webkit {
 
 namespace ppapi {
 class PluginInstance;
+class WebPluginImpl;
 }  // namespace ppapi
 
 }  // namespace webkit
 
 namespace webkit_glue {
 class ImageResourceFetcher;
 class ResourceFetcher;
 }
 
 namespace WebKit {
@@ skipping 70 matching lines @@
       const webkit_glue::WebPreferences& webkit_prefs,
       SharedRenderViewCounter* counter,
       int32 routing_id,
       int32 surface_id,
       int64 session_storage_namespace_id,
       const string16& frame_name,
       bool is_renderer_created,
       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.
   CONTENT_EXPORT static RenderViewImpl* FromWebView(WebKit::WebView* webview);
 
   // May return NULL when the view is closing.
   CONTENT_EXPORT WebKit::WebView* webview() const;
 
   // WebGraphicsContext3DSwapBuffersClient implementation.
 
@@ skipping 40 matching lines @@
   // no other waiting items in the queue.
   //
   // Returns true if the chooser was successfully scheduled. False means we
   // didn't schedule anything.
   bool ScheduleFileChooser(const content::FileChooserParams& params,
                            WebKit::WebFileChooserCompletion* completion);
 
   // 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,
       const WebKit::WebURLRequest& failed_request,
       const WebKit::WebURLError& error,
       const std::string& html,
       bool replace);
 
   // Plugin-related functions --------------------------------------------------
   // (See also WebPluginPageDelegate implementation.)
@@ skipping 476 matching lines @@
                  const webkit_glue::WebPreferences& webkit_prefs,
                  SharedRenderViewCounter* counter,
                  int32 routing_id,
                  int32 surface_id,
                  int64 session_storage_namespace_id,
                  const string16& frame_name,
                  bool is_renderer_created,
                  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.
   virtual ~RenderViewImpl();
 
   void UpdateURL(WebKit::WebFrame* frame);
   void UpdateTitle(WebKit::WebFrame* frame, const string16& title,
                    WebKit::WebTextDirection title_direction);
   void UpdateSessionHistory(WebKit::WebFrame* frame);
   void SendUpdateState(const WebKit::WebHistoryItem& item);
@@ skipping 555 matching lines @@
   // that we can enumerate them to send updates about things like window
   // location or tab focus and visibily. These are non-owning references.
   std::set<WebPluginDelegateProxy*> plugin_delegates_;
 
 #if defined(OS_WIN)
   // The ID of the focused NPAPI plug-in.
   int focused_plugin_id_;
 #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_;
 
   // NOTE: pepper_delegate_ should be last member because its constructor calls
   // AddObservers method of RenderViewImpl from c-tor.
   content::PepperPluginDelegateImpl pepper_delegate_;
 
   // ---------------------------------------------------------------------------
   // ADDING NEW DATA? Please see if it fits appropriately in one of the above
   // sections rather than throwing it randomly at the end. If you're adding a
   // bunch of stuff, you should probably create a helper class and put your
   // data and methods on that to avoid bloating RenderView more.  You can
   // use the Observer interface to filter IPC messages and receive frame change
   // notifications.
   // ---------------------------------------------------------------------------
 
   DISALLOW_COPY_AND_ASSIGN(RenderViewImpl);
 };
 
 #endif  // CONTENT_RENDERER_RENDER_VIEW_IMPL_H_