GN Windows build fixes

skia/BUILD.gn

Index: skia/BUILD.gn
diff --git a/skia/BUILD.gn b/skia/BUILD.gn
index 8e924b6a38545dbbbe5e320ae27ef68a78bea8e9..904e8b85d1edca486fc9241098199a42e9305e06 100644
--- a/skia/BUILD.gn
+++ b/skia/BUILD.gn
@@ -3,6 +3,7 @@
 # found in the LICENSE file.
 
 import("//build/config/features.gni")
+import("//build/config/ui.gni")
 if (cpu_arch == "arm") {
   import("//build/config/arm.gni")
 }
@@ -258,7 +259,6 @@ component("skia") {
       "//third_party/skia/src/ports/SkFontHost_win_dw.cpp",
       "//third_party/skia/src/ports/SkFontMgr_default_gdi.cpp",
       "//third_party/skia/src/ports/SkOSFile_win.cpp",
-      "//third_party/skia/src/ports/SkThread_win.cpp",
       "//third_party/skia/src/ports/SkTLS_win.cpp",
       "//third_party/skia/src/utils/SkThreadUtils_win.cpp",
     ]
@@ -281,6 +281,7 @@ component("skia") {
       "//third_party/skia/src/ports/SkFontHost_FreeType_common.cpp",
       "//third_party/skia/src/ports/SkFontHost_fontconfig.cpp",
       "//third_party/skia/src/ports/SkFontHost_linux.cpp",
+      "//third_party/skia/src/utils/SkThreadUtils_pthread_linux.cpp",
     ]
   } else if (!is_android) {
     sources -= [
@@ -288,6 +289,18 @@ component("skia") {
       "//third_party/skia/src/fonts/SkFontMgr_fontconfig.cpp",
     ]
   }
+  if (!is_posix) {
+    sources -= [
+      "//third_party/skia/src/utils/SkThreadUtils_pthread.cpp",
+    ]
+  }
+
+  if (!use_cairo) {
+    sources -= [
+      "ext/bitmap_platform_device_cairo.cc",
+      "ext/bitmap_platform_device_cairo.h",
+    ]
+  }
 
   configs -= [ "//build/config/compiler:chromium_code" ]
   configs += [