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

Unified Diff: third_party/WebKit/Source/core/loader/resource/FontResource.cpp

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/core/loader/resource/FontResource.cpp
diff --git a/third_party/WebKit/Source/core/loader/resource/FontResource.cpp b/third_party/WebKit/Source/core/loader/resource/FontResource.cpp
index c895500d32fe04790ccd6de50f84d5f390e6096a..8a32534edaf0012ef6f4adf963cf0028f2eadc79 100644
--- a/third_party/WebKit/Source/core/loader/resource/FontResource.cpp
+++ b/third_party/WebKit/Source/core/loader/resource/FontResource.cpp
@@ -150,9 +150,11 @@ FontPlatformData FontResource::platformDataFromCustomData(
float size,
bool bold,
bool italic,
- FontOrientation orientation) {
+ FontOrientation orientation,
+ FontVariationSettings* fontVariationSettings) {
DCHECK(m_fontData);
- return m_fontData->fontPlatformData(size, bold, italic, orientation);
+ return m_fontData->fontPlatformData(size, bold, italic, orientation,
+ fontVariationSettings);
}
void FontResource::willReloadAfterDiskCacheMiss() {

Powered by Google App Engine
This is Rietveld 408576698