summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-29 19:32:32 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-29 19:32:32 +0000
commit76d07dcc16bb93af4b6abe8529dd95829e03d1a7 (patch)
tree0e25bc983a6854bdd7df4115a8d201cf2b0adc8f /chrome/browser
parent92f3074de375053a0b345010d2eeacdaa803dd7b (diff)
downloadchromium_src-76d07dcc16bb93af4b6abe8529dd95829e03d1a7.zip
chromium_src-76d07dcc16bb93af4b6abe8529dd95829e03d1a7.tar.gz
chromium_src-76d07dcc16bb93af4b6abe8529dd95829e03d1a7.tar.bz2
Don't shutdown non-popup render views on clicks outside their bounds.
Review URL: http://codereview.chromium.org/151031 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19514 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/renderer_host/render_widget_host_view_gtk.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/chrome/browser/renderer_host/render_widget_host_view_gtk.cc b/chrome/browser/renderer_host/render_widget_host_view_gtk.cc
index 8a3da94..12185cf 100644
--- a/chrome/browser/renderer_host/render_widget_host_view_gtk.cc
+++ b/chrome/browser/renderer_host/render_widget_host_view_gtk.cc
@@ -213,7 +213,11 @@ class RenderWidgetHostViewGtkWidget {
// releasing the x pointer grab.
bool click_in_popup = x >= 0 && y >= 0 && x < widget->allocation.width &&
y < widget->allocation.height;
- if (!host_view->is_popup_first_mouse_release_ && !click_in_popup) {
+ // We can get mouse ups from outside the render view during drags even if
+ // we are not a popup, so only Shutdown if we are a popup (and
+ // host_view->parent_ is not null).
+ if (!host_view->parent_ && host_view->is_popup_first_mouse_release_ &&
+ !click_in_popup) {
host_view->host_->Shutdown();
return FALSE;
}