| Index: content/browser/renderer_host/render_widget_host_view_aura.h
|
| diff --git a/content/browser/renderer_host/render_widget_host_view_aura.h b/content/browser/renderer_host/render_widget_host_view_aura.h
|
| index af4a62bc27f0802ac68cfe87e78fb7519f221230..73a312ab6a8c49539f1fba41bd0f2bcee7088e9a 100644
|
| --- a/content/browser/renderer_host/render_widget_host_view_aura.h
|
| +++ b/content/browser/renderer_host/render_widget_host_view_aura.h
|
| @@ -28,6 +28,7 @@
|
| #include "ui/aura/client/focus_change_observer.h"
|
| #include "ui/aura/window_delegate.h"
|
| #include "ui/aura/window_tree_host_observer.h"
|
| +#include "ui/base/compositor/compositor_begin_frame_observer.h"
|
| #include "ui/base/ime/text_input_client.h"
|
| #include "ui/gfx/display_observer.h"
|
| #include "ui/gfx/insets.h"
|
| @@ -88,6 +89,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura
|
| public aura::client::ActivationChangeObserver,
|
| public aura::client::FocusChangeObserver,
|
| public aura::client::CursorClientObserver,
|
| + public ui::CompositorBeginFrameObserver,
|
| public base::SupportsWeakPtr<RenderWidgetHostViewAura> {
|
| public:
|
| // Displays and controls touch editing elements such as selection handles.
|
| @@ -155,6 +157,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura
|
| virtual void SetInsets(const gfx::Insets& insets) OVERRIDE;
|
|
|
| // Overridden from RenderWidgetHostViewBase:
|
| + virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
|
| virtual void InitAsPopup(RenderWidgetHostView* parent_host_view,
|
| const gfx::Rect& pos) OVERRIDE;
|
| virtual void InitAsFullscreen(
|
| @@ -324,6 +327,9 @@ class CONTENT_EXPORT RenderWidgetHostViewAura
|
| virtual void OnHostMoved(const aura::WindowTreeHost* host,
|
| const gfx::Point& new_origin) OVERRIDE;
|
|
|
| + // Overridden from ui::CompositorBeginFrameObserver:
|
| + virtual void OnSendBeginFrame(const cc::BeginFrameArgs& args) OVERRIDE;
|
| +
|
| #if defined(OS_WIN)
|
| // Sets the cutout rects from constrained windows. These are rectangles that
|
| // windowed NPAPI plugins shouldn't paint in. Overwrites any previous cutout
|
| @@ -471,6 +477,9 @@ class CONTENT_EXPORT RenderWidgetHostViewAura
|
| // Helper function to set keyboard focus to the main window.
|
| void SetKeyboardFocus();
|
|
|
| + // Called when RenderWidget want to start BeginFrame scheduling or stop.
|
| + void OnSetNeedsBeginFrame(bool enabled);
|
| +
|
| RenderFrameHostImpl* GetFocusedFrame();
|
|
|
| // The model object.
|
| @@ -615,6 +624,17 @@ class CONTENT_EXPORT RenderWidgetHostViewAura
|
|
|
| scoped_ptr<aura::client::ScopedTooltipDisabler> tooltip_disabler_;
|
|
|
| + // True when RenderWidget needs a BeginFrame.
|
| + bool needs_begin_frame_;
|
| +
|
| + // True when unified BeginFrame scheduling is used.
|
| + bool begin_frame_scheduling_is_enabled_;
|
| +
|
| + // Pass |last_begin_frame_args_| to BeginFrameManager when |this| is added
|
| + // as its observer. With this, BeginFrameManager can determine whether latest
|
| + // BeginFrameArgs is used immediately or not.
|
| + cc::BeginFrameArgs last_begin_frame_args_;
|
| +
|
| base::WeakPtrFactory<RenderWidgetHostViewAura> weak_ptr_factory_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAura);
|
|
|