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

Unified Diff: content/browser/renderer_host/render_widget_host_view_aura.cc

Issue 13932029: SIGSEGV in content::RenderWidgetHostViewAura::ApplyEventFilterForPopupExit() (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: 230872 Created 7 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/render_widget_host_view_aura.cc
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
index 1785386da2064328515ecd06d15f5b46bffc6423..e5049457464bce1805cf51282499f963a259c158 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -399,18 +399,16 @@ class RenderWidgetHostViewAura::EventFilterForPopupExit :
void RenderWidgetHostViewAura::ApplyEventFilterForPopupExit(
ui::MouseEvent* event) {
- if (in_shutdown_) {
- event_filter_for_popup_exit_.reset();
+ if (in_shutdown_ || is_fullscreen_)
return;
- }
- if (is_fullscreen_ || event->type() != ui::ET_MOUSE_PRESSED ||
- !event->target())
+
+ DCHECK(event);
Ben Goodger (Google) 2013/04/18 17:04:51 I think you shouldn't need this. We make the assum
sschmitz 2013/04/18 17:21:43 Done.
+ if (event->type() != ui::ET_MOUSE_PRESSED || !event->target())
return;
DCHECK(popup_parent_host_view_);
aura::Window* target = static_cast<aura::Window*>(event->target());
if (target != window_ && target != popup_parent_host_view_->window_) {
- event_filter_for_popup_exit_.reset();
in_shutdown_ = true;
host_->Shutdown();
}
« 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