gfx/font_mac.mm - Issue 1132006: Move app/gfx/canvas and app/gfx/font to gfx/.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: gfx/font_mac.mm

Issue 1132006: Move app/gfx/canvas and app/gfx/font to gfx/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 10 years, 9 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

OLD	NEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2009 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 "app/gfx/font.h"	5 #include "gfx/font.h"

6	6

7 #include <Cocoa/Cocoa.h>	7 #include <Cocoa/Cocoa.h>

8	8

9 #include "base/logging.h"	9 #include "base/logging.h"

10 #include "base/scoped_nsobject.h"	10 #include "base/scoped_nsobject.h"

11 #include "base/sys_string_conversions.h"	11 #include "base/sys_string_conversions.h"

12	12

13 namespace gfx {	13 namespace gfx {

14	14

15 // static	15 // static

(...skipping 68 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
84	84

85 NativeFont Font::nativeFont() const {	85 NativeFont Font::nativeFont() const {

86 // TODO(pinkerton): apply \|style_\| to font. http://crbug.com/34667	86 // TODO(pinkerton): apply \|style_\| to font. http://crbug.com/34667

87 // We could cache this, but then we'd have to conditionally change the	87 // We could cache this, but then we'd have to conditionally change the

88 // dtor just for MacOS. Not sure if we want to/need to do that.	88 // dtor just for MacOS. Not sure if we want to/need to do that.

89 return [NSFont fontWithName:base::SysWideToNSString(font_name_)	89 return [NSFont fontWithName:base::SysWideToNSString(font_name_)

90 size:font_size_];	90 size:font_size_];

91 }	91 }

92	92

93 } // namespace gfx	93 } // namespace gfx

OLD	NEW

« no previous file with comments | « gfx/font_gtk.cc ('k') | gfx/font_skia.cc » ('j') | no next file with comments »