| 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 b6bd563b3e1211450d526bc87da35a88c3996db4..03d9d57497cabfcdfc113341083eca8839a6b4d1 100644
|
| --- a/content/browser/renderer_host/render_widget_host_view_aura.cc
|
| +++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
|
| @@ -63,7 +63,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"
|
| @@ -421,7 +420,7 @@ RenderWidgetHostViewAura::RenderWidgetHostViewAura(RenderWidgetHost* host,
|
| bool is_guest_view_hack)
|
| : host_(RenderWidgetHostImpl::From(host)),
|
| window_(new aura::Window(this)),
|
| - delegated_frame_host_(new DelegatedFrameHost(this)),
|
| + delegated_frame_host_(new DelegatedFrameHost(this, false)),
|
| in_shutdown_(false),
|
| in_bounds_changed_(false),
|
| is_fullscreen_(false),
|
| @@ -474,6 +473,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;
|
| @@ -2606,8 +2607,12 @@ SkColorType RenderWidgetHostViewAura::PreferredReadbackFormat() {
|
| return kN32_SkColorType;
|
| }
|
|
|
| +void RenderWidgetHostViewAura::OnSetNeedsBeginFrames(bool needs_begin_frames) {
|
| + delegated_frame_host_->OnSetNeedsBeginFrames(needs_begin_frames);
|
| +}
|
| +
|
| ////////////////////////////////////////////////////////////////////////////////
|
| -// DelegatedFrameHost, public:
|
| +// DelegatedFrameHostClient, public:
|
|
|
| ui::Layer* RenderWidgetHostViewAura::DelegatedFrameHostGetLayer() const {
|
| return window_->layer();
|
| @@ -2675,6 +2680,11 @@ void RenderWidgetHostViewAura::DelegatedFrameHostUpdateVSyncParameters(
|
| host_->UpdateVSyncParameters(timebase, interval);
|
| }
|
|
|
| +void RenderWidgetHostViewAura::DelegatedFrameHostSendBeginFrame(
|
| + const cc::BeginFrameArgs& args) {
|
| + host_->Send(new ViewMsg_BeginFrame(host_->GetRoutingID(), args));
|
| +}
|
| +
|
| void RenderWidgetHostViewAura::OnDidNavigateMainFrameToNewPage() {
|
| ui::GestureRecognizer::Get()->CancelActiveTouches(window_);
|
| }
|
|
|