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

base/test/BUILD.gn

@@ -128,7 +128,7 @@ config("perf_test_config") {
   defines = [ "PERF_TEST" ]
 }
 
-static_library("test_support_perf") {
+source_set("test_support_perf") {
   sources = [
     "run_all_perftests.cc",
   ]

base/third_party/dynamic_annotations/BUILD.gn

@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-static_library("dynamic_annotations") {
+source_set("dynamic_annotations") {
   sources = [
     "dynamic_annotations.c",
     "dynamic_annotations.h",

base/third_party/nspr/BUILD.gn

@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-static_library("nspr") {
+source_set("nspr") {
   visibility = "//base/*"
   sources = [
     "prtime.cc",

base/third_party/symbolize/BUILD.gn

@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-static_library("symbolize") {
+source_set("symbolize") {
   visibility = "//base/*"
   sources = [
     "config.h",

base/third_party/xdg_mime/BUILD.gn

@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-static_library("xdg_mime") {
+source_set("xdg_mime") {
   visibility = "//base/*"
   sources = [
     "xdgmime.c",

base/third_party/xdg_user_dirs/BUILD.gn

@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-static_library("xdg_user_dirs") {
+source_set("xdg_user_dirs") {
   visibility = "//base/*"
   sources = [
     "xdg_user_dir_lookup.cc",

build/config/BUILDCONFIG.gn

@@ -293,7 +293,7 @@ set_sources_assignment_filter(sources_assignment_filter)
 if (is_component_build) {
   component_mode = "shared_library"
 } else {
-  component_mode = "static_library"
+  component_mode = "source_set"
 }
 
 # These Sanitizers all imply using the Clang compiler. On Windows they either

device/usb/BUILD.gn

@@ -5,8 +5,7 @@
 source_ids = "//third_party/usb_ids/usb.ids"
 generated_ids = "$target_gen_dir/usb_ids_gen.cc"
 
-static_library("usb") {
-  output_name = "device_usb"
+source_set("usb") {
   sources = [
     "usb_ids.cc",
     "usb_ids.h",

ppapi/BUILD.gn

@@ -68,7 +68,7 @@ source_set("ppapi_gles2") {
   ]
 }
 
-# TODO(GYP) bug 377890, re-enable this when it links.
+# TODO(brettw) argument list is too long. Need to add response files.
 #shared_library("ppapi_tests") {
 #  sources = gypi_values.test_common_source_files +
 #            gypi_values.test_trusted_source_files

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",

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',

tools/gn/secondary/third_party/icu/BUILD.gn

@@ -24,7 +24,7 @@ config("icu_config") {
 
 # Config used only by ICU code.
 config("icu_code") {
-  if (component_mode == "static_library") {
+  if (component_mode != "shared_library") {
     defines = [ "U_STATIC_IMPLEMENTATION" ]
   }
 
@@ -426,7 +426,7 @@ if (is_win) {
     outputs = [ "$root_out_dir/icudt.dll" ]
   }
 } else {
-  static_library("icudata") {
+  source_set("icudata") {
     sources = [
       # These are hand-generated, but will do for now.  The linux version is an
       # identical copy of the (mac) icudt46l_dat.S file, modulo removal of the

ui/base/BUILD.gn

@@ -195,11 +195,7 @@ component("base") {
     "text/bytes_formatting.h",
     "theme_provider.cc",
     "theme_provider.h",
-    "touch/touch_device.cc",
     "touch/touch_device.h",
-    "touch/touch_device_android.cc",
-    "touch/touch_device_ozone.cc",
-    "touch/touch_device_win.cc",
     "touch/touch_editing_controller.cc",
     "touch/touch_editing_controller.h",
     "touch/touch_enabled.cc",
@@ -258,6 +254,19 @@ component("base") {
     "x/x11_util_internal.h",
   ]
 
+  if (is_win) {
+    sources += [ "touch/touch_device_win.cc" ]
+  } else if (is_android) {
+    sources += [ "touch/touch_device_android.cc" ]
+  } else if (use_ozone) {
+    sources += [ "touch/touch_device_ozone.cc" ]
+  } else if (use_aura && use_x11) { 
+    sources += [ "touch/touch_device_aurax11.cc" ]
+  } else {
+    # Empty implementation for all other cases.
+    sources += [ "touch/touch_device.cc" ]
+  }
+
   defines = [ "UI_BASE_IMPLEMENTATION" ]
 
   deps = [
@@ -318,12 +327,6 @@ component("base") {
     ]
   }
 
-  if (!use_ozone) {
-    sources -= [
-      "touch/touch_device_ozone.cc",
-    ]
-  }
-
   if (!use_aura || !is_linux) {
     sources -= [
       "resource/resource_bundle_auralinux.cc",
@@ -363,9 +366,6 @@ component("base") {
       "dragdrop/os_exchange_data_provider_aura.cc",
       "dragdrop/os_exchange_data_provider_aura.h",
     ]
-    sources -= [
-      "touch/touch_device.cc",
-    ]
   }
 
   libs = []
@@ -373,9 +373,6 @@ component("base") {
     deps += [
       "//third_party/wtl",
     ]
-    sources -= [
-      "touch/touch_device.cc",
-    ]
     cflags = [
       "/wd4267",  # TODO(jschuh): C4267: http://crbug.com/167187 size_t -> int.
       "/wd4324",  # Structure was padded due to __declspec(align()), which is
@@ -439,7 +436,6 @@ component("base") {
         "cursor/cursor_loader_x11.cc",
         "cursor/cursor_loader_x11.h",
         "cursor/cursor_x11.cc",
-        "touch/touch_device_aurax11.cc",
       ]
       if (!is_chromeos) {
         # These Aura X11 files aren't used on ChromeOS.
@@ -472,7 +468,6 @@ component("base") {
       "models/button_menu_item_model.cc",
       "models/dialog_model.cc",
       "theme_provider.cc",
-      "touch/touch_device.cc",
       "touch/touch_editing_controller.cc",
       "ui_base_types.cc",
     ]

ui/events/BUILD.gn

@@ -22,6 +22,8 @@ component("events_base") {
     "events_base_export.h",
     "gesture_event_details.cc",
     "gesture_event_details.h",
+    "gestures/gesture_configuration.cc",
+    "gestures/gesture_configuration.h",
     "keycodes/keyboard_code_conversion.cc",
     "keycodes/keyboard_code_conversion.h",
     "keycodes/keyboard_code_conversion_android.cc",
@@ -66,6 +68,7 @@ component("events") {
   deps = [
     ":dom4_keycode_converter",
     ":events_base",
+    ":gesture_detection",
     "//skia",
     "//ui/gfx",
     "//ui/gfx/geometry",
@@ -96,13 +99,12 @@ component("events") {
     "event_utils.h",
     "events_export.h",
     "events_stub.cc",
-    "gestures/gesture_configuration.cc",
-    "gestures/gesture_configuration.h",
     "gestures/gesture_point.cc",
     "gestures/gesture_point.h",
     "gestures/gesture_recognizer.h",
     "gestures/gesture_recognizer_impl.cc",
     "gestures/gesture_recognizer_impl.h",
+    "gestures/gesture_recognizer_impl_mac.cc",
     "gestures/gesture_sequence.cc",
     "gestures/gesture_sequence.h",
     "gestures/gesture_types.h",
@@ -168,6 +170,15 @@ component("events") {
     ]
   }
 
+  if (use_aura) {
+    sources += [
+      "gestures/gesture_provider_aura.cc",
+      "gestures/gesture_provider_aura.h",
+      "gestures/motion_event_aura.cc",
+      "gestures/motion_event_aura.h",
+    ]
+  }
+
   if (is_win || use_x11 || use_ozone) {
     sources -= [ "events_stub.cc" ]
   }
@@ -210,10 +221,6 @@ component("gesture_detection") {
 
   defines = [ "GESTURE_DETECTION_IMPLEMENTATION" ]
 
-  if (use_aura) {
-    deps += [ ":events" ]
-  }
-
   if (is_android) {
     sources += [ "gesture_detection/gesture_config_helper_android.cc" ]
   } else if (use_aura) {

ui/gfx/BUILD.gn

@@ -156,12 +156,6 @@ component("gfx") {
     "range/range.h",
     "range/range_mac.mm",
     "range/range_win.cc",
-    "render_text.cc",
-    "render_text.h",
-    "render_text_mac.cc",
-    "render_text_mac.h",
-    "render_text_win.cc",
-    "render_text_win.h",
     "scoped_canvas.h",
     "scoped_cg_context_save_gstate_mac.h",
     "scoped_ns_graphics_context_save_gstate_mac.h",
@@ -199,7 +193,6 @@ component("gfx") {
     "text_utils.h",
     "text_utils_android.cc",
     "text_utils_ios.mm",
-    "text_utils_skia.cc",
     "transform.cc",
     "transform.h",
     "transform_util.cc",
@@ -228,6 +221,7 @@ component("gfx") {
     "//base:base_static",
     "//base/third_party/dynamic_annotations",
     "//skia",
+    "//third_party/harfbuzz-ng",
     "//third_party/icu:icui18n",
     "//third_party/icu:icuuc",
     "//third_party/libpng",
@@ -235,6 +229,30 @@ component("gfx") {
     "//ui/gfx/geometry",
   ]
 
+  # Text rendering conditions (complicated so separated out).
+  if (is_android || is_ios) {
+    # We don't support RenderText on these platforms.
+  } else {
+    # These text rendering files are supported everywhere text rendering is.
+    sources += [
+      "render_text.cc",
+      "render_text.h",
+      "render_text_harfbuzz.cc",
+      "render_text_harfbuzz.h",
+      "text_utils_skia.cc",
+    ]
+    # These are the "native" rendering routines, only one should apply.
+    if (is_win) {
+      sources += [ "render_text_win.cc" ]
+    } else if (is_mac) {
+      sources += [ "render_text_mac.cc" ]
+    } else if (use_pango) {
+      sources += [ "render_text_pango.cc" ]
+    } else if (use_ozone) {
+      sources += [ "render_text_ozone.cc" ]
+    }
+  }
+  
   # iOS.
   if (is_ios) {
     sources -= [
@@ -272,14 +290,6 @@ component("gfx") {
     ]
   }
 
-  if (is_android || is_ios) {
-    sources -= [
-      "render_text.cc",
-      "render_text.h",
-      "text_utils_skia.cc",
-    ]
-  }
-
   # Windows.
   if (is_win) {
     cflags = [
@@ -305,7 +315,6 @@ component("gfx") {
   if (use_ozone) {
     sources += [
       "platform_font_ozone.cc",
-      "render_text_ozone.cc",
       "ozone/impl/file_surface_factory.cc",
       "ozone/impl/file_surface_factory.h",
       "ozone/surface_factory_ozone.cc",
@@ -338,6 +347,7 @@ component("gfx") {
       "nine_image_painter.cc",
       "nine_image_painter.h",
       "path_aura.cc",
+      "screen_aura.cc",
     ]
   }
 
@@ -357,8 +367,6 @@ component("gfx") {
       "pango_util.h",
       "platform_font_pango.cc",
       "platform_font_pango.h",
-      "render_text_pango.cc",
-      "render_text_pango.h",
     ]
     configs += [ "//build/config/linux:pangocairo" ]
   }