From 590a634e603055831bc0aa75480cfa917c8420c1 Mon Sep 17 00:00:00 2001 From: "sadrul@chromium.org" Date: Thu, 19 Jul 2012 16:38:23 +0000 Subject: instant: Fix crash from gesture events on instant preview. The main changes include: * Rename WebContentsDelegate::HandleMouseActivate to HandlePointerEventActivate so that it can be used for both mouse and touch events. * Rename RenderWidgetHostImpl::OnMouseActivate to OnPointerEventActivate. * Add HandleGestureBegin/HandleGestureEnd to RenderViewHostDelegate and WebContentsDelegate. * Process both mouse-press and gesture-begin events in RenderWidgetHostViewAura::ShouldActivate. * Activate an aura window from a BEGIN gesture-event instead of a PRESS touch-event. BUG=136961 TEST=none Review URL: https://chromiumcodereview.appspot.com/10810003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147456 0039d316-1c4b-4281-b951-d872f2087c98 --- content/browser/renderer_host/render_widget_host_impl.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'content/browser/renderer_host/render_widget_host_impl.cc') diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc index e8b5dcb..c9aa3ce 100644 --- a/content/browser/renderer_host/render_widget_host_impl.cc +++ b/content/browser/renderer_host/render_widget_host_impl.cc @@ -782,7 +782,7 @@ void RenderWidgetHostImpl::ForwardMouseEvent(const WebMouseEvent& mouse_event) { ForwardInputEvent(mouse_event, sizeof(WebMouseEvent), false); } -void RenderWidgetHostImpl::OnMouseActivate() { +void RenderWidgetHostImpl::OnPointerEventActivate() { } void RenderWidgetHostImpl::ForwardWheelEvent( -- cgit v1.1