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

Side by Side Diff: Source/core/platform/mac/WebFontCache.mm

Issue 48113009: Move Font related classes to Source/platform/fonts (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fix mac export Created 7 years, 1 month 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
3 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com> 3 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 8 *
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 15 matching lines...) Expand all
26 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 26 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
27 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 27 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28 */ 28 */
29 29
30 #import "config.h" 30 #import "config.h"
31 #import "core/platform/mac/WebFontCache.h" 31 #import "core/platform/mac/WebFontCache.h"
32 32
33 #import <AppKit/AppKit.h> 33 #import <AppKit/AppKit.h>
34 #import <Foundation/Foundation.h> 34 #import <Foundation/Foundation.h>
35 #import <math.h> 35 #import <math.h>
36 #import "core/platform/graphics/FontTraitsMask.h" 36 #import "platform/fonts/FontTraitsMask.h"
37 #import <wtf/UnusedParam.h> 37 #import <wtf/UnusedParam.h>
38 38
39 using namespace WebCore; 39 using namespace WebCore;
40 40
41 41
42 #define SYNTHESIZED_FONT_TRAITS (NSBoldFontMask | NSItalicFontMask) 42 #define SYNTHESIZED_FONT_TRAITS (NSBoldFontMask | NSItalicFontMask)
43 43
44 #define IMPORTANT_FONT_TRAITS (0 \ 44 #define IMPORTANT_FONT_TRAITS (0 \
45 | NSCompressedFontMask \ 45 | NSCompressedFontMask \
46 | NSCondensedFontMask \ 46 | NSCondensedFontMask \
(...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after
285 return [self internalFontWithFamily:desiredFamily traits:desiredTraits weigh t:desiredWeight size:size]; 285 return [self internalFontWithFamily:desiredFamily traits:desiredTraits weigh t:desiredWeight size:size];
286 } 286 }
287 287
288 + (NSFont *)fontWithFamily:(NSString *)desiredFamily traits:(NSFontTraitMask)des iredTraits size:(float)size 288 + (NSFont *)fontWithFamily:(NSString *)desiredFamily traits:(NSFontTraitMask)des iredTraits size:(float)size
289 { 289 {
290 int desiredWeight = (desiredTraits & NSBoldFontMask) ? 9 : 5; 290 int desiredWeight = (desiredTraits & NSBoldFontMask) ? 9 : 5;
291 return [self fontWithFamily:desiredFamily traits:desiredTraits weight:desire dWeight size:size]; 291 return [self fontWithFamily:desiredFamily traits:desiredTraits weight:desire dWeight size:size];
292 } 292 }
293 293
294 @end 294 @end
OLDNEW
« no previous file with comments | « Source/core/platform/graphics/skia/SimpleFontDataSkia.cpp ('k') | Source/core/rendering/InlineBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698