| Index: content/renderer/render_widget.h
|
| diff --git a/content/renderer/render_widget.h b/content/renderer/render_widget.h
|
| index b6cf16e07308a9e3a0600e6544c7836029b22b59..63580c7358c09f901313c81a39be6fd740a16774 100644
|
| --- a/content/renderer/render_widget.h
|
| +++ b/content/renderer/render_widget.h
|
| @@ -74,6 +74,13 @@ class RenderWidget : public IPC::Channel::Listener,
|
| // Creates a WebWidget based on the popup type.
|
| static WebKit::WebWidget* CreateWebWidget(RenderWidget* render_widget);
|
|
|
| + // The compositing surface assigned by the RenderWidgetHost
|
| + // (or RenderViewHost). Will be gfx::kNullPluginWindow if not assigned yet,
|
| + // in which case we should not create any GPU command buffers with it.
|
| + gfx::PluginWindowHandle compositing_surface() const {
|
| + return compositing_surface_;
|
| + }
|
| +
|
| // The routing ID assigned by the RenderProcess. Will be MSG_ROUTING_NONE if
|
| // not yet assigned a view ID, in which case, the process MUST NOT send
|
| // messages with this ID to the parent.
|
| @@ -144,7 +151,8 @@ class RenderWidget : public IPC::Channel::Listener,
|
| IPC::SyncMessage* create_widget_message);
|
|
|
| // Finishes creation of a pending view started with Init.
|
| - void CompleteInit(gfx::NativeViewId parent);
|
| + void CompleteInit(gfx::NativeViewId parent,
|
| + gfx::PluginWindowHandle compositing_surface);
|
|
|
| // Paints the given rectangular region of the WebWidget into canvas (a
|
| // shared memory segment returned by AllocPaintBuf on Windows). The caller
|
| @@ -169,7 +177,8 @@ class RenderWidget : public IPC::Channel::Listener,
|
|
|
| // RenderWidget IPC message handlers
|
| void OnClose();
|
| - void OnCreatingNewAck(gfx::NativeViewId parent);
|
| + void OnCreatingNewAck(gfx::NativeViewId parent,
|
| + gfx::PluginWindowHandle compositing_surface);
|
| virtual void OnResize(const gfx::Size& new_size,
|
| const gfx::Rect& resizer_rect);
|
| virtual void OnWasHidden();
|
| @@ -367,6 +376,10 @@ class RenderWidget : public IPC::Channel::Listener,
|
| // compositor.
|
| bool is_accelerated_compositing_active_;
|
|
|
| + // Handle to a surface that is drawn to when accelerated compositing is
|
| + // active.
|
| + gfx::PluginWindowHandle compositing_surface_;
|
| +
|
| base::Time animation_floor_time_;
|
| bool animation_update_pending_;
|
| bool animation_task_posted_;
|
|
|