ui/gfx/platform_font_mac_unittest.mm - Issue 138013004: Clean-up: Renames gfx::Font's methods and removes its obsolete methods.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/gfx/platform_font_mac_unittest.mm

Issue 138013004: Clean-up: Renames gfx::Font's methods and removes its obsolete methods. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Removed unused methods in PlatformFont. Created 6 years, 10 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

Index: ui/gfx/platform_font_mac_unittest.mm

diff --git a/ui/gfx/platform_font_mac_unittest.mm b/ui/gfx/platform_font_mac_unittest.mm

index 088d4a9bd2d36c18eaa2efff0d994f27fa72a0da..2584cb50d312f20b4a45c416fe5b89e931b94efc 100644

--- a/ui/gfx/platform_font_mac_unittest.mm

+++ b/ui/gfx/platform_font_mac_unittest.mm

@@ -12,20 +12,20 @@ TEST(PlatformFontMacTest, DeriveFont) {

gfx::Font base_font("Helvetica", 13);

// Bold

- gfx::Font bold_font(base_font.DeriveFont(0, gfx::Font::BOLD));

+ gfx::Font bold_font(base_font.Derive(0, gfx::Font::BOLD));

NSFontTraitMask traits = [[NSFontManager sharedFontManager]

traitsOfFont:bold_font.GetNativeFont()];

EXPECT_EQ(NSBoldFontMask, traits);

// Italic

- gfx::Font italic_font(base_font.DeriveFont(0, gfx::Font::ITALIC));

+ gfx::Font italic_font(base_font.Derive(0, gfx::Font::ITALIC));

traits = [[NSFontManager sharedFontManager]

traitsOfFont:italic_font.GetNativeFont()];

EXPECT_EQ(NSItalicFontMask, traits);

// Bold italic

- gfx::Font bold_italic_font(base_font.DeriveFont(0, gfx::Font::BOLD |

- gfx::Font::ITALIC));

+ gfx::Font bold_italic_font(base_font.Derive(

+ 0, gfx::Font::BOLD | gfx::Font::ITALIC));

traits = [[NSFontManager sharedFontManager]

traitsOfFont:bold_italic_font.GetNativeFont()];

EXPECT_EQ(static_cast<NSFontTraitMask>(NSBoldFontMask | NSItalicFontMask),

« no previous file with comments | « ui/gfx/platform_font_mac.mm ('k') | ui/gfx/platform_font_pango.h » ('j') | no next file with comments »