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 * | 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 are | 6 * modification, are permitted provided that the following conditions are |
7 * met: | 7 * met: |
8 * | 8 * |
9 * * Redistributions of source code must retain the above copyright | 9 * * 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 29 matching lines...) Expand all Loading... |
40 #include "wtf/Noncopyable.h" | 40 #include "wtf/Noncopyable.h" |
41 #include "wtf/text/WTFString.h" | 41 #include "wtf/text/WTFString.h" |
42 #include <memory> | 42 #include <memory> |
43 | 43 |
44 class SkTypeface; | 44 class SkTypeface; |
45 | 45 |
46 namespace blink { | 46 namespace blink { |
47 | 47 |
48 class FontPlatformData; | 48 class FontPlatformData; |
49 class SharedBuffer; | 49 class SharedBuffer; |
| 50 class FontVariationSettings; |
50 | 51 |
51 class PLATFORM_EXPORT FontCustomPlatformData { | 52 class PLATFORM_EXPORT FontCustomPlatformData { |
52 USING_FAST_MALLOC(FontCustomPlatformData); | 53 USING_FAST_MALLOC(FontCustomPlatformData); |
53 WTF_MAKE_NONCOPYABLE(FontCustomPlatformData); | 54 WTF_MAKE_NONCOPYABLE(FontCustomPlatformData); |
54 | 55 |
55 public: | 56 public: |
56 static std::unique_ptr<FontCustomPlatformData> create( | 57 static std::unique_ptr<FontCustomPlatformData> create( |
57 SharedBuffer*, | 58 SharedBuffer*, |
58 String& otsParseMessage); | 59 String& otsParseMessage); |
59 ~FontCustomPlatformData(); | 60 ~FontCustomPlatformData(); |
60 | 61 |
61 FontPlatformData fontPlatformData( | 62 FontPlatformData fontPlatformData( |
62 float size, | 63 float size, |
63 bool bold, | 64 bool bold, |
64 bool italic, | 65 bool italic, |
65 FontOrientation = FontOrientation::Horizontal); | 66 FontOrientation = FontOrientation::Horizontal, |
| 67 const FontVariationSettings* = nullptr); |
66 | 68 |
67 size_t dataSize() const { return m_dataSize; } | 69 size_t dataSize() const { return m_dataSize; } |
68 static bool supportsFormat(const String&); | 70 static bool supportsFormat(const String&); |
69 | 71 |
70 private: | 72 private: |
71 FontCustomPlatformData(sk_sp<SkTypeface>, size_t dataSize); | 73 FontCustomPlatformData(sk_sp<SkTypeface>, size_t dataSize); |
72 sk_sp<SkTypeface> m_typeface; | 74 sk_sp<SkTypeface> m_baseTypeface; |
73 size_t m_dataSize; | 75 size_t m_dataSize; |
74 }; | 76 }; |
75 | 77 |
76 } // namespace blink | 78 } // namespace blink |
77 | 79 |
78 #endif // FontCustomPlatformData_h | 80 #endif // FontCustomPlatformData_h |
OLD | NEW |