Revert of Support for OpenType Font Variations on Windows

third_party/WebKit/Source/platform/fonts/FontCustomPlatformData.cpp

 /*
  * Copyright (C) 2007 Apple Computer, Inc.
  * Copyright (c) 2007, 2008, 2009, Google Inc. All rights reserved.
  * Copyright (C) 2010 Company 100, Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
@@ skipping 22 matching lines @@
 #include "platform/fonts/FontCustomPlatformData.h"
 
 #include "platform/LayoutTestSupport.h"
 #include "platform/SharedBuffer.h"
 #include "platform/fonts/FontCache.h"
 #include "platform/fonts/FontPlatformData.h"
 #include "platform/fonts/WebFontDecoder.h"
 #include "platform/fonts/opentype/FontSettings.h"
 #include "third_party/skia/include/core/SkStream.h"
 #include "third_party/skia/include/core/SkTypeface.h"
-#if OS(WIN)
-#include "third_party/skia/include/ports/SkFontMgr_empty.h"
-#endif
 #include "wtf/PtrUtil.h"
 
 namespace blink {
 
 FontCustomPlatformData::FontCustomPlatformData(sk_sp<SkTypeface> typeface,
                                                size_t dataSize)
-    : m_baseTypeface(std::move(typeface)), m_dataSize(dataSize) {}
+    : m_baseTypeface(typeface), m_dataSize(dataSize) {}
 
 FontCustomPlatformData::~FontCustomPlatformData() {}
 
 FontPlatformData FontCustomPlatformData::fontPlatformData(
     float size,
     bool bold,
     bool italic,
     FontOrientation orientation,
     const FontVariationSettings* variationSettings) {
   DCHECK(m_baseTypeface);
 
   sk_sp<SkTypeface> returnTypeface = m_baseTypeface;
 
   // Maximum axis count is maximum value for the OpenType USHORT, which is a
   // 16bit unsigned.  https://www.microsoft.com/typography/otspec/fvar.htm
   // Variation settings coming from CSS can have duplicate assignments and the
   // list can be longer than UINT16_MAX, but ignoring this for now, going with a
   // reasonable upper limit and leaving the deduplication for TODO(drott),
   // crbug.com/674878 second duplicate value should supersede first..
   if (variationSettings && variationSettings->size() < UINT16_MAX) {
-#if OS(WIN)
-    sk_sp<SkFontMgr> fm(SkFontMgr_New_Custom_Empty());
-#else
     sk_sp<SkFontMgr> fm(SkFontMgr::RefDefault());
-#endif
     Vector<SkFontMgr::FontParameters::Axis, 0> axes;
     axes.reserveCapacity(variationSettings->size());
     for (size_t i = 0; i < variationSettings->size(); ++i) {
       SkFontMgr::FontParameters::Axis axis = {
           atomicStringToFourByteTag(variationSettings->at(i).tag()),
           SkFloatToScalar(variationSettings->at(i).value())};
       axes.push_back(axis);
     }
 
     sk_sp<SkTypeface> skVariationFont(fm->createFromStream(
@@ skipping 30 matching lines @@
       new FontCustomPlatformData(std::move(typeface), decoder.decodedSize()));
 }
 
 bool FontCustomPlatformData::supportsFormat(const String& format) {
   return equalIgnoringCase(format, "truetype") ||
          equalIgnoringCase(format, "opentype") ||
          WebFontDecoder::supportsFormat(format);
 }
 
 }  // namespace blink