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

Unified 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, 11 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 side-by-side diff with in-line comments
Download patch
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 d75bbcebcbf063366004be10f09c48a1f1b86c45..78b2e3ced4d5326f7b781b748f306e2749ca6d4e 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -2139,6 +2139,7 @@ void RenderWidgetHostViewAura::OnWindowActivated(aura::Window* gained_active,
const ui::Event* event = window_->GetHost()->dispatcher()->current_event();
if (event && PointerEventActivates(*event))
host_->OnPointerEventActivate();
+
tdresser 2015/01/24 14:29:00 Get rid of whitespace changes in this file.
lanwei 2015/01/30 14:21:49 Done.
}
}
@@ -2150,6 +2151,7 @@ void RenderWidgetHostViewAura::OnCursorVisibilityChanged(bool is_visible) {
}
////////////////////////////////////////////////////////////////////////////////
+
// RenderWidgetHostViewAura, aura::client::FocusChangeObserver implementation:
void RenderWidgetHostViewAura::OnWindowFocused(aura::Window* gained_focus,
@@ -2627,6 +2629,10 @@ DelegatedFrameHost* RenderWidgetHostViewAura::GetDelegatedFrameHost() const {
return delegated_frame_host_.get();
}
+void RenderWidgetHostViewAura::ResetGestureDetection() {
+ ui::GestureRecognizer::Get()->CancelActiveTouches(window_);
+}
+
////////////////////////////////////////////////////////////////////////////////
// RenderWidgetHostViewBase, public:
@@ -2635,4 +2641,6 @@ void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) {
GetScreenInfoForWindow(results, NULL);
}
+
+
} // namespace content

Powered by Google App Engine
This is Rietveld 408576698