| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2007 Apple Computer, Inc. | 2 * Copyright (C) 2007 Apple Computer, Inc. |
| 3 * Copyright (c) 2007, 2008, 2009, Google Inc. All rights reserved. | 3 * Copyright (c) 2007, 2008, 2009, Google Inc. All rights reserved. |
| 4 * Copyright (C) 2010 Company 100, Inc. | 4 * Copyright (C) 2010 Company 100, Inc. |
| 5 * | 5 * |
| 6 * Redistribution and use in source and binary forms, with or without | 6 * Redistribution and use in source and binary forms, with or without |
| 7 * modification, are permitted provided that the following conditions are | 7 * modification, are permitted provided that the following conditions are |
| 8 * met: | 8 * met: |
| 9 * | 9 * |
| 10 * * Redistributions of source code must retain the above copyright | 10 * * Redistributions of source code must retain the above copyright |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 46 | 46 |
| 47 FontCustomPlatformData::FontCustomPlatformData(PassRefPtr<SkTypeface> typeface) | 47 FontCustomPlatformData::FontCustomPlatformData(PassRefPtr<SkTypeface> typeface) |
| 48 : m_typeface(typeface) | 48 : m_typeface(typeface) |
| 49 { | 49 { |
| 50 } | 50 } |
| 51 | 51 |
| 52 FontCustomPlatformData::~FontCustomPlatformData() | 52 FontCustomPlatformData::~FontCustomPlatformData() |
| 53 { | 53 { |
| 54 } | 54 } |
| 55 | 55 |
| 56 FontPlatformData FontCustomPlatformData::fontPlatformData(float size, bool bold,
bool italic, FontOrientation orientation, FontWidthVariant) | 56 FontPlatformData FontCustomPlatformData::fontPlatformData(float size, bool bold,
bool italic, FontOrientation orientation) |
| 57 { | 57 { |
| 58 ASSERT(m_typeface); | 58 ASSERT(m_typeface); |
| 59 #if OS(WIN) | 59 #if OS(WIN) |
| 60 if (!FontCache::useDirectWrite()) { | 60 if (!FontCache::useDirectWrite()) { |
| 61 // FIXME: Skia currently renders synthetic bold and italics with | 61 // FIXME: Skia currently renders synthetic bold and italics with |
| 62 // hinting and without linear metrics on the windows GDI backend | 62 // hinting and without linear metrics on the windows GDI backend |
| 63 // while the DirectWrite backend does the right thing. Using | 63 // while the DirectWrite backend does the right thing. Using |
| 64 // CreateFromName and specifying the bold/italics style allows | 64 // CreateFromName and specifying the bold/italics style allows |
| 65 // for proper rendering of synthetic style. Once Skia has been | 65 // for proper rendering of synthetic style. Once Skia has been |
| 66 // updated this workaround will no longer be needed. | 66 // updated this workaround will no longer be needed. |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 108 | 108 |
| 109 return adoptPtr(new FontCustomPlatformData(typeface.release())); | 109 return adoptPtr(new FontCustomPlatformData(typeface.release())); |
| 110 } | 110 } |
| 111 | 111 |
| 112 bool FontCustomPlatformData::supportsFormat(const String& format) | 112 bool FontCustomPlatformData::supportsFormat(const String& format) |
| 113 { | 113 { |
| 114 return equalIgnoringCase(format, "truetype") || equalIgnoringCase(format, "o
pentype") || OpenTypeSanitizer::supportsFormat(format); | 114 return equalIgnoringCase(format, "truetype") || equalIgnoringCase(format, "o
pentype") || OpenTypeSanitizer::supportsFormat(format); |
| 115 } | 115 } |
| 116 | 116 |
| 117 } // namespace blink | 117 } // namespace blink |
| OLD | NEW |