| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2007, 2008, 2010 Apple Inc. All rights reserved. | 2 * Copyright (C) 2007, 2008, 2010 Apple Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * This library is free software; you can redistribute it and/or | 4 * This library is free software; you can redistribute it and/or |
| 5 * modify it under the terms of the GNU Library General Public | 5 * modify it under the terms of the GNU Library General Public |
| 6 * License as published by the Free Software Foundation; either | 6 * License as published by the Free Software Foundation; either |
| 7 * version 2 of the License, or (at your option) any later version. | 7 * version 2 of the License, or (at your option) any later version. |
| 8 * | 8 * |
| 9 * This library is distributed in the hope that it will be useful, | 9 * This library is distributed in the hope that it will be useful, |
| 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| (...skipping 26 matching lines...) Expand all Loading... |
| 37 , m_typeface(typeface) | 37 , m_typeface(typeface) |
| 38 { | 38 { |
| 39 } | 39 } |
| 40 | 40 |
| 41 FontCustomPlatformData::~FontCustomPlatformData() | 41 FontCustomPlatformData::~FontCustomPlatformData() |
| 42 { | 42 { |
| 43 } | 43 } |
| 44 | 44 |
| 45 FontPlatformData FontCustomPlatformData::fontPlatformData(float size, bool bold,
bool italic, FontOrientation orientation, FontWidthVariant widthVariant) | 45 FontPlatformData FontCustomPlatformData::fontPlatformData(float size, bool bold,
bool italic, FontOrientation orientation, FontWidthVariant widthVariant) |
| 46 { | 46 { |
| 47 return FontPlatformData(m_cgFont.get(), size, bold, italic, orientation, wid
thVariant); | 47 return FontPlatformData(m_cgFont.get(), true, size, bold, italic, orientatio
n, widthVariant); |
| 48 } | 48 } |
| 49 | 49 |
| 50 PassOwnPtr<FontCustomPlatformData> FontCustomPlatformData::create(SharedBuffer*
buffer) | 50 PassOwnPtr<FontCustomPlatformData> FontCustomPlatformData::create(SharedBuffer*
buffer) |
| 51 { | 51 { |
| 52 ASSERT_ARG(buffer, buffer); | 52 ASSERT_ARG(buffer, buffer); |
| 53 | 53 |
| 54 OpenTypeSanitizer sanitizer(buffer); | 54 OpenTypeSanitizer sanitizer(buffer); |
| 55 RefPtr<SharedBuffer> transcodeBuffer = sanitizer.sanitize(); | 55 RefPtr<SharedBuffer> transcodeBuffer = sanitizer.sanitize(); |
| 56 if (!transcodeBuffer) | 56 if (!transcodeBuffer) |
| 57 return nullptr; // validation failed. | 57 return nullptr; // validation failed. |
| (...skipping 16 matching lines...) Expand all Loading... |
| 74 | 74 |
| 75 return adoptPtr(new FontCustomPlatformData(cgFontRef.leakRef(), typeface.rel
ease())); | 75 return adoptPtr(new FontCustomPlatformData(cgFontRef.leakRef(), typeface.rel
ease())); |
| 76 } | 76 } |
| 77 | 77 |
| 78 bool FontCustomPlatformData::supportsFormat(const String& format) | 78 bool FontCustomPlatformData::supportsFormat(const String& format) |
| 79 { | 79 { |
| 80 return equalIgnoringCase(format, "truetype") || equalIgnoringCase(format, "o
pentype") || OpenTypeSanitizer::supportsFormat(format); | 80 return equalIgnoringCase(format, "truetype") || equalIgnoringCase(format, "o
pentype") || OpenTypeSanitizer::supportsFormat(format); |
| 81 } | 81 } |
| 82 | 82 |
| 83 } // namespace blink | 83 } // namespace blink |
| OLD | NEW |