Index: content/renderer/render_view_impl.h |
diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h |
index 7df6c99bf639bc6c54d6f69c4a27c73df8bdde64..bc21052df77b65c719f2e2d7d2fb336fb49dc190 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" |
@@ -90,6 +91,7 @@ class WebUIBindings; |
namespace content { |
class DocumentState; |
+class GuestToEmbedderChannel; |
class NavigationState; |
class P2PSocketDispatcher; |
class RenderViewObserver; |
@@ -108,6 +110,7 @@ namespace webkit { |
namespace ppapi { |
class PluginInstance; |
+class WebPluginImpl; |
} // namespace ppapi |
} // namespace webkit |
@@ -197,7 +200,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. |
@@ -258,7 +261,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_; } |
+ 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); |
+ |
+ webkit::ppapi::WebPluginImpl* CreateBrowserPlugin( |
+ const IPC::ChannelHandle& channel_handle, |
+ int guest_process_id, |
+ const WebKit::WebPluginParams& params); |
void LoadNavigationErrorPage( |
WebKit::WebFrame* frame, |
@@ -753,7 +769,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. |
@@ -1324,11 +1340,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. |
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_; |
+ |
+ // The ppapi::HostResource associated with the on-screen context for this |
+ // guest RenderView. |
+ ppapi::HostResource resource_; |
+ |
+ WebGraphicsContext3DCommandBufferImpl* uninitialized_context_; |
+ |
+ WebKit::WebGraphicsContext3D::Attributes attributes_; |
// The accessibility mode. |
AccessibilityMode accessibility_mode_; |