Initial OpenType Font Variations Support

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

 /*
  * Copyright (C) 2007, 2008 Apple Inc. All rights reserved.
  *
  * 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
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 24 matching lines @@
 #include "platform/heap/Handle.h"
 #include <memory>
 
 namespace blink {
 
 class FetchRequest;
 class ResourceFetcher;
 class FontPlatformData;
 class FontCustomPlatformData;
 class FontResourceClient;
+class FontVariationSettings;
 
 class CORE_EXPORT FontResource final : public Resource {
  public:
   using ClientType = FontResourceClient;
 
   static FontResource* fetch(FetchRequest&, ResourceFetcher*);
   ~FontResource() override;
 
   void didAddClient(ResourceClient*) override;
 
   void setRevalidatingRequest(const ResourceRequest&) override;
 
   void allClientsAndObserversRemoved() override;
   void startLoadLimitTimers();
 
   void setCORSFailed() override { m_corsFailed = true; }
   bool isCORSFailed() const { return m_corsFailed; }
   String otsParsingMessage() const { return m_otsParsingMessage; }
 
   bool ensureCustomFontData();
   FontPlatformData platformDataFromCustomData(
       float size,
       bool bold,
       bool italic,
-      FontOrientation = FontOrientation::Horizontal);
+      FontOrientation = FontOrientation::Horizontal,
+      FontVariationSettings* = nullptr);

[eae, 2016/12/16 18:48:27]

Can this be a const pointer?

[drott, 2016/12/19 14:12:34]

Yes, modified accordingly.

 
   // Returns true if the loading priority of the remote font resource can be
   // lowered. The loading priority of the font can be lowered only if the
   // font is not needed for painting the text.
   bool isLowPriorityLoadingAllowedForRemoteFont() const;
 
   void willReloadAfterDiskCacheMiss() override;
 
   void onMemoryDump(WebMemoryDumpLevelOfDetail,
                     WebProcessMemoryDump*) const override;
@@ skipping 58 matching lines @@
     // Only the RemoteFontFaceSources clients can prevent lowering of loading
     // priority of the remote fonts.  Set the default to true to prevent
     // other clients from incorrectly returning false.
     return true;
   }
 };
 
 }  // namespace blink
 
 #endif