Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(108)

Unified Diff: trunk/src/ui/gfx/platform_font_pango_unittest.cc

Issue 20865002: Revert 213996 "linux: Avoid leak in PlatformFontPangoTest.Family..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « trunk/src/tools/heapcheck/suppressions.txt ('k') | trunk/src/ui/ui_unittests.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/ui/gfx/platform_font_pango_unittest.cc
===================================================================
--- trunk/src/ui/gfx/platform_font_pango_unittest.cc (revision 213999)
+++ trunk/src/ui/gfx/platform_font_pango_unittest.cc (working copy)
@@ -4,11 +4,6 @@
#include "ui/gfx/platform_font_pango.h"
-#include <cairo/cairo.h>
-#include <fontconfig/fontconfig.h>
-#include <pango/pangocairo.h>
-#include <pango/pangofc-fontmap.h>
-
#include <string>
#include "base/memory/ref_counted.h"
@@ -33,12 +28,6 @@
new gfx::PlatformFontPango(desc2.get()));
EXPECT_EQ("Times New Roman", font2->GetFontName());
EXPECT_EQ(15, font2->GetFontSize());
-
- // Free memory allocated by FontConfig (http://crbug.com/114750).
- pango_fc_font_map_cache_clear(
- PANGO_FC_FONT_MAP(pango_cairo_font_map_get_default()));
- cairo_debug_reset_static_data();
- FcFini();
}
} // namespace gfx
« no previous file with comments | « trunk/src/tools/heapcheck/suppressions.txt ('k') | trunk/src/ui/ui_unittests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698