update skia to latest sources

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 157 matching lines @@
     # PDFium sources.
     "config/SkUserConfig.h",
     "ext/google_logging.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 += [
-    "//third_party/skia/src/ports/SkImageGenerator_none.cpp",
-
     "//third_party/skia/src/fonts/SkFontMgr_indirect.cpp",
     "//third_party/skia/src/fonts/SkRemotableFontMgr.cpp",
+    "//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",
     "//third_party/skia/src/ports/SkFontHost_win.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/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",
@@ skipping 208 matching lines @@
       cflags = [ "/arch:AVX" ]
     }
     visibility = [ ":skia_opts" ]
     configs -= [ "//build/config/compiler:chromium_code" ]
     configs += [
       ":skia_config",
       ":skia_library_config",
       "//build/config/compiler:no_chromium_code",
     ]
   }
-  source_set("skia_opts_avx2") {
-    sources = skia_opts.avx2_sources
+  source_set("skia_opts_hsw") {
+    sources = skia_opts.hsw_sources
     if (!is_win) {
-      cflags = [ "-mavx2" ]
+      cflags = [
+        "-mavx2",
+        "-mbmi",
+        "-mbmi2",
+        "-mf16c",
+        "-mfma",
+      ]
     }
     if (is_win) {
       cflags = [ "/arch:AVX2" ]
     }
     visibility = [ ":skia_opts" ]
     configs -= [ "//build/config/compiler:chromium_code" ]
     configs += [
       ":skia_config",
       ":skia_library_config",
       "//build/config/compiler:no_chromium_code",
     ]
   }
 }
 source_set("skia_opts") {
   cflags = []
   defines = []
 
   if (current_cpu == "x86" || current_cpu == "x64") {
     sources = skia_opts.sse2_sources
     deps = [
       ":skia_opts_avx",
-      ":skia_opts_avx2",
+      ":skia_opts_hsw",
       ":skia_opts_sse3",
       ":skia_opts_sse41",
       ":skia_opts_sse42",
     ]
   } else if (current_cpu == "arm") {
     # The assembly uses the frame pointer register (r7 in Thumb/r11 in
     # ARM), the compiler doesn't like that.
     cflags += [ "-fomit-frame-pointer" ]
 
     if (arm_version >= 7) {
@@ skipping 35 matching lines @@
 
   configs -= [ "//build/config/compiler:chromium_code" ]
   configs += [
     ":skia_config",
     ":skia_library_config",
     "//build/config/compiler:no_chromium_code",
   ]
 
   visibility = [ ":skia" ]
 }