summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorlaforge@chromium.org <laforge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-17 01:49:05 +0000
committerlaforge@chromium.org <laforge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-17 01:49:05 +0000
commit0536151bc9bae7306bdba28099cd79b940c90099 (patch)
treeab858a1a3c63651a8bff97485d0c1e71fa68060e /chrome
parenta824cf3dd780792350143fe4a42e52a73f5f80d7 (diff)
downloadchromium_src-0536151bc9bae7306bdba28099cd79b940c90099.zip
chromium_src-0536151bc9bae7306bdba28099cd79b940c90099.tar.gz
chromium_src-0536151bc9bae7306bdba28099cd79b940c90099.tar.bz2
Revert 32137 - Revert 32121 Fix crash.
BUG=27145,possibly others TEST=See bug. Review URL: http://codereview.chromium.org/399014 TBR=thakis@chromium.org Review URL: http://codereview.chromium.org/399021 TBR=erikkay@chromium.org Review URL: http://codereview.chromium.org/399024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32143 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/renderer_host/render_widget_host.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/renderer_host/render_widget_host.cc b/chrome/browser/renderer_host/render_widget_host.cc
index 8141258..7739e9f 100644
--- a/chrome/browser/renderer_host/render_widget_host.cc
+++ b/chrome/browser/renderer_host/render_widget_host.cc
@@ -439,9 +439,10 @@ void RenderWidgetHost::ForwardKeyboardEvent(
// Tab switching/closing accelerators aren't sent to the renderer to avoid a
// hung/malicious renderer from interfering.
if (!ShouldSendToRenderer(key_event)) {
- UnhandledKeyboardEvent(key_event);
if (key_event.type == WebKeyboardEvent::RawKeyDown)
suppress_next_char_events_ = true;
+ UnhandledKeyboardEvent(key_event);
+ // We might be deleted now.
return;
}