| Index: content/browser/renderer_host/render_widget_host_view_aura.cc
|
| diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
|
| index 2b1704f20e6cf04234a310e52fd88995f7652ef5..9f511b68bf6df42b1f7a24a304d9c1c3ce885442 100644
|
| --- a/content/browser/renderer_host/render_widget_host_view_aura.cc
|
| +++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
|
| @@ -64,7 +64,6 @@
|
| #include "ui/base/hit_test.h"
|
| #include "ui/base/ime/input_method.h"
|
| #include "ui/base/ui_base_types.h"
|
| -#include "ui/compositor/compositor_vsync_manager.h"
|
| #include "ui/compositor/dip_util.h"
|
| #include "ui/events/event.h"
|
| #include "ui/events/event_utils.h"
|
| @@ -453,6 +452,7 @@ RenderWidgetHostViewAura::RenderWidgetHostViewAura(RenderWidgetHost* host,
|
| has_snapped_to_boundary_(false),
|
| touch_editing_client_(NULL),
|
| is_guest_view_hack_(is_guest_view_hack),
|
| + begin_frame_observer_proxy_(new BeginFrameObserverProxy(this)),
|
| weak_ptr_factory_(this) {
|
| if (!is_guest_view_hack_)
|
| host_->SetView(this);
|
| @@ -482,6 +482,8 @@ bool RenderWidgetHostViewAura::OnMessageReceived(
|
| // RenderWidgetHostViewAndroid should also be moved at the same time.
|
| IPC_MESSAGE_HANDLER(ViewHostMsg_TextInputStateChanged,
|
| OnTextInputStateChanged)
|
| + IPC_MESSAGE_HANDLER(ViewHostMsg_SetNeedsBeginFrames,
|
| + OnSetNeedsBeginFrames)
|
| IPC_MESSAGE_UNHANDLED(handled = false)
|
| IPC_END_MESSAGE_MAP()
|
| return handled;
|
| @@ -711,6 +713,15 @@ ui::TextInputClient* RenderWidgetHostViewAura::GetTextInputClient() {
|
| return this;
|
| }
|
|
|
| +void RenderWidgetHostViewAura::OnSetNeedsBeginFrames(bool needs_begin_frames) {
|
| + begin_frame_observer_proxy_->SetNeedsBeginFrames(needs_begin_frames);
|
| +}
|
| +
|
| +void RenderWidgetHostViewAura::SendBeginFrame(const cc::BeginFrameArgs& args) {
|
| + delegated_frame_host_->UpdateVSyncParameters(args.frame_time, args.interval);
|
| + host_->Send(new ViewMsg_BeginFrame(host_->GetRoutingID(), args));
|
| +}
|
| +
|
| void RenderWidgetHostViewAura::SetKeyboardFocus() {
|
| #if defined(OS_WIN)
|
| if (CanFocus()) {
|
| @@ -2578,6 +2589,7 @@ void RenderWidgetHostViewAura::AddedToRootWindow() {
|
| #endif
|
|
|
| delegated_frame_host_->SetCompositor(window_->GetHost()->compositor());
|
| + begin_frame_observer_proxy_->SetCompositor(window_->GetHost()->compositor());
|
| }
|
|
|
| void RenderWidgetHostViewAura::RemovingFromRootWindow() {
|
| @@ -2590,6 +2602,7 @@ void RenderWidgetHostViewAura::RemovingFromRootWindow() {
|
|
|
| window_->GetHost()->RemoveObserver(this);
|
| delegated_frame_host_->ResetCompositor();
|
| + begin_frame_observer_proxy_->ResetCompositor();
|
|
|
| #if defined(OS_WIN)
|
| // Update the legacy window's parent temporarily to the desktop window. It
|
| @@ -2701,12 +2714,6 @@ void RenderWidgetHostViewAura::DelegatedFrameHostOnLostCompositorResources() {
|
| host_->ScheduleComposite();
|
| }
|
|
|
| -void RenderWidgetHostViewAura::DelegatedFrameHostUpdateVSyncParameters(
|
| - const base::TimeTicks& timebase,
|
| - const base::TimeDelta& interval) {
|
| - host_->UpdateVSyncParameters(timebase, interval);
|
| -}
|
| -
|
| void RenderWidgetHostViewAura::OnDidNavigateMainFrameToNewPage() {
|
| ui::GestureRecognizer::Get()->CancelActiveTouches(window_);
|
| }
|
|
|