Update skia and ui GN builds

Change some targets to source sets. These are small ones that are currently depended on by other source sets. This avoids some duplicate symbols.
duplicated.

Fix some conditions around the touch_device in ui/base.

Lots of Skia build fixes. It turns out our skia library does not use the "util" target, and some of the files in "util" reference functions that it seems are never defined in any file. This removes the ones in our list that weren't in skia_library.gypi to make accessibility_unittests link.

Update gesture recogniser file lists.

BUG=377890
TBR=scottmg

Review URL: https://codereview.chromium.org/305993002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@274022 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 9 insertions, 61 deletions

diff --git a/skia/BUILD.gn b/skia/BUILD.gn
index 9bd4706..b154e20 100644
--- a/skia/BUILD.gn
+++ b/skia/BUILD.gn
@@ -334,8 +334,8 @@ 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/SkRemotableFontMgr_win_dw.cpp",
       "//third_party/skia/src/ports/SkTLS_win.cpp",
-      "//third_party/skia/src/utils/SkThreadUtils_win.cpp",
     ]
   }
   if (!is_android) {
@@ -347,38 +347,19 @@ component("skia") {
   if (!is_mac) {
     sources -= [
       "//third_party/skia/src/ports/SkFontHost_mac.cpp",
-      "//third_party/skia/src/utils/SkThreadUtils_pthread_mach.cpp",
     ]
   }
+
   if (!is_linux) {
     sources -= [
       "//third_party/skia/src/fonts/SkFontMgr_fontconfig.cpp",
       "//third_party/skia/src/ports/SkFontConfigInterface_direct.cpp",
-      "//third_party/skia/src/ports/SkFontHost_FreeType.cpp",
-      "//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 -= [
-      "//third_party/skia/src/ports/SkFontConfigInterface_direct.cpp",
-      "//third_party/skia/src/fonts/SkFontMgr_fontconfig.cpp",
-    ]
-  }
-  if (!is_posix) {
-    sources -= [
-      "//third_party/skia/src/utils/SkThreadUtils_pthread.cpp",
+      "//third_party/skia/src/ports/SkFontHost_FreeType_common.cpp",
+      "//third_party/skia/src/ports/SkFontHost_FreeType.cpp",
     ]
   }
 
-  sources -= [
-    # This file is a stub for systems that use pthreads but aren't covered by
-    # one of the more specific pthread files. We don't support any such
-    # systems.
-    "//third_party/skia/src/utils/SkThreadUtils_pthread_other.cpp",
-  ]
-
   if (!use_cairo) {
     sources -= [
       "ext/bitmap_platform_device_cairo.cc",
diff --git a/skia/skia_gn_files.gypi b/skia/skia_gn_files.gypi
index 09df7aa..3cb7243 100644
--- a/skia/skia_gn_files.gypi
+++ b/skia/skia_gn_files.gypi
@@ -20,6 +20,8 @@
     '<(skia_include_path)/utils/SkProxyCanvas.h',
     '<(skia_include_path)/utils/SkRTConf.h',
     '<(skia_src_path)/fonts/SkFontMgr_fontconfig.cpp',
+    '<(skia_src_path)/fonts/SkFontMgr_indirect.cpp',
+    '<(skia_src_path)/fonts/SkRemotableFontMgr.cpp',
     '<(skia_src_path)/images/SkScaledBitmapSampler.cpp',
     '<(skia_src_path)/images/SkScaledBitmapSampler.h',
     '<(skia_src_path)/ports/SkFontConfigInterface_android.cpp',
@@ -29,7 +31,6 @@
     '<(skia_src_path)/ports/SkFontHost_FreeType_common.cpp',
     '<(skia_src_path)/ports/SkFontHost_FreeType_common.h',
     '<(skia_src_path)/ports/SkFontHost_FreeType.cpp',
-    '<(skia_src_path)/ports/SkFontHost_linux.cpp',
     '<(skia_src_path)/ports/SkFontHost_mac.cpp',
     '<(skia_src_path)/ports/SkFontHost_win.cpp',
     '<(skia_src_path)/ports/SkFontHost_win_dw.cpp',
@@ -37,6 +38,7 @@
     '<(skia_src_path)/ports/SkGlobalInitialization_chromium.cpp',
     '<(skia_src_path)/ports/SkImageDecoder_empty.cpp',
     '<(skia_src_path)/ports/SkOSFile_posix.cpp',
+    '<(skia_src_path)/ports/SkRemotableFontMgr_win_dw.cpp',
     '<(skia_src_path)/ports/SkOSFile_stdio.cpp',
     '<(skia_src_path)/ports/SkOSFile_win.cpp',
     '<(skia_src_path)/ports/SkTime_Unix.cpp',
@@ -54,55 +56,20 @@
     '<(skia_src_path)/utils/debugger/SkObjectParser.h',
     '<(skia_src_path)/utils/SkBase64.cpp',
     '<(skia_src_path)/utils/SkBase64.h',
-    '<(skia_src_path)/utils/SkBitmapHasher.cpp',
-    '<(skia_src_path)/utils/SkBitmapHasher.h',
     '<(skia_src_path)/utils/SkBitSet.cpp',
     '<(skia_src_path)/utils/SkBitSet.h',
-    '<(skia_src_path)/utils/SkBoundaryPatch.cpp',
-    '<(skia_src_path)/utils/SkFrontBufferedStream.cpp',
-    '<(skia_src_path)/utils/SkCamera.cpp',
-    '<(skia_src_path)/utils/SkCanvasStack.h',
     '<(skia_src_path)/utils/SkCanvasStack.cpp',
     '<(skia_src_path)/utils/SkCanvasStateUtils.cpp',
-    '<(skia_src_path)/utils/SkCubicInterval.cpp',
-    '<(skia_src_path)/utils/SkCullPoints.cpp',
-    '<(skia_src_path)/utils/SkDeferredCanvas.cpp',
-    '<(skia_src_path)/utils/SkDumpCanvas.cpp',
     '<(skia_src_path)/utils/SkEventTracer.cpp',
-    '<(skia_src_path)/utils/SkFloatUtils.h',
-    '<(skia_src_path)/utils/SkGatherPixelRefsAndRects.cpp',
-    '<(skia_src_path)/utils/SkGatherPixelRefsAndRects.h',
-    '<(skia_src_path)/utils/SkInterpolator.cpp',
-    '<(skia_src_path)/utils/SkLayer.cpp',
+    '<(skia_src_path)/utils/SkDeferredCanvas.cpp',
     '<(skia_src_path)/utils/SkMatrix22.cpp',
     '<(skia_src_path)/utils/SkMatrix22.h',
     '<(skia_src_path)/utils/SkMatrix44.cpp',
-    '<(skia_src_path)/utils/SkMD5.cpp',
-    '<(skia_src_path)/utils/SkMD5.h',
-    '<(skia_src_path)/utils/SkMeshUtils.cpp',
-    '<(skia_src_path)/utils/SkNinePatch.cpp',
-    '<(skia_src_path)/utils/SkNWayCanvas.cpp',
     '<(skia_src_path)/utils/SkNullCanvas.cpp',
-    '<(skia_src_path)/utils/SkOSFile.cpp',
-    '<(skia_src_path)/utils/SkParse.cpp',
-    '<(skia_src_path)/utils/SkParseColor.cpp',
-    '<(skia_src_path)/utils/SkParsePath.cpp',
+    '<(skia_src_path)/utils/SkNWayCanvas.cpp',
     '<(skia_src_path)/utils/SkPictureUtils.cpp',
-    '<(skia_src_path)/utils/SkPathUtils.cpp',
     '<(skia_src_path)/utils/SkProxyCanvas.cpp',
-    '<(skia_src_path)/utils/SkSHA1.cpp',
-    '<(skia_src_path)/utils/SkSHA1.h',
     '<(skia_src_path)/utils/SkRTConf.cpp',
-    '<(skia_src_path)/utils/SkThreadUtils.h',
-    '<(skia_src_path)/utils/SkThreadUtils_pthread.cpp',
-    '<(skia_src_path)/utils/SkThreadUtils_pthread.h',
-    '<(skia_src_path)/utils/SkThreadUtils_pthread_linux.cpp',
-    '<(skia_src_path)/utils/SkThreadUtils_pthread_mach.cpp',
-    '<(skia_src_path)/utils/SkThreadUtils_pthread_other.cpp',
-    '<(skia_src_path)/utils/SkThreadUtils_win.cpp',
-    '<(skia_src_path)/utils/SkThreadUtils_win.h',
-    '<(skia_src_path)/utils/SkTFitsIn.h',
-    '<(skia_src_path)/utils/SkTLogic.h',
 
     #mac
     '<(skia_include_path)/utils/mac/SkCGUtils.h',