Update skia and ui GN builds

ui/gfx/BUILD.gn

 # Copyright 2014 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/ui.gni")
 
 if (is_android) {
   import("//build/config/android/config.gni")
   import("//build/config/android/rules.gni")
 }
@@ skipping 138 matching lines @@
     "platform_font_ios.h",
     "platform_font_ios.mm",
     "platform_font_mac.h",
     "platform_font_mac.mm",
     "platform_font_win.cc",
     "platform_font_win.h",
     "range/range.cc",
     "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",
     "scoped_ns_graphics_context_save_gstate_mac.mm",
     "scoped_ui_graphics_push_context_ios.h",
     "scoped_ui_graphics_push_context_ios.mm",
     "screen.cc",
     "screen.h",
     "screen_android.cc",
     "screen_aura.cc",
@@ skipping 17 matching lines @@
     "switches.h",
     "sys_color_change_listener.cc",
     "sys_color_change_listener.h",
     "text_constants.h",
     "text_elider.cc",
     "text_elider.h",
     "text_utils.cc",
     "text_utils.h",
     "text_utils_android.cc",
     "text_utils_ios.mm",
-    "text_utils_skia.cc",
     "transform.cc",
     "transform.h",
     "transform_util.cc",
     "transform_util.h",
     "ui_gfx_exports.cc",
     "utf16_indexing.cc",
     "utf16_indexing.h",
     "vsync_provider.h",
     "win/dpi.cc",
     "win/dpi.h",
     "win/hwnd_util.cc",
     "win/hwnd_util.h",
     "win/scoped_set_map_mode.h",
     "win/singleton_hwnd.cc",
     "win/singleton_hwnd.h",
     "win/window_impl.cc",
     "win/window_impl.h",
   ]
 
   defines = [ "GFX_IMPLEMENTATION" ]
 
   deps = [
     ":gfx_export",
     "//base",
     "//base:i18n",
     "//base:base_static",
     "//base/third_party/dynamic_annotations",
     "//skia",
+    "//third_party/harfbuzz-ng",
     "//third_party/icu:icui18n",
     "//third_party/icu:icuuc",
     "//third_party/libpng",
     "//third_party/zlib",
     "//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 -= [
       "codec/jpeg_codec.cc",
       "codec/jpeg_codec.h",
     ]
   } else {
     deps += [ "//third_party:jpeg" ]
   }
 
@@ skipping 17 matching lines @@
     #  deps += [ "//base:base_java" ]
     #}
 
     deps += [ ":gfx_jni_headers" ]
     libs = [
       "android",
       "jnigraphics",
     ]
   }
 
-  if (is_android || is_ios) {
-    sources -= [
-      "render_text.cc",
-      "render_text.h",
-      "text_utils_skia.cc",
-    ]
-  }
-
   # Windows.
   if (is_win) {
     cflags = [
       "/wd4267",  # TODO(jschuh): C4267: http://crbug.com/167187 size_t -> int.
       "/wd4324",  # Structure was padded due to __declspec(align()), which is
                   # uninteresting.
     ]
   } else {
     sources -= [
       "gdi_util.cc",
       "gdi_util.h",
       "icon_util.cc",
       "icon_util.h",
     ]
   }
 
   # Linux.
   if (is_linux) {
     configs += [ "//build/config/linux:fontconfig" ]
   }
 
   # Ozone stuff.
   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",
       "ozone/surface_factory_ozone.h",
       "ozone/surface_ozone.h",
       "ozone/overlay_candidates_ozone.cc",
       "ozone/overlay_candidates_ozone.h",
     ]
   }
   if (use_ozone && ozone_platform_dri) {
@@ skipping 12 matching lines @@
       "ozone/dri/hardware_display_controller.h",
     ]
     configs += [ "//build/config/linux:dridrm" ]
   }
 
   if (!use_aura) {
     sources -= [
       "nine_image_painter.cc",
       "nine_image_painter.h",
       "path_aura.cc",
+      "screen_aura.cc",
     ]
   }
 
   if (use_x11) {
     deps += [
       ":gfx_x11",
     ]
   } else {
     sources -= [
       "path_x11.cc",
     ]
   }
 
   if (use_pango) {
     sources += [
       "pango_util.cc",
       "pango_util.h",
       "platform_font_pango.cc",
       "platform_font_pango.h",
-      "render_text_pango.cc",
-      "render_text_pango.h",
     ]
     configs += [ "//build/config/linux:pangocairo" ]
   }
 }
 
 # Looking for gfx_geometry? It's //ui/gfx/geometry:geometry
 
 source_set("gfx_test_support") {
   sources = [
     "test/gfx_util.cc",
@@ skipping 73 matching lines @@
 
     defines = [ "GFX_IMPLEMENTATION" ]
     configs += [ "//build/config/linux:x11" ]
 
     deps = [
       ":gfx_export",
       "//base"
     ]
   }
 }