diff options
author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-14 20:20:11 +0000 |
---|---|---|
committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-14 20:20:11 +0000 |
commit | 295659c7f84cc46843da8b602b60b682059237a1 (patch) | |
tree | 92fa6e475de6a8012188bb222583a90a332900c9 /webkit/tools | |
parent | 6fe0bad0e5215b8837e0673e60afc4b7c73cac21 (diff) | |
download | chromium_src-295659c7f84cc46843da8b602b60b682059237a1.zip chromium_src-295659c7f84cc46843da8b602b60b682059237a1.tar.gz chromium_src-295659c7f84cc46843da8b602b60b682059237a1.tar.bz2 |
Store a pointer to the TestShell* in the GtkWindow.
This fixes a crash where we tried to read the unset pointer and GTK passed
back NULL.
Review URL: http://codereview.chromium.org/11012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5503 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools')
-rw-r--r-- | webkit/tools/test_shell/test_shell_gtk.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/webkit/tools/test_shell/test_shell_gtk.cc b/webkit/tools/test_shell/test_shell_gtk.cc index fbbc7ff..25fd8e6 100644 --- a/webkit/tools/test_shell/test_shell_gtk.cc +++ b/webkit/tools/test_shell/test_shell_gtk.cc @@ -98,6 +98,8 @@ bool TestShell::Initialize(const std::wstring& startingURL) { g_signal_connect(G_OBJECT(m_mainWnd), "destroy", G_CALLBACK(MainWindowDestroyed), this); + g_object_set_data(G_OBJECT(m_mainWnd), "test-shell", this); + GtkWidget* vbox = gtk_vbox_new(FALSE, 0); GtkWidget* toolbar = gtk_toolbar_new(); |