Remove Skia GYP files from Chromium tree.

skia/BUILD.gn

Index: skia/BUILD.gn
diff --git a/skia/BUILD.gn b/skia/BUILD.gn
index 1f0c6a5672d2b8696ef31aafa6df56429c421077..524478280e79fb01f9210afac321ecd95eaa06c4 100644
--- a/skia/BUILD.gn
+++ b/skia/BUILD.gn
@@ -30,27 +30,21 @@ declare_args() {
   skia_build_no_opts = is_ios
 }
 
-# The list of Skia defines that are to be set for chromium.
-gypi_chromium_skia_defines =
-    exec_script("//build/gypi_to_gn.py",
-                [
-                  rebase_path("//skia/chromium_skia_defines.gypi"),
-                  "--replace=<(skia_include_path)=//third_party/skia/include",
-                  "--replace=<(skia_src_path)=//third_party/skia/src",
-                ],
-                "scope",
-                [ "//skia/chromium_skia_defines.gypi" ])
-
-# The list of Skia files is kept in skia_gn_files.gypi. Read it.
-gypi_values =
-    exec_script("//build/gypi_to_gn.py",
-                [
-                  rebase_path("skia_gn_files.gypi"),
-                  "--replace=<(skia_include_path)=//third_party/skia/include",
-                  "--replace=<(skia_src_path)=//third_party/skia/src",
-                ],
-                "scope",
-                [ "skia_gn_files.gypi" ])
+# This is a place for defines which will hold out Skia changes.
+#
+# When Skia needs to make a change which will affect Chromium, a define may be
+# added here, the Skia change made behind this define, then Skia rolled into
+# Chromium. At this point the Chromium side change can be made while also
+# removing the define. After this Skia can remove the code behind the now no
+# longer needed define.
+#
+# Examples of these sorts of changes are Skia API changes and Skia changes
+# which will affect blink baselines.
+#
+# The intent is that the defines here are transient. Every effort should be
+# made to remove these defines as soon as practical. This is in contrast to
+# defines in SkUserConfig.h which are normally more permanent.
+chromium_skia_defines = [ "SK_IGNORE_DW_GRAY_FIX" ]

[mtklein_C, 2016/09/02 18:36:21]

If you like I think we can just make line 67

  defines = [ "SK_IGNORE_DW_GRAY_FIX" ]

and remove 33-47?

I'm not sure we need to keep around all these long-winded explanations of the
various ways we can define things, where they should go, for how long, etc.

 
 # External-facing config for dependent code.
 config("skia_config") {
@@ -70,7 +64,7 @@ config("skia_config") {
     "//third_party/skia/include/utils",
   ]
 
-  defines = gypi_chromium_skia_defines.chromium_skia_defines
+  defines = chromium_skia_defines
   defines += skia_for_chromium_defines
 
   defines += []
@@ -260,7 +254,39 @@ component("skia") {
   sources += skia_core_sources
   sources += skia_effects_sources
   sources += skia_utils_sources
-  sources += gypi_values.skia_library_sources
+  sources += [
+    "//third_party/skia/src/fonts/SkFontMgr_indirect.cpp",
+    "//third_party/skia/src/fonts/SkRemotableFontMgr.cpp",
+    "//third_party/skia/src/ports/SkFontConfigInterface_direct.cpp",
+    "//third_party/skia/src/ports/SkFontConfigInterface_direct_factory.cpp",
+    "//third_party/skia/src/ports/SkFontHost_FreeType.cpp",
+    "//third_party/skia/src/ports/SkFontHost_FreeType_common.cpp",
+    "//third_party/skia/src/ports/SkFontHost_mac.cpp",
+    "//third_party/skia/src/ports/SkFontHost_win.cpp",
+    "//third_party/skia/src/ports/SkFontMgr_FontConfigInterface.cpp",
+    "//third_party/skia/src/ports/SkFontMgr_FontConfigInterface_factory.cpp",
+    "//third_party/skia/src/ports/SkFontMgr_android.cpp",
+    "//third_party/skia/src/ports/SkFontMgr_android_factory.cpp",
+    "//third_party/skia/src/ports/SkFontMgr_android_parser.cpp",
+    "//third_party/skia/src/ports/SkFontMgr_win_dw.cpp",
+    "//third_party/skia/src/ports/SkGlobalInitialization_default.cpp",
+    "//third_party/skia/src/ports/SkImageEncoder_none.cpp",
+    "//third_party/skia/src/ports/SkImageGenerator_none.cpp",
+    "//third_party/skia/src/ports/SkOSFile_posix.cpp",
+    "//third_party/skia/src/ports/SkOSFile_stdio.cpp",
+    "//third_party/skia/src/ports/SkOSFile_win.cpp",
+    "//third_party/skia/src/ports/SkRemotableFontMgr_win_dw.cpp",
+    "//third_party/skia/src/ports/SkScalerContext_win_dw.cpp",
+    "//third_party/skia/src/ports/SkTLS_pthread.cpp",
+    "//third_party/skia/src/ports/SkTLS_win.cpp",
+    "//third_party/skia/src/ports/SkTypeface_win_dw.cpp",
+    "//third_party/skia/src/sfnt/SkOTTable_name.cpp",
+    "//third_party/skia/src/sfnt/SkOTUtils.cpp",
+  ]
+
+  if (is_mac) {
+    sources += [ "//third_party/skia/src/utils/mac/SkStream_mac.cpp" ]
+  }
 
   # This and skia_opts are really the same conceptual target so share headers.
   allow_circular_includes_from = [ ":skia_opts" ]
@@ -287,7 +313,7 @@ component("skia") {
     "//third_party/skia/src/utils/SkOSFile.cpp",
     "//third_party/skia/src/utils/SkParsePath.cpp",
 
-    #testing
+    # Testing.
     "//third_party/skia/src/fonts/SkGScalerContext.cpp",
   ]