summaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authormsw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-03 01:21:32 +0000
committermsw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-03 01:21:32 +0000
commit599d29b6f6e5e6eb897dd20d7512c08061cd70df (patch)
tree673e65f2d0fd7abd3644438fd4d57875b2c295d8 /ui
parentd5aba7e310d4d16e134c4cd770ffedd5fd21b42d (diff)
downloadchromium_src-599d29b6f6e5e6eb897dd20d7512c08061cd70df.zip
chromium_src-599d29b6f6e5e6eb897dd20d7512c08061cd70df.tar.gz
chromium_src-599d29b6f6e5e6eb897dd20d7512c08061cd70df.tar.bz2
Fix RenderTextTest.PangoAttributes test leaks; remove suppressions.
I ran both tools locally to verify the leaks and my fixes. BUG=173597 TEST=No Valgrind or Heapcheck leaks detected in RenderTextTest.PangoAttributes. R=asvitkine@chromium.org Review URL: https://codereview.chromium.org/12182002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180275 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
-rw-r--r--ui/gfx/render_text_unittest.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/ui/gfx/render_text_unittest.cc b/ui/gfx/render_text_unittest.cc
index 3935f7f..56aee9f 100644
--- a/ui/gfx/render_text_unittest.cc
+++ b/ui/gfx/render_text_unittest.cc
@@ -189,15 +189,18 @@ TEST_F(RenderTextTest, PangoAttributes) {
EXPECT_EQ(cases[i].end, end);
PangoFontDescription* font = pango_font_description_new();
pango_attr_iterator_get_font(iter, font, NULL, NULL);
- const string16 desc = ASCIIToUTF16(pango_font_description_to_string(font));
+ char* description_string = pango_font_description_to_string(font);
+ const string16 desc = ASCIIToUTF16(description_string);
const bool bold = desc.find(ASCIIToUTF16("Bold")) != std::string::npos;
EXPECT_EQ(cases[i].bold, bold);
const bool italic = desc.find(ASCIIToUTF16("Italic")) != std::string::npos;
EXPECT_EQ(cases[i].italic, italic);
pango_attr_iterator_next(iter);
pango_font_description_free(font);
+ g_free(description_string);
}
EXPECT_FALSE(pango_attr_iterator_next(iter));
+ pango_attr_iterator_destroy(iter);
}
#endif