summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-24 00:06:54 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-24 00:06:54 +0000
commitbc54e8ec2689049fe40ab6d59435935235bdc23c (patch)
treed5105a6e0c959dcc03fdb10db0389781d711ecb7 /webkit
parent863cab911d2d71e4d55cc961110d0f297bb0aa78 (diff)
downloadchromium_src-bc54e8ec2689049fe40ab6d59435935235bdc23c.zip
chromium_src-bc54e8ec2689049fe40ab6d59435935235bdc23c.tar.gz
chromium_src-bc54e8ec2689049fe40ab6d59435935235bdc23c.tar.bz2
GTK test shell valgrind, try 3. Null out the main window before initiating shutdown.
Review URL: http://codereview.chromium.org/159307 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21486 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/tools/test_shell/test_shell_gtk.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/webkit/tools/test_shell/test_shell_gtk.cc b/webkit/tools/test_shell/test_shell_gtk.cc
index fc6d8cc..d6b8478 100644
--- a/webkit/tools/test_shell/test_shell_gtk.cc
+++ b/webkit/tools/test_shell/test_shell_gtk.cc
@@ -317,11 +317,11 @@ void TestShell::PlatformCleanUp() {
bool TestShell::Initialize(const std::wstring& startingURL) {
m_mainWnd = GTK_WINDOW(gtk_window_new(GTK_WINDOW_TOPLEVEL));
gtk_window_set_title(m_mainWnd, "Test Shell");
- g_signal_connect(G_OBJECT(m_mainWnd), "destroy",
- G_CALLBACK(MainWindowDestroyed), this);
// Null out m_mainWnd when it is destroyed so we don't destroy it twice.
g_signal_connect(G_OBJECT(m_mainWnd), "destroy",
G_CALLBACK(gtk_widget_destroyed), &m_mainWnd);
+ g_signal_connect(G_OBJECT(m_mainWnd), "destroy",
+ G_CALLBACK(MainWindowDestroyed), this);
g_signal_connect(G_OBJECT(m_mainWnd), "focus-out-event",
G_CALLBACK(MainWindowLostFocus), this);
g_object_set_data(G_OBJECT(m_mainWnd), "test-shell", this);