Browser crash when pressing Ctrl+D Ctrl+W

chrome/browser/ui/gtk/bubble/bubble_gtk.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/gtk/bubble/bubble_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 
 #include "base/logging.h"
 #include "chrome/browser/ui/gtk/bubble/bubble_accelerators_gtk.h"
@@ skipping 381 matching lines @@
   }
 }
 
 gboolean BubbleGtk::OnGtkAccelerator(GtkAccelGroup* group,
                                      GObject* acceleratable,
                                      guint keyval,
                                      GdkModifierType modifier) {
   GdkEventKey msg;
   GdkKeymapKey* keys;
   gint n_keys;
-
+  bool close_bubble = false;
   switch (keyval) {
     case GDK_Escape:
       // Close on Esc and trap the accelerator
       closed_by_escape_ = true;
       Close();
       return TRUE;
     case GDK_w:
       // Close on C-w and forward the accelerator
       if (modifier & GDK_CONTROL_MASK) {
-        Close();
+        close_bubble = true;
       }
       break;
     default:
       return FALSE;
   }
 
   gdk_keymap_get_entries_for_keyval(NULL,

[Evan Stade, 2011/09/23 20:09:42]

can you just move this entire block into the GDK_w case? Otherwise it's not
obvious that it's only here for that exact case and that any other keypress
would have returned by now.

                                     keyval,
                                     &keys,
                                     &n_keys);
   if (n_keys) {
     // Forward the accelerator to root window the bubble is anchored
     // to for further processing
     msg.type = GDK_KEY_PRESS;
     msg.window = GTK_WIDGET(toplevel_window_)->window;
     msg.send_event = TRUE;
     msg.time = GDK_CURRENT_TIME;
     msg.state = modifier | GDK_MOD2_MASK;
     msg.keyval = keyval;
     // length and string are deprecated and thus zeroed out
     msg.length = 0;
     msg.string = NULL;
     msg.hardware_keycode = keys[0].keycode;
     msg.group = keys[0].group;
     msg.is_modifier = 0;
 
     g_free(keys);
 
     gtk_main_do_event(reinterpret_cast<GdkEvent*>(&msg));
   } else {
     // This means that there isn't a h/w code for the keyval in the
     // current keymap, which is weird but possible if the keymap just
     // changed. This isn't a critical error, but might be indicative
     // of something off if it happens regularly.
     DLOG(WARNING) << "Found no keys for value " << keyval;
   }
+  if (close_bubble == true)

[Evan Stade, 2011/09/23 20:09:42]

no == true

+    Close();
   return TRUE;
 }
 
 gboolean BubbleGtk::OnExpose(GtkWidget* widget, GdkEventExpose* expose) {
   GdkDrawable* drawable = GDK_DRAWABLE(window_->window);
   GdkGC* gc = gdk_gc_new(drawable);
   gdk_gc_set_rgb_fg_color(gc, &kFrameColor);
 
   // Stroke the frame border.
   std::vector<GdkPoint> points = MakeFramePolygonPoints(
@@ skipping 66 matching lines @@
 gboolean BubbleGtk::OnToplevelUnmap(GtkWidget* widget, GdkEvent* event) {
   Close();
   return FALSE;
 }
 
 void BubbleGtk::OnAnchorAllocate(GtkWidget* widget,
                                  GtkAllocation* allocation) {
   if (!UpdateArrowLocation(false))
     MoveWindow();
 }