diff options
| author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-19 22:08:49 +0000 |
|---|---|---|
| committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-19 22:08:49 +0000 |
| commit | b86f90993939af7e5ea40c8dd2eae7c662aa2890 (patch) | |
| tree | bb3a4787f942ad73ee4490ccf6dcb09a38b8b373 /chrome/browser | |
| parent | a37cb181c853b1257af742068d8a85130fd8e6d0 (diff) | |
| download | chromium_src-b86f90993939af7e5ea40c8dd2eae7c662aa2890.zip chromium_src-b86f90993939af7e5ea40c8dd2eae7c662aa2890.tar.gz chromium_src-b86f90993939af7e5ea40c8dd2eae7c662aa2890.tar.bz2 | |
Attempt to fix weird crasher in gtk_floating_container_forall by checking more input and calling parent class forall.
http://crbug.com/14485
Review URL: http://codereview.chromium.org/141004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18860 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/gtk/gtk_floating_container.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/gtk/gtk_floating_container.cc b/chrome/browser/gtk/gtk_floating_container.cc index 51f5e14..b9d0e46 100644 --- a/chrome/browser/gtk/gtk_floating_container.cc +++ b/chrome/browser/gtk/gtk_floating_container.cc @@ -172,12 +172,12 @@ static void gtk_floating_container_forall(GtkContainer* container, gboolean include_internals, GtkCallback callback, gpointer callback_data) { - GtkBin *bin = GTK_BIN(container); - + g_return_if_fail(container != NULL); g_return_if_fail(callback != NULL); - if (bin->child) - (*callback)(bin->child, callback_data); + // Let GtkBin do its part of the forall. + ((GTK_CONTAINER_CLASS(gtk_floating_container_parent_class))->forall) + (container, include_internals, callback, callback_data); GtkFloatingContainer* floating = GTK_FLOATING_CONTAINER(container); GList* children = floating->floating_children; |