Revert of Support for OpenType Font Variations on Windows

skia/BUILD.gn

 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//build/config/sanitizers/sanitizers.gni")
 import("//printing/features/features.gni")
 import("//testing/test.gni")
 import("//third_party/skia/gn/shared_sources.gni")
@@ skipping 25 matching lines @@
     "//third_party/skia/include/lazy",
     "//third_party/skia/include/pathops",
     "//third_party/skia/include/pdf",
     "//third_party/skia/include/pipe",
     "//third_party/skia/include/ports",
     "//third_party/skia/include/utils",
   ]
 
   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 += [
       "SKIA_DLL",
       "GR_GL_IGNORE_ES3_MSAA=0",
     ]
   }
 
   if (skia_support_gpu) {
     include_dirs += [
       "//third_party/skia/include/gpu",
@@ skipping 295 matching lines @@
     sources += [
       "//third_party/skia/src/ports/SkFontConfigInterface.cpp",
       "//third_party/skia/src/ports/SkFontConfigInterface_direct.cpp",
       "//third_party/skia/src/ports/SkFontConfigInterface_direct_factory.cpp",
       "//third_party/skia/src/ports/SkFontMgr_FontConfigInterface.cpp",
     ]
   }
 
   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.
       "//third_party/skia/src/ports/SkFontMgr_android.cpp",
       "//third_party/skia/src/ports/SkFontMgr_android_parser.cpp",
     ]
   }
 
-  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) {
     # Skia won't compile with some of the more strict clang warnings.
     # e.g. it does:
     #  SkASSERT(!"sk_out_of_memory");
     configs -= [ "//build/config/clang:extra_warnings" ]
   }
 
   configs -= [ "//build/config/compiler:chromium_code" ]
   configs += [
     ":skia_config",
     ":skia_library_config",
     "//build/config/compiler:no_chromium_code",
   ]
   public_configs = [ ":skia_config" ]
 
   deps = [
     ":skia_opts",
     "//base",
     "//base/third_party/dynamic_annotations",
   ]
 
   if (is_linux) {
     if (use_pango) {
       configs += [ "//build/config/linux/pangocairo" ]
     }
     deps += [
+      "//build/linux:fontconfig",
       "//build/config/freetype",
-      "//build/linux:fontconfig",
       "//third_party/expat",
       "//third_party/icu:icuuc",
     ]
   }
 
   if (is_android) {
     deps += [
       "//third_party/android_tools:cpu_features",
       "//third_party/expat",
+      "//build/config/freetype",
     ]
   }
 
-  if (is_win || is_android) {
-    deps += [ "//build/config/freetype" ]
-  }
-
   if (skia_support_pdf) {
     deps += [
       "//third_party/sfntly",
       "//third_party/zlib",
     ]
     sources += skia_pdf_sources
   } else {
     sources += [ "//third_party/skia/src/pdf/SkDocument_PDF_None.cpp" ]
   }
 
@@ skipping 266 matching lines @@
 
     deps = [
       ":skia",
       "//base",
       "//base/test:test_support",
       "//build/config/sanitizers:deps",
       "//build/win:default_exe_manifest",
     ]
   }
 }