Update from https://crrev.com/316786

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 (cpu_arch == "arm") {
   import("//build/config/arm.gni")
 }
@@ skipping 98 matching lines @@
     "//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",
+
+    # need to move this to internal. see crbug.com/457691
     "//third_party/skia/src/core",
-    "//third_party/skia/src/image",
-    "//third_party/skia/src/opts",
-    "//third_party/skia/src/pdf",
-    "//third_party/skia/src/ports",
-    "//third_party/skia/src/sfnt",
-    "//third_party/skia/src/utils",
-    "//third_party/skia/src/lazy",
   ]
 
   defines = gypi_skia_defines.skia_for_chromium_defines
 
-  defines += [
-    "SK_ENABLE_INST_COUNT=0",
-    "GR_GL_CUSTOM_SETUP_HEADER=\"GrGLConfig_chrome.h\"",
-    "SK_ENABLE_LEGACY_API_ALIASING=1",
-    "SK_ATTR_DEPRECATED=SK_NOTHING_ARG1",
-    "GR_GL_IGNORE_ES3_MSAA=0",
-    "SK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT",
-    "SK_SUPPORT_LEGACY_GETTOTALCLIP",
-  ]
+  defines += []
 
   if (component_mode == "shared_library") {
     defines += [ "SKIA_DLL" ]
   }
 
   if (skia_support_gpu) {
     include_dirs += [
       "//third_party/skia/include/gpu",
       "//third_party/skia/src/gpu",
     ]
     defines += [ "SK_SUPPORT_GPU=1" ]
   } else {
     defines += [ "SK_SUPPORT_GPU=0" ]
   }
 
-  # For POSIX platforms, prefer the Mutex implementation provided by Skia
-  # since it does not generate static initializers.
-  if (is_posix) {
-    defines += [ "SK_USE_POSIX_THREADS" ]
-  }
-
   if (is_android) {
     defines += [
       "SK_BUILD_FOR_ANDROID",
       "USE_CHROMIUM_SKIA",
     ]
   }
 
   if (is_mac) {
     defines += [ "SK_BUILD_FOR_MAC" ]
   }
 }
 
 # Internal-facing config for Skia library code.
 config("skia_library_config") {
   # These include directories are only included for Skia code and are not
   # exported to dependents. It's not clear if this is on purpose, but this
   # matches the GYP build.
-  include_dirs = []
+  include_dirs = [
+    "//third_party/skia/src/image",
+    "//third_party/skia/src/opts",
+    "//third_party/skia/src/pdf",
+    "//third_party/skia/src/ports",
+    "//third_party/skia/src/sfnt",
+    "//third_party/skia/src/utils",
+    "//third_party/skia/src/lazy",
+  ]
   if (is_mac || is_ios) {
     include_dirs += [ "//third_party/skia/include/utils/mac" ]
   }
   if (is_mac) {
     include_dirs += [ "//third_party/skia/include/utils/ios" ]
   }
 
-  defines = [
-    #skia_export_defines ???) TODO
-
-    # skia uses static initializers to initialize the serialization logic
-    # of its "pictures" library. This is currently not used in chrome; if
-    # it ever gets used the processes that use it need to call
-    # SkGraphics::Init().
-    "SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0",
-
-    # Forcing the unoptimized path for the offset image filter in skia until
-    # all filters used in Blink support the optimized path properly
-    "SK_DISABLE_OFFSETIMAGEFILTER_OPTIMIZATION",
-    "IGNORE_ROT_AA_RECT_OPT",
-    "SK_IGNORE_BLURRED_RRECT_OPT",
-
-    # this flag forces Skia not to use typographic metrics with GDI.
-    "SK_GDI_ALWAYS_USE_TEXTMETRICS_FOR_FONT_METRICS",
-    "SK_USE_DISCARDABLE_SCALEDIMAGECACHE",
-  ]
+  defines = []
 
   if (component_mode == "shared_library") {
     defines += [ "SKIA_IMPLEMENTATION=1" ]
   }
 
   if (cpu_arch == "arm") {
     if (arm_use_neon) {
       defines += [ "SK_ARM_HAS_NEON" ]
     }
     if (arm_optionally_use_neon) {
@@ skipping 33 matching lines @@
       # Android devices are typically more memory constrained, so default to a
       # smaller glyph cache (it may be overriden at runtime when the renderer
       # starts up, depending on the actual device memory).
       "SK_DEFAULT_FONT_CACHE_LIMIT=1048576",  # 1024 * 1024
     ]
   } else {
     defines += [ "SK_DEFAULT_FONT_CACHE_LIMIT=20971520" ]  # 20 * 1024 * 1024
   }
 
   if (is_win) {
-    include_dirs = [
+    include_dirs += [
       "//third_party/skia/include/utils/win",
       "//third_party/skia/src/utils/win",
     ]
 
     defines += [ "SK_FONTHOST_USES_FONTMGR" ]
 
     cflags = [
       "/wd4244",  # conversion from 'type1( __int64)' to 'type2 (unsigned int)'
       "/wd4267",  # conversion from 'size_t' (64 bit) to 'type'(32 bit).
       "/wd4341",  # signed value is out of range for enum constant.
@@ skipping 369 matching lines @@
 
   deps = [
     ":skia",
     "//base",
     "//base/test:run_all_unittests",
     "//testing/gtest",
     "//ui/gfx",
     "//ui/gfx/geometry",
   ]
 }