Update from https://crrev.com/316786

skia/BUILD.gn

Index: skia/BUILD.gn
diff --git a/skia/BUILD.gn b/skia/BUILD.gn
index fb7da0744278afafbf7282af36238ba6ce764c87..85ccce735a524d038fe4407d25d34ab3445db8e9 100644
--- a/skia/BUILD.gn
+++ b/skia/BUILD.gn
@@ -116,27 +116,14 @@ config("skia_config") {
     "//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" ]
@@ -152,12 +139,6 @@ config("skia_config") {
     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",
@@ -175,7 +156,15 @@ 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" ]
   }
@@ -183,25 +172,7 @@ config("skia_library_config") {
     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" ]
@@ -255,7 +226,7 @@ config("skia_library_config") {
   }
 
   if (is_win) {
-    include_dirs = [
+    include_dirs += [
       "//third_party/skia/include/utils/win",
       "//third_party/skia/src/utils/win",
     ]