fix skia + windows + gn

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("//testing/test.gni")
 
 if (current_cpu == "arm") {
   import("//build/config/arm.gni")
@@ skipping 94 matching lines @@
     "//third_party/skia/include/config",
     "//third_party/skia/include/core",
     "//third_party/skia/include/effects",
     "//third_party/skia/include/images",
     "//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",
+
     # TODO(dsinclair): Right way to use //third_party/freetype?
     "//third_party/freetype/include",
   ]
 
   defines = []
 
   if (skia_support_gpu) {
     include_dirs += [
       "//third_party/skia/include/gpu",
       "//third_party/skia/src/gpu",
@@ skipping 179 matching lines @@
       "//third_party/skia/src/utils/win/SkIStream.cpp",
       "//third_party/skia/src/utils/win/SkWGL_win.cpp",
     ]
   }
 
   # Fixup skia library sources.
   if (is_win) {
     sources -= [
       "//third_party/skia/src/ports/SkOSFile_posix.cpp",
       "//third_party/skia/src/ports/SkTLS_pthread.cpp",
-      "//third_party/skia/src/ports/SkFontMgr_custom.cpp",
-      "//third_party/skia/src/ports/SkFontMgr_custom_empty_factory.cpp",
     ]
   } else {
     sources -= [
       "//third_party/skia/src/ports/SkFontHost_win.cpp",
-      "//third_party/skia/src/ports/SkFontMgr_win_dw.cpp",
-      "//third_party/skia/src/ports/SkFontMgr_win_dw_factory.cpp",
       "//third_party/skia/src/ports/SkOSFile_win.cpp",
       "//third_party/skia/src/ports/SkRemotableFontMgr_win_dw.cpp",
       "//third_party/skia/src/ports/SkScalerContext_win_dw.cpp",
       "//third_party/skia/src/ports/SkTLS_win.cpp",
       "//third_party/skia/src/ports/SkTypeface_win_dw.cpp",
     ]
   }
   if (!is_android) {
     sources -= [
       "//third_party/skia/src/ports/SkFontMgr_android.cpp",
       "//third_party/skia/src/ports/SkFontMgr_android_factory.cpp",
       "//third_party/skia/src/ports/SkFontMgr_android_parser.cpp",
     ]
   }
   if (!is_mac) {
     sources -= [ "//third_party/skia/src/ports/SkFontHost_mac.cpp" ]
   }
 
-  if (!is_linux && !is_android) {
+  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",
     ]
   }
 
   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",
     "../third_party:fx_zlib",
   ]
 
   if (is_linux) {
-    deps += [
-      "//third_party/icu:icuuc",
-    ]
+    deps += [ "//third_party/icu:icuuc" ]
   }
 
   if (is_android) {
     set_sources_assignment_filter([])
     set_sources_assignment_filter(sources_assignment_filter)
     deps += [
       "//third_party/android_tools:cpu_features",
       "//third_party/expat",
       "//third_party/freetype-android:freetype",
     ]
@@ skipping 166 matching lines @@
 
   configs -= [ "//build/config/compiler:chromium_code" ]
   configs += [
     ":skia_config",
     ":skia_library_config",
     "//build/config/compiler:no_chromium_code",
   ]
 
   visibility = [ ":skia" ]
 }