Revert of Support for OpenType Font Variations on Windows

skia/BUILD.gn

Index: skia/BUILD.gn
diff --git a/skia/BUILD.gn b/skia/BUILD.gn
index a6c38df052639fc47e2b146aaa5053de60cda11a..df0f01764306642c39a8a56812f1a55745deec22 100644
--- a/skia/BUILD.gn
+++ b/skia/BUILD.gn
@@ -42,10 +42,6 @@
   ]
 
   defines = skia_for_chromium_defines
-
-  if (is_win) {
-    defines += [ "SK_FREETYPE_MINIMUM_RUNTIME_VERSION=(((FREETYPE_MAJOR) << 24) | ((FREETYPE_MINOR) << 16) | ((FREETYPE_PATCH) << 8))" ]
-  }
 
   if (is_component_build) {
     defines += [
@@ -362,6 +358,9 @@
 
   if (is_linux || is_android) {
     sources += [
+      "//third_party/skia/src/ports/SkFontHost_FreeType.cpp",
+      "//third_party/skia/src/ports/SkFontHost_FreeType_common.cpp",
+
       # Retain the files for the SkFontMgr_Android on linux to emulate android
       # fonts. See content/zygote/zygote_main_linux.cc
       # Note that this requires expat.
@@ -370,22 +369,9 @@
     ]
   }
 
-  if (is_linux || is_android || is_win) {
-    sources += [
-      "//third_party/skia/src/ports/SkFontHost_FreeType.cpp",
-      "//third_party/skia/src/ports/SkFontHost_FreeType_common.cpp",
-    ]
-  }
-
+  # Select the right BitmapPlatformDevice.
   if (is_win) {
-    sources += [
-      # Add the custom FreeType font manager to instantiate variable fonts on Windows.
-      "//third_party/skia/src/ports/SkFontMgr_custom.cpp",
-      "//third_party/skia/src/ports/SkFontMgr_custom_empty.cpp",
-
-      # Select the right BitmapPlatformDevice.
-      "ext/raster_handle_allocator_win.cc",
-    ]
+    sources += [ "ext/raster_handle_allocator_win.cc" ]
   }
 
   if (is_clang && !is_nacl) {
@@ -414,8 +400,8 @@
       configs += [ "//build/config/linux/pangocairo" ]
     }
     deps += [
+      "//build/linux:fontconfig",
       "//build/config/freetype",
-      "//build/linux:fontconfig",
       "//third_party/expat",
       "//third_party/icu:icuuc",
     ]
@@ -425,11 +411,8 @@
     deps += [
       "//third_party/android_tools:cpu_features",
       "//third_party/expat",
-    ]
-  }
-
-  if (is_win || is_android) {
-    deps += [ "//build/config/freetype" ]
+      "//build/config/freetype",
+    ]
   }
 
   if (skia_support_pdf) {