diff options
| author | deanm@chromium.org <deanm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-04 19:44:46 +0000 |
|---|---|---|
| committer | deanm@chromium.org <deanm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-04 19:44:46 +0000 |
| commit | dcc494e914525bba9d084e03db8508ae87dc3e76 (patch) | |
| tree | a4d5ba0cc28a687446c89443fd0618e5b1469c78 /webkit/tools/test_shell/test_shell_gtk.cc | |
| parent | 52ceebc9c2190f71ccddf26739b63fef5ca0b2fd (diff) | |
| download | chromium_src-dcc494e914525bba9d084e03db8508ae87dc3e76.zip chromium_src-dcc494e914525bba9d084e03db8508ae87dc3e76.tar.gz chromium_src-dcc494e914525bba9d084e03db8508ae87dc3e76.tar.bz2 | |
Fix two uninitialized memory accesses.
Review URL: http://codereview.chromium.org/12943
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6373 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell/test_shell_gtk.cc')
| -rw-r--r-- | webkit/tools/test_shell/test_shell_gtk.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/webkit/tools/test_shell/test_shell_gtk.cc b/webkit/tools/test_shell/test_shell_gtk.cc index 28dceaaa..fa09346 100644 --- a/webkit/tools/test_shell/test_shell_gtk.cc +++ b/webkit/tools/test_shell/test_shell_gtk.cc @@ -232,14 +232,16 @@ bool TestShell::Initialize(const std::wstring& startingURL) { // output. webView()->SetUseEditorDelegate(true); - if (!startingURL.empty()) - LoadURL(startingURL.c_str()); - gtk_container_add(GTK_CONTAINER(m_mainWnd), vbox); gtk_widget_show_all(m_mainWnd); toolbar_height_ = toolbar->allocation.height + gtk_box_get_spacing(GTK_BOX(vbox)); + // LoadURL will do a resize (which uses toolbar_height_), so make sure we + // don't call LoadURL until we've completed all of our GTK setup. + if (!startingURL.empty()) + LoadURL(startingURL.c_str()); + bool bIsSVGTest = startingURL.find(L"W3C-SVG-1.1") != std::wstring::npos; if (bIsSVGTest) SizeToSVG(); |