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

Unified Diff: third_party/WebKit/Source/platform/fonts/FontCustomPlatformData.h

Issue 2581083003: Initial OpenType Font Variations Support (Closed)
Patch Set: Fix hash collision tests, adjust test expectations Created 4 years 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/platform/fonts/FontCustomPlatformData.h
diff --git a/third_party/WebKit/Source/platform/fonts/FontCustomPlatformData.h b/third_party/WebKit/Source/platform/fonts/FontCustomPlatformData.h
index 055ded0d719971cd0b4b7c8eda94dd6e3e74bee5..80eb0cf18118fba9920db1ab08d39b91497f36f2 100644
--- a/third_party/WebKit/Source/platform/fonts/FontCustomPlatformData.h
+++ b/third_party/WebKit/Source/platform/fonts/FontCustomPlatformData.h
@@ -47,6 +47,7 @@ namespace blink {
class FontPlatformData;
class SharedBuffer;
+class FontVariationSettings;
class PLATFORM_EXPORT FontCustomPlatformData {
USING_FAST_MALLOC(FontCustomPlatformData);
@@ -62,14 +63,15 @@ class PLATFORM_EXPORT FontCustomPlatformData {
float size,
bool bold,
bool italic,
- FontOrientation = FontOrientation::Horizontal);
+ FontOrientation = FontOrientation::Horizontal,
+ const FontVariationSettings* = nullptr);
size_t dataSize() const { return m_dataSize; }
static bool supportsFormat(const String&);
private:
FontCustomPlatformData(sk_sp<SkTypeface>, size_t dataSize);
- sk_sp<SkTypeface> m_typeface;
+ sk_sp<SkTypeface> m_baseTypeface;
size_t m_dataSize;
};

Powered by Google App Engine
This is Rietveld 408576698