GN build: GPU work, Windows compile, "check" errors

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 119 matching lines @@
     "image/image_util.h",
     "image/image_util_ios.mm",
     "interpolated_transform.cc",
     "interpolated_transform.h",
     "linux_font_delegate.cc",
     "linux_font_delegate.h",
     "mac/scoped_ns_disable_screen_updates.h",
     "native_widget_types.h",
     "nine_image_painter.cc",
     "nine_image_painter.h",
-    "ozone/dri/dri_skbitmap.cc",
-    "ozone/dri/dri_skbitmap.h",
-    "ozone/dri/dri_surface.cc",
-    "ozone/dri/dri_surface.h",
-    "ozone/dri/dri_surface_factory.cc",
-    "ozone/dri/dri_surface_factory.h",
-    "ozone/dri/dri_vsync_provider.cc",
-    "ozone/dri/dri_vsync_provider.h",
-    "ozone/dri/dri_wrapper.cc",
-    "ozone/dri/dri_wrapper.h",
-    "ozone/dri/hardware_display_controller.cc",
-    "ozone/dri/hardware_display_controller.h",
-    "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",
-    "pango_util.cc",
-    "pango_util.h",
     "path.cc",
     "path.h",
     "path_aura.cc",
     "path_win.cc",
     "path_win.h",
     "path_x11.cc",
     "path_x11.h",
     "platform_font.h",
     "platform_font_android.cc",
     "platform_font_ios.h",
     "platform_font_ios.mm",
     "platform_font_mac.h",
     "platform_font_mac.mm",
-    "platform_font_ozone.cc",
-    "platform_font_pango.cc",
-    "platform_font_pango.h",
     "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_ozone.cc",
-    "render_text_pango.cc",
-    "render_text_pango.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",
@@ skipping 121 matching lines @@
       "icon_util.h",
     ]
   }
 
   # Linux.
   if (is_linux) {
     configs += [ "//build/config/linux:fontconfig" ]
   }
 
   # Ozone stuff.
-  if (!use_ozone) {
-    sources -= [
+  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) {
-    configs += [ "//build/config/linux:dridrm" ]
-  } else {
-    sources -= [
+    sources += [
       "ozone/dri/dri_skbitmap.cc",
       "ozone/dri/dri_skbitmap.h",
       "ozone/dri/dri_surface.cc",
       "ozone/dri/dri_surface.h",
       "ozone/dri/dri_surface_factory.cc",
       "ozone/dri/dri_surface_factory.h",
       "ozone/dri/dri_vsync_provider.cc",
       "ozone/dri/dri_vsync_provider.h",
       "ozone/dri/dri_wrapper.cc",
       "ozone/dri/dri_wrapper.h",
       "ozone/dri/hardware_display_controller.cc",
       "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",
     ]
   }
 
   if (use_x11) {
     deps += [
       ":gfx_x11",
     ]
   } else {
     sources -= [
       "path_x11.cc",
     ]
   }
 
   if (use_pango) {
-    sources -= [
-      "platform_font_ozone.cc",
-      "render_text_ozone.cc",
-    ]
-    configs += [ "//build/config/linux:pangocairo" ]
-  } else {
-    sources -= [
+    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" ]
   }
 }
 
-component("gfx_geometry") {
-  sources = [
-    "geometry/box_f.cc",
-    "geometry/box_f.h",
-    "geometry/cubic_bezier.h",
-    "geometry/cubic_bezier.cc",
-    "geometry/insets.cc",
-    "geometry/insets.h",
-    "geometry/insets_base.h",
-    "geometry/insets_f.cc",
-    "geometry/insets_f.h",
-    "geometry/matrix3_f.cc",
-    "geometry/matrix3_f.h",
-    "geometry/point.cc",
-    "geometry/point.h",
-    "geometry/point3_f.cc",
-    "geometry/point3_f.h",
-    "geometry/point_base.h",
-    "geometry/point_conversions.cc",
-    "geometry/point_conversions.h",
-    "geometry/point_f.cc",
-    "geometry/point_f.h",
-    "geometry/quad_f.cc",
-    "geometry/quad_f.h",
-    "geometry/rect.cc",
-    "geometry/rect.h",
-    "geometry/rect_base.h",
-    "geometry/rect_base_impl.h",
-    "geometry/rect_conversions.cc",
-    "geometry/rect_conversions.h",
-    "geometry/rect_f.cc",
-    "geometry/rect_f.h",
-    "geometry/r_tree.cc",
-    "geometry/r_tree.h",
-    "geometry/safe_integer_conversions.h",
-    "geometry/size.cc",
-    "geometry/size.h",
-    "geometry/size_base.h",
-    "geometry/size_conversions.cc",
-    "geometry/size_conversions.h",
-    "geometry/size_f.cc",
-    "geometry/size_f.h",
-    "geometry/vector2d.cc",
-    "geometry/vector2d.h",
-    "geometry/vector2d_conversions.cc",
-    "geometry/vector2d_conversions.h",
-    "geometry/vector2d_f.cc",
-    "geometry/vector2d_f.h",
-    "geometry/vector3d_f.cc",
-    "geometry/vector3d_f.h",
-  ]
-  defines = [ "GFX_IMPLEMENTATION" ]
-  deps = [ "//base" ]
-}
+# Looking for gfx_geometry? It's //ui/gfx/geometry:geometry
 
 source_set("gfx_test_support") {
   sources = [
     "test/gfx_util.cc",
     "test/gfx_util.h",
     "test/ui_cocoa_test_helper.h",
     "test/ui_cocoa_test_helper.mm",
   ]
 
   deps = [
@@ skipping 62 matching lines @@
     ]
 
     configs += [ "//build/config/linux:x11" ]
 
     deps = [
       ":gfx_export",
       "//base"
     ]
   }
 }