diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-18 18:25:07 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-18 18:25:07 +0000 |
| commit | 606dbfc728ff53eb4d96cf17a5fa0c39d5e60356 (patch) | |
| tree | 6281eff1f4123388d50ab116f0cff93188c90aa3 /webkit | |
| parent | 4e659762a0ca089710c5d509fd714a67b0ee24d8 (diff) | |
| download | chromium_src-606dbfc728ff53eb4d96cf17a5fa0c39d5e60356.zip chromium_src-606dbfc728ff53eb4d96cf17a5fa0c39d5e60356.tar.gz chromium_src-606dbfc728ff53eb4d96cf17a5fa0c39d5e60356.tar.bz2 | |
Put the fontconfig FcFini call in the PlatformShutdown() method instead of
PlatformCleanUp(). The latter is called multiple times, which results in
fontconfig being shutdown too early. Fixes buildbot failure introduced in
revision 34945.
BUG=9245
TEST=Run test_shell using valgrind. Memory leaks related to fontconfig should drop from around 138079 bytes to around 24573 bytes. Also use valgrind to check for invalid reads.
Patch from Jochen Eisinger <eisinger@google.com>.
Review URL: http://codereview.chromium.org/502072
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34961 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/tools/test_shell/test_shell_gtk.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/webkit/tools/test_shell/test_shell_gtk.cc b/webkit/tools/test_shell/test_shell_gtk.cc index e4a2c34..431b912 100644 --- a/webkit/tools/test_shell/test_shell_gtk.cc +++ b/webkit/tools/test_shell/test_shell_gtk.cc @@ -304,6 +304,7 @@ void TestShell::PlatformShutdown() { delete g_ahem_path; g_ahem_path = NULL; } + FcFini(); } void TestShell::PlatformCleanUp() { @@ -314,7 +315,6 @@ void TestShell::PlatformCleanUp() { reinterpret_cast<gpointer>(MainWindowDestroyed), this); gtk_widget_destroy(GTK_WIDGET(m_mainWnd)); } - FcFini(); } bool TestShell::Initialize(const GURL& starting_url) { |