Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(302)

Side by Side Diff: content/browser/renderer_host/render_widget_host_view_aura.cc

Issue 868123002: Reset gesture detection upon page navigation for Aura (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/renderer_host/render_widget_host_view_aura.h" 5 #include "content/browser/renderer_host/render_widget_host_view_aura.h"
6 6
7 #include "base/auto_reset.h" 7 #include "base/auto_reset.h"
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/callback_helpers.h" 10 #include "base/callback_helpers.h"
(...skipping 2635 matching lines...) Expand 10 before | Expand all | Expand 10 after
2646 void RenderWidgetHostViewAura::DelegatedFrameHostOnLostCompositorResources() { 2646 void RenderWidgetHostViewAura::DelegatedFrameHostOnLostCompositorResources() {
2647 host_->ScheduleComposite(); 2647 host_->ScheduleComposite();
2648 } 2648 }
2649 2649
2650 void RenderWidgetHostViewAura::DelegatedFrameHostUpdateVSyncParameters( 2650 void RenderWidgetHostViewAura::DelegatedFrameHostUpdateVSyncParameters(
2651 const base::TimeTicks& timebase, 2651 const base::TimeTicks& timebase,
2652 const base::TimeDelta& interval) { 2652 const base::TimeDelta& interval) {
2653 host_->UpdateVSyncParameters(timebase, interval); 2653 host_->UpdateVSyncParameters(timebase, interval);
2654 } 2654 }
2655 2655
2656 void RenderWidgetHostViewAura::OnDidNavigateMainFrameToNewPage() {
2657 ui::GestureRecognizer::Get()->CancelActiveTouches(window_);
2658 }
2659
2656 //////////////////////////////////////////////////////////////////////////////// 2660 ////////////////////////////////////////////////////////////////////////////////
2657 // RenderWidgetHostViewBase, public: 2661 // RenderWidgetHostViewBase, public:
2658 2662
2659 // static 2663 // static
2660 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { 2664 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) {
2661 GetScreenInfoForWindow(results, NULL); 2665 GetScreenInfoForWindow(results, NULL);
2662 } 2666 }
2663 2667
2668
2669
nasko 2015/02/04 22:02:42 nit: no need for extra empty lines
lanwei 2015/02/05 20:08:27 Done.
2664 } // namespace content 2670 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698