Index: content/browser/web_contents/web_contents_impl.cc |
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc |
index a6a7c488357c29203be043f2c9003eb563eb9353..6c6cc26e7787210213bd340bad84b160be185490 100644 |
--- a/content/browser/web_contents/web_contents_impl.cc |
+++ b/content/browser/web_contents/web_contents_impl.cc |
@@ -49,6 +49,7 @@ |
#include "content/browser/renderer_host/render_view_host_delegate_view.h" |
#include "content/browser/renderer_host/render_view_host_impl.h" |
#include "content/browser/renderer_host/render_widget_host_impl.h" |
+#include "content/browser/renderer_host/render_widget_host_view_aura.h" |
#include "content/browser/renderer_host/render_widget_host_view_base.h" |
#include "content/browser/screen_orientation/screen_orientation_dispatcher_host_impl.h" |
#include "content/browser/site_instance_impl.h" |
@@ -2604,6 +2605,12 @@ void WebContentsImpl::DidNavigateMainFramePostCommit( |
// clear the bubble when a user navigates to a named anchor in the same |
// page. |
UpdateTargetURL(render_frame_host->GetRenderViewHost(), GURL()); |
+ |
+ // Cancel all the active touch events on the aura window to prevent they |
tdresser
2015/01/24 14:29:01
This comment breaks some layering assumptions. You
lanwei
2015/01/30 14:21:49
Done.
|
+ // are passed to the navigated page. |
+ RenderWidgetHostView* rwhv = GetRenderWidgetHostView(); |
+ if (rwhv) |
+ rwhv->ResetGestureDetection(); |
tdresser
2015/01/24 14:29:01
Won't this call Android's ResetGestureDetection()
lanwei
2015/01/30 14:21:49
Done.
|
} |
if (!details.is_in_page) { |