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

Side by Side Diff: ui/gfx/platform_font_pango_unittest.cc

Issue 20910002: Revert r214000 to reland r213996. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add explicit glib-object.h include Created 7 years, 4 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « tools/heapcheck/suppressions.txt ('k') | ui/ui_unittests.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/gfx/platform_font_pango.h" 5 #include "ui/gfx/platform_font_pango.h"
6 6
7 #include <cairo/cairo.h>
8 #include <fontconfig/fontconfig.h>
9 #include <glib-object.h>
10 #include <pango/pangocairo.h>
11 #include <pango/pangofc-fontmap.h>
12
7 #include <string> 13 #include <string>
8 14
9 #include "base/memory/ref_counted.h" 15 #include "base/memory/ref_counted.h"
10 #include "testing/gtest/include/gtest/gtest.h" 16 #include "testing/gtest/include/gtest/gtest.h"
11 #include "ui/gfx/pango_util.h" 17 #include "ui/gfx/pango_util.h"
12 18
13 namespace gfx { 19 namespace gfx {
14 20
15 // Test that PlatformFontPango is able to cope with PangoFontDescriptions 21 // Test that PlatformFontPango is able to cope with PangoFontDescriptions
16 // containing multiple font families. The first family should be preferred. 22 // containing multiple font families. The first family should be preferred.
17 TEST(PlatformFontPangoTest, FamilyList) { 23 TEST(PlatformFontPangoTest, FamilyList) {
24 // Needed for GLib versions prior to 2.36.
25 g_type_init();
26
18 ScopedPangoFontDescription desc( 27 ScopedPangoFontDescription desc(
19 pango_font_description_from_string("Arial,Times New Roman, 13px")); 28 pango_font_description_from_string("Arial,Times New Roman, 13px"));
20 scoped_refptr<gfx::PlatformFontPango> font( 29 scoped_refptr<gfx::PlatformFontPango> font(
21 new gfx::PlatformFontPango(desc.get())); 30 new gfx::PlatformFontPango(desc.get()));
22 EXPECT_EQ("Arial", font->GetFontName()); 31 EXPECT_EQ("Arial", font->GetFontName());
23 EXPECT_EQ(13, font->GetFontSize()); 32 EXPECT_EQ(13, font->GetFontSize());
24 33
25 ScopedPangoFontDescription desc2( 34 ScopedPangoFontDescription desc2(
26 pango_font_description_from_string("Times New Roman,Arial, 15px")); 35 pango_font_description_from_string("Times New Roman,Arial, 15px"));
27 scoped_refptr<gfx::PlatformFontPango> font2( 36 scoped_refptr<gfx::PlatformFontPango> font2(
28 new gfx::PlatformFontPango(desc2.get())); 37 new gfx::PlatformFontPango(desc2.get()));
29 EXPECT_EQ("Times New Roman", font2->GetFontName()); 38 EXPECT_EQ("Times New Roman", font2->GetFontName());
30 EXPECT_EQ(15, font2->GetFontSize()); 39 EXPECT_EQ(15, font2->GetFontSize());
40
41 // Free memory allocated by FontConfig (http://crbug.com/114750).
42 pango_fc_font_map_cache_clear(
43 PANGO_FC_FONT_MAP(pango_cairo_font_map_get_default()));
44 cairo_debug_reset_static_data();
45 FcFini();
31 } 46 }
32 47
33 } // namespace gfx 48 } // namespace gfx
OLDNEW
« no previous file with comments | « tools/heapcheck/suppressions.txt ('k') | ui/ui_unittests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698