| OLD | NEW |
| 1 /* | 1 /* |
| 2 * This file is part of the internal font implementation. | 2 * This file is part of the internal font implementation. |
| 3 * | 3 * |
| 4 * Copyright (C) 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved. | 4 * Copyright (C) 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved. |
| 5 * Copyright (c) 2010 Google Inc. All rights reserved. | 5 * Copyright (c) 2010 Google Inc. All rights reserved. |
| 6 * | 6 * |
| 7 * This library is free software; you can redistribute it and/or | 7 * This library is free software; you can redistribute it and/or |
| 8 * modify it under the terms of the GNU Library General Public | 8 * modify it under the terms of the GNU Library General Public |
| 9 * License as published by the Free Software Foundation; either | 9 * License as published by the Free Software Foundation; either |
| 10 * version 2 of the License, or (at your option) any later version. | 10 * version 2 of the License, or (at your option) any later version. |
| (...skipping 15 matching lines...) Expand all Loading... |
| 26 | 26 |
| 27 #import <AppKit/NSFont.h> | 27 #import <AppKit/NSFont.h> |
| 28 #import <AvailabilityMacros.h> | 28 #import <AvailabilityMacros.h> |
| 29 #import <wtf/text/WTFString.h> | 29 #import <wtf/text/WTFString.h> |
| 30 | 30 |
| 31 #if OS(MACOSX) | 31 #if OS(MACOSX) |
| 32 #import "platform/fonts/harfbuzz/HarfBuzzFace.h" | 32 #import "platform/fonts/harfbuzz/HarfBuzzFace.h" |
| 33 #include "third_party/skia/include/ports/SkTypeface_mac.h" | 33 #include "third_party/skia/include/ports/SkTypeface_mac.h" |
| 34 #endif | 34 #endif |
| 35 | 35 |
| 36 namespace WebCore { | 36 namespace blink { |
| 37 | 37 |
| 38 // These CoreText Text Spacing feature selectors are not defined in CoreText. | 38 // These CoreText Text Spacing feature selectors are not defined in CoreText. |
| 39 enum TextSpacingCTFeatureSelector { TextSpacingProportional, TextSpacingFullWidt
h, TextSpacingHalfWidth, TextSpacingThirdWidth, TextSpacingQuarterWidth }; | 39 enum TextSpacingCTFeatureSelector { TextSpacingProportional, TextSpacingFullWidt
h, TextSpacingHalfWidth, TextSpacingThirdWidth, TextSpacingQuarterWidth }; |
| 40 | 40 |
| 41 FontPlatformData::FontPlatformData(NSFont *nsFont, float size, bool syntheticBol
d, bool syntheticOblique, FontOrientation orientation, FontWidthVariant widthVar
iant) | 41 FontPlatformData::FontPlatformData(NSFont *nsFont, float size, bool syntheticBol
d, bool syntheticOblique, FontOrientation orientation, FontWidthVariant widthVar
iant) |
| 42 : m_syntheticBold(syntheticBold) | 42 : m_syntheticBold(syntheticBold) |
| 43 , m_syntheticOblique(syntheticOblique) | 43 , m_syntheticOblique(syntheticOblique) |
| 44 , m_orientation(orientation) | 44 , m_orientation(orientation) |
| 45 , m_size(size) | 45 , m_size(size) |
| 46 , m_widthVariant(widthVariant) | 46 , m_widthVariant(widthVariant) |
| (...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 321 | 321 |
| 322 #ifndef NDEBUG | 322 #ifndef NDEBUG |
| 323 String FontPlatformData::description() const | 323 String FontPlatformData::description() const |
| 324 { | 324 { |
| 325 RetainPtr<CFStringRef> cgFontDescription(AdoptCF, CFCopyDescription(cgFont()
)); | 325 RetainPtr<CFStringRef> cgFontDescription(AdoptCF, CFCopyDescription(cgFont()
)); |
| 326 return String(cgFontDescription.get()) + " " + String::number(m_size) | 326 return String(cgFontDescription.get()) + " " + String::number(m_size) |
| 327 + (m_syntheticBold ? " synthetic bold" : "") + (m_syntheticOblique ?
" synthetic oblique" : "") + (m_orientation ? " vertical orientation" : ""); | 327 + (m_syntheticBold ? " synthetic bold" : "") + (m_syntheticOblique ?
" synthetic oblique" : "") + (m_orientation ? " vertical orientation" : ""); |
| 328 } | 328 } |
| 329 #endif | 329 #endif |
| 330 | 330 |
| 331 } // namespace WebCore | 331 } // namespace blink |
| OLD | NEW |