Initial OpenType Font Variations Support

third_party/WebKit/Source/core/loader/resource/FontResource.cpp

 /*
  * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2009 Torch Mobile, Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 132 matching lines @@
       recordPackageFormatHistogram(PackageFormatUnknown);
     }
   }
   return m_fontData.get();
 }
 
 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() {
   DCHECK(isLoading());
   DCHECK(loader()->isCacheAwareLoadingActivated());
   if (m_loadLimitState == ShortLimitExceeded ||
       m_loadLimitState == LongLimitExceeded) {
     notifyClientsShortLimitExceeded();
   }
   if (m_loadLimitState == LongLimitExceeded)
@@ skipping 70 matching lines @@
   Resource::onMemoryDump(level, memoryDump);
   if (!m_fontData)
     return;
   const String name = getMemoryDumpName() + "/decoded_webfont";
   WebMemoryAllocatorDump* dump = memoryDump->createMemoryAllocatorDump(name);
   dump->addScalar("size", "bytes", m_fontData->dataSize());
   memoryDump->addSuballocation(dump->guid(), "malloc");
 }
 
 }  // namespace blink