diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-09 05:55:50 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-09 05:55:50 +0000 |
| commit | 3b939698bf375ee5a1a9fffdecb08a9d7f5f1667 (patch) | |
| tree | b70c291ca0ca12c3e2d53a5f2efe29f5589e32bb | |
| parent | b11181144437d4c5c7d446282377392a944405d0 (diff) | |
| download | chromium_src-3b939698bf375ee5a1a9fffdecb08a9d7f5f1667.zip chromium_src-3b939698bf375ee5a1a9fffdecb08a9d7f5f1667.tar.gz chromium_src-3b939698bf375ee5a1a9fffdecb08a9d7f5f1667.tar.bz2 | |
Fix browser crash.
BUG=34147
TEST=Fewer crash reports in RenderWidgetHost::ForwardInputEvent
Review URL: http://codereview.chromium.org/598005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38446 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/renderer_host/render_widget_host.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/chrome/browser/renderer_host/render_widget_host.cc b/chrome/browser/renderer_host/render_widget_host.cc index 6a20f26..c8ac130 100644 --- a/chrome/browser/renderer_host/render_widget_host.cc +++ b/chrome/browser/renderer_host/render_widget_host.cc @@ -489,13 +489,15 @@ void RenderWidgetHost::ForwardInputEvent(const WebInputEvent& input_event, input_event_start_time_ = TimeTicks::Now(); Send(message); - // Any input event cancels a pending mouse move event. - next_mouse_move_.reset(); - // Any non-wheel input event cancels pending wheel events. if (input_event.type != WebInputEvent::MouseWheel) coalesced_mouse_wheel_events_.clear(); + // Any input event cancels a pending mouse move event. Note that + // |next_mouse_move_| possibly owns |input_event|, so don't use |input_event| + // after this line. + next_mouse_move_.reset(); + StartHangMonitorTimeout(TimeDelta::FromMilliseconds(kHungRendererDelayMs)); } |