Chromium roll (https://codereview.chromium.org/976353002)

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")
 if (current_cpu == "arm") {
   import("//build/config/arm.gni")
 }
@@ skipping 233 matching lines @@
                   # assembly code contains flow control(jmp or jcc) statements.
       "/wd4800",  # forcing value to bool 'true/false'(assigning int to bool).
     ]
   }
 }
 
 component("skia") {
   sources = [
     # Chrome sources.
     "config/SkUserConfig.h",
+    "ext/SkDiscardableMemory_chrome.cc",
+    "ext/SkDiscardableMemory_chrome.h",
+    "ext/SkMemory_new_handler.cpp",
     "ext/analysis_canvas.cc",
     "ext/analysis_canvas.h",
     "ext/benchmarking_canvas.cc",
     "ext/benchmarking_canvas.h",
     "ext/bitmap_platform_device.h",
     "ext/convolver.cc",
     "ext/convolver.h",
     "ext/event_tracer_impl.cc",
     "ext/event_tracer_impl.h",
     "ext/fontmgr_default_win.cc",
     "ext/fontmgr_default_win.h",
     "ext/google_logging.cc",
     "ext/image_operations.cc",
     "ext/image_operations.h",
     "ext/opacity_draw_filter.cc",
     "ext/opacity_draw_filter.h",
     "ext/pixel_ref_utils.cc",
     "ext/pixel_ref_utils.h",
     "ext/platform_canvas.cc",
     "ext/platform_canvas.h",
     "ext/platform_device.cc",
     "ext/platform_device.h",
     "ext/platform_device_linux.cc",
     "ext/platform_device_mac.cc",
     "ext/platform_device_win.cc",
     "ext/recursive_gaussian_convolution.cc",
     "ext/recursive_gaussian_convolution.h",
     "ext/refptr.h",
-    "ext/SkDiscardableMemory_chrome.h",
-    "ext/SkDiscardableMemory_chrome.cc",
-    "ext/SkMemory_new_handler.cpp",
     "ext/skia_utils_base.cc",
     "ext/skia_utils_base.h",
+    "ext/skia_utils_ios.h",
     "ext/skia_utils_ios.mm",
-    "ext/skia_utils_ios.h",
+    "ext/skia_utils_mac.h",
     "ext/skia_utils_mac.mm",
-    "ext/skia_utils_mac.h",
     "ext/skia_utils_win.cc",
     "ext/skia_utils_win.h",
   ]
 
   # The skia gypi values are relative to the skia_dir, so we need to rebase.
   sources += gypi_skia_core.sources
   sources += gypi_skia_effects.sources
   sources += gypi_skia_utils.sources
   sources += gypi_values.skia_library_sources
 
   # 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",
       "//third_party/skia/src/core/SkUtilsArm.h",
     ]
   }
 
   # GPU
   if (skia_support_gpu) {
     sources += gypi_skia_gpu.skgpu_sources
     sources += gypi_skia_gpu.skgpu_null_gl_sources
   }
 
   # Remove unused util files include in utils.gypi
   sources -= [
     "//third_party/skia/include/utils/SkBoundaryPatch.h",
-    "//third_party/skia/include/utils/SkFrontBufferedStream.h",
     "//third_party/skia/include/utils/SkCamera.h",
     "//third_party/skia/include/utils/SkCanvasStateUtils.h",
     "//third_party/skia/include/utils/SkCubicInterval.h",
     "//third_party/skia/include/utils/SkCullPoints.h",
     "//third_party/skia/include/utils/SkDebugUtils.h",
     "//third_party/skia/include/utils/SkDumpCanvas.h",
     "//third_party/skia/include/utils/SkEventTracer.h",
+    "//third_party/skia/include/utils/SkFrontBufferedStream.h",
     "//third_party/skia/include/utils/SkInterpolator.h",
     "//third_party/skia/include/utils/SkLayer.h",
     "//third_party/skia/include/utils/SkMeshUtils.h",
     "//third_party/skia/include/utils/SkNinePatch.h",
-    "//third_party/skia/include/utils/SkParse.h",
     "//third_party/skia/include/utils/SkParsePaint.h",
     "//third_party/skia/include/utils/SkParsePath.h",
     "//third_party/skia/include/utils/SkRandom.h",
     "//third_party/skia/src/utils/SkBitmapHasher.cpp",
     "//third_party/skia/src/utils/SkBitmapHasher.h",
     "//third_party/skia/src/utils/SkBoundaryPatch.cpp",
-    "//third_party/skia/src/utils/SkFrontBufferedStream.cpp",
     "//third_party/skia/src/utils/SkCamera.cpp",
     "//third_party/skia/src/utils/SkCanvasStack.h",
     "//third_party/skia/src/utils/SkCubicInterval.cpp",
     "//third_party/skia/src/utils/SkCullPoints.cpp",
     "//third_party/skia/src/utils/SkDumpCanvas.cpp",
     "//third_party/skia/src/utils/SkFloatUtils.h",
+    "//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/SkMD5.cpp",
     "//third_party/skia/src/utils/SkMD5.h",
     "//third_party/skia/src/utils/SkMeshUtils.cpp",
     "//third_party/skia/src/utils/SkNinePatch.cpp",
     "//third_party/skia/src/utils/SkOSFile.cpp",
-    "//third_party/skia/src/utils/SkParse.cpp",
-    "//third_party/skia/src/utils/SkParseColor.cpp",
     "//third_party/skia/src/utils/SkParsePath.cpp",
     "//third_party/skia/src/utils/SkPathUtils.cpp",
     "//third_party/skia/src/utils/SkSHA1.cpp",
     "//third_party/skia/src/utils/SkSHA1.h",
     "//third_party/skia/src/utils/SkTFitsIn.h",
     "//third_party/skia/src/utils/SkTLogic.h",
 
     # We don't currently need to change thread affinity, so leave out this complexity for now.
+    "//third_party/skia/src/utils/SkThreadUtils_pthread_linux.cpp",
     "//third_party/skia/src/utils/SkThreadUtils_pthread_mach.cpp",
-    "//third_party/skia/src/utils/SkThreadUtils_pthread_linux.cpp",
 
     #testing
     "//third_party/skia/src/fonts/SkGScalerContext.cpp",
     "//third_party/skia/src/fonts/SkGScalerContext.h",
   ]
 
   if (is_win) {
     sources -= [
       # Keeping _win.cpp
       "//third_party/skia/src/utils/SkThreadUtils_pthread.cpp",
@@ skipping 22 matching lines @@
   }
 
   if (is_android && (!enable_basic_printing && !enable_print_preview)) {
     sources -= [ "ext/skia_utils_base.cc" ]
   }
 
   # Fixup skia library sources.
   if (is_win) {
     sources -= [
       "//third_party/skia/src/ports/SkOSFile_posix.cpp",
+      "//third_party/skia/src/ports/SkTLS_pthread.cpp",
       "//third_party/skia/src/ports/SkTime_Unix.cpp",
-      "//third_party/skia/src/ports/SkTLS_pthread.cpp",
     ]
   } else {
     sources -= [
       "//third_party/skia/src/ports/SkFontHost_win.cpp",
       "//third_party/skia/src/ports/SkFontMgr_win_dw.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/SkScalerContext_win_dw.h",
       "//third_party/skia/src/ports/SkTLS_win.cpp",
       "//third_party/skia/src/ports/SkTypeface_win_dw.cpp",
       "//third_party/skia/src/ports/SkTypeface_win_dw.h",
     ]
   }
   if (!is_android) {
     sources -= [
       "//third_party/skia/src/ports/SkFontConfigParser_android.cpp",
       "//third_party/skia/src/ports/SkFontMgr_android.cpp",
     ]
   }
   if (!is_mac) {
     sources -= [ "//third_party/skia/src/ports/SkFontHost_mac.cpp" ]
   }
 
   if (!is_linux) {
     sources -= [
-      "//third_party/skia/src/ports/SkFontHost_fontconfig.cpp",
       "//third_party/skia/src/fonts/SkFontMgr_fontconfig.cpp",
       "//third_party/skia/src/ports/SkFontConfigInterface_direct.cpp",
+      "//third_party/skia/src/ports/SkFontHost_fontconfig.cpp",
     ]
   }
 
   if (!is_linux && !is_android) {
     sources -= [
+      "//third_party/skia/src/ports/SkFontHost_FreeType.cpp",
       "//third_party/skia/src/ports/SkFontHost_FreeType_common.cpp",
-      "//third_party/skia/src/ports/SkFontHost_FreeType.cpp",
     ]
   }
 
   # Select the right BitmapPlatformDevice.
   if (is_win) {
     sources += [
       "ext/bitmap_platform_device_win.cc",
       "ext/bitmap_platform_device_win.h",
     ]
   } else if (is_mac) {
@@ skipping 158 matching lines @@
   deps = [
     ":skia",
     "//base",
     "//base/test:run_all_unittests",
     "//cc:test_support",  # TODO: Fix this test to not depend on cc.
     "//testing/gtest",
     "//ui/gfx",
     "//ui/gfx/geometry",
   ]
 }