Remove Skia GYP files from Chromium tree.

skia/BUILD.gn

 # Copyright (c) 2013 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/features.gni")
 import("//build/config/ui.gni")
 import("//testing/test.gni")
 import("//third_party/skia/gn/shared_sources.gni")
 
 if (current_cpu == "arm") {
@@ skipping 12 matching lines @@
 # the OWNERS of skia.
 
 declare_args() {
   skia_whitelist_serialized_typefaces = false
 
   # TODO(crbug.com/607933): Once GYP is no longer supported, port iOS to use
   # optimised skia.
   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") {
   include_dirs = [
     "config",
     "ext",
     "//third_party/skia/include/c",
     "//third_party/skia/include/config",
     "//third_party/skia/include/core",
     "//third_party/skia/include/effects",
     "//third_party/skia/include/images",
     "//third_party/skia/include/lazy",
     "//third_party/skia/include/pathops",
     "//third_party/skia/include/pdf",
     "//third_party/skia/include/pipe",
     "//third_party/skia/include/ports",
     "//third_party/skia/include/utils",
   ]
 
-  defines = gypi_chromium_skia_defines.chromium_skia_defines
+  defines = chromium_skia_defines
   defines += skia_for_chromium_defines
 
   defines += []
 
   if (skia_build_no_opts) {
     defines += [ "SK_BUILD_NO_OPTS" ]
   }
 
   if (is_component_build) {
     defines += [
@@ skipping 169 matching lines @@
   if (!is_ios && (current_cpu == "x86" || current_cpu == "x64")) {
     sources += [ "ext/convolver_SSE2.cc" ]
   } else if (current_cpu == "mipsel" && mips_dsp_rev >= 2) {
     sources += [ "ext/convolver_mips_dspr2.cc" ]
   }
 
   # The skia gypi values are relative to the skia_dir, so we need to rebase.
   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" ]
 
   if (current_cpu == "arm") {
     sources += [ "//third_party/skia/src/core/SkUtilsArm.cpp" ]
   }
 
   # GPU
   if (skia_support_gpu) {
     sources += skia_gpu_sources
     sources += skia_null_gpu_sources
   }
 
   # Remove unused util files include in utils.gypi
   sources -= [
     "//third_party/skia/src/utils/SkBoundaryPatch.cpp",
     "//third_party/skia/src/utils/SkCamera.cpp",
     "//third_party/skia/src/utils/SkDumpCanvas.cpp",
     "//third_party/skia/src/utils/SkFrontBufferedStream.cpp",
     "//third_party/skia/src/utils/SkInterpolator.cpp",
     "//third_party/skia/src/utils/SkLayer.cpp",
     "//third_party/skia/src/utils/SkMeshUtils.cpp",
     "//third_party/skia/src/utils/SkOSFile.cpp",
     "//third_party/skia/src/utils/SkParsePath.cpp",
 
-    #testing
+    # Testing.
     "//third_party/skia/src/fonts/SkGScalerContext.cpp",
   ]
 
   if (is_win) {
     sources -= [
       # Keeping _win.cpp
       "//third_party/skia/src/utils/SkThreadUtils_pthread.cpp",
     ]
   } else {
     sources -= [
@@ skipping 395 matching lines @@
 
     deps = [
       ":skia",
       "//base",
       "//base/test:test_support",
       "//build/config/sanitizers:deps",
       "//build/win:default_exe_manifest",
     ]
   }
 }