diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-19 16:38:23 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-19 16:38:23 +0000 |
| commit | 590a634e603055831bc0aa75480cfa917c8420c1 (patch) | |
| tree | 49e7e7f7edea31fd95d22511aa28a08e51b02931 /content/browser/renderer_host/render_widget_host_view_win.cc | |
| parent | 7175fb1aa0ce9af46b557a8e59930f244df4cdb2 (diff) | |
| download | chromium_src-590a634e603055831bc0aa75480cfa917c8420c1.zip chromium_src-590a634e603055831bc0aa75480cfa917c8420c1.tar.gz chromium_src-590a634e603055831bc0aa75480cfa917c8420c1.tar.bz2 | |
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
Diffstat (limited to 'content/browser/renderer_host/render_widget_host_view_win.cc')
| -rw-r--r-- | content/browser/renderer_host/render_widget_host_view_win.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/content/browser/renderer_host/render_widget_host_view_win.cc b/content/browser/renderer_host/render_widget_host_view_win.cc index 0bd3f89..f04f1a8 100644 --- a/content/browser/renderer_host/render_widget_host_view_win.cc +++ b/content/browser/renderer_host/render_widget_host_view_win.cc @@ -2362,7 +2362,7 @@ LRESULT RenderWidgetHostViewWin::OnMouseActivate(UINT message, } } handled = FALSE; - render_widget_host_->OnMouseActivate(); + render_widget_host_->OnPointerEventActivate(); return MA_ACTIVATE; } |