Handle destruction of test shell properly.

webkit/tools/test_shell/webwidget_host_gtk.cc

 // Copyright (c) 2006-2008 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 "webkit/tools/test_shell/webwidget_host.h"
 
 #include <cairo/cairo.h>
 #include <gtk/gtk.h>
 
 #include "base/logging.h"
@@ skipping 31 matching lines @@
                      WebWidgetHost* host) {
   // See comments above about what handling_expose is for.
   handling_expose = true;
   gfx::Rect rect(expose->area);
   host->UpdatePaintRect(rect);
   host->Paint();
   handling_expose = false;
   return FALSE;
 }
 
-gboolean DestroyEvent(GtkWidget* widget, GdkEvent* event,
-                      WebWidgetHost* host) {
+gboolean WindowDestroyed(GtkWidget* widget, WebWidgetHost* host) {
   host->WindowDestroyed();
   return FALSE;
 }
 
 gboolean KeyPressReleaseEvent(GtkWidget* widget, GdkEventKey* event,
                               WebWidgetHost* host) {
   WebKeyboardEvent wke(event);
   host->webwidget()->HandleInputEvent(&wke);
 
   // The WebKeyboardEvent model, when holding down a key, is:
@@ skipping 62 matching lines @@
 
   gtk_widget_add_events(widget, GDK_EXPOSURE_MASK |
                                 GDK_POINTER_MOTION_MASK |
                                 GDK_BUTTON_PRESS_MASK |
                                 GDK_BUTTON_RELEASE_MASK |
                                 GDK_KEY_PRESS_MASK |
                                 GDK_KEY_RELEASE_MASK);
   GTK_WIDGET_SET_FLAGS(widget, GTK_CAN_FOCUS);
   g_signal_connect(widget, "configure-event", G_CALLBACK(ConfigureEvent), host);
   g_signal_connect(widget, "expose-event", G_CALLBACK(ExposeEvent), host);
-  g_signal_connect(widget, "destroy-event", G_CALLBACK(DestroyEvent), host);
+  g_signal_connect(widget, "destroy", G_CALLBACK(::WindowDestroyed), host);
   g_signal_connect(widget, "key-press-event", G_CALLBACK(KeyPressReleaseEvent),
                    host);
   g_signal_connect(widget, "key-release-event",
                    G_CALLBACK(KeyPressReleaseEvent), host);
   g_signal_connect(widget, "focus", G_CALLBACK(FocusMove), host);
   g_signal_connect(widget, "focus-in-event", G_CALLBACK(FocusIn), host);
   g_signal_connect(widget, "focus-out-event", G_CALLBACK(FocusOut), host);
   g_signal_connect(widget, "button-press-event",
                    G_CALLBACK(ButtonPressReleaseEvent), host);
   g_signal_connect(widget, "button-release-event",
@@ skipping 131 matching lines @@
   // This method is only needed for optimized scroll painting, which we don't
   // care about in the test shell, yet.
 }
 
 void WebWidgetHost::PaintRect(const gfx::Rect& rect) {
   set_painting(true);
   webwidget_->Paint(canvas_.get(), rect);
   set_painting(false);
 }
 
-// -----------------------------------------------------------------------------
-// This is called when the GTK window is destroyed. In the Windows code this
-// deletes this object. Since it's only test_shell it probably doesn't matter
-// that much.
-// -----------------------------------------------------------------------------
 void WebWidgetHost::WindowDestroyed() {
   delete this;
 }