Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(581)

Side by Side Diff: content/browser/renderer_host/render_widget_host_impl.cc

Issue 10790058: Workaround a crash occuring only in v20 and v21 without a repro case (need more data for good fix) (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Addressed comment Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/renderer_host/render_widget_host_impl.h" 5 #include "content/browser/renderer_host/render_widget_host_impl.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/auto_reset.h" 9 #include "base/auto_reset.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 862 matching lines...) Expand 10 before | Expand all | Expand 10 after
873 // RawKeyDown event may generate multiple Char events, so we can't reset 873 // RawKeyDown event may generate multiple Char events, so we can't reset
874 // |suppress_next_char_events_| until we get a KeyUp or a RawKeyDown. 874 // |suppress_next_char_events_| until we get a KeyUp or a RawKeyDown.
875 if (key_event.type == WebKeyboardEvent::Char) 875 if (key_event.type == WebKeyboardEvent::Char)
876 return; 876 return;
877 // We get a KeyUp or a RawKeyDown event. 877 // We get a KeyUp or a RawKeyDown event.
878 suppress_next_char_events_ = false; 878 suppress_next_char_events_ = false;
879 } 879 }
880 880
881 bool is_keyboard_shortcut = false; 881 bool is_keyboard_shortcut = false;
882 // Only pre-handle the key event if it's not handled by the input method. 882 // Only pre-handle the key event if it's not handled by the input method.
883 if (!key_event.skip_in_browser) { 883 // A delegate_ of NULL seems impossible but crash reports show that it
884 // can happen (see http://crbug.com/134465). This doesn't seem to happen
885 // with Chrome 22 and later, so checking the delegate_ here can be removed
886 // once Chrome 22 goes to stable..
887 if (delegate_ && !key_event.skip_in_browser) {
884 // We need to set |suppress_next_char_events_| to true if 888 // We need to set |suppress_next_char_events_| to true if
885 // PreHandleKeyboardEvent() returns true, but |this| may already be 889 // PreHandleKeyboardEvent() returns true, but |this| may already be
886 // destroyed at that time. So set |suppress_next_char_events_| true here, 890 // destroyed at that time. So set |suppress_next_char_events_| true here,
887 // then revert it afterwards when necessary. 891 // then revert it afterwards when necessary.
888 if (key_event.type == WebKeyboardEvent::RawKeyDown) 892 if (key_event.type == WebKeyboardEvent::RawKeyDown)
889 suppress_next_char_events_ = true; 893 suppress_next_char_events_ = true;
890 894
891 // Tab switching/closing accelerators aren't sent to the renderer to avoid 895 // Tab switching/closing accelerators aren't sent to the renderer to avoid
892 // a hung/malicious renderer from interfering. 896 // a hung/malicious renderer from interfering.
893 if (delegate_->PreHandleKeyboardEvent(key_event, &is_keyboard_shortcut)) 897 if (delegate_->PreHandleKeyboardEvent(key_event, &is_keyboard_shortcut))
(...skipping 1014 matching lines...) Expand 10 before | Expand all | Expand 10 after
1908 // indicate that no callback is in progress (i.e. without this line 1912 // indicate that no callback is in progress (i.e. without this line
1909 // DelayedAutoResized will not get called again). 1913 // DelayedAutoResized will not get called again).
1910 new_auto_size_.SetSize(0, 0); 1914 new_auto_size_.SetSize(0, 0);
1911 if (!should_auto_resize_) 1915 if (!should_auto_resize_)
1912 return; 1916 return;
1913 1917
1914 OnRenderAutoResized(new_size); 1918 OnRenderAutoResized(new_size);
1915 } 1919 }
1916 1920
1917 } // namespace content 1921 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698