commit 429a9ffa075b7da1910145c018d97f28418d6ed2
author caryclark <caryclark@google.com> Tue Oct 04 06:32:58 2016 -0700
committer Commit bot <commit-bot@chromium.org> Tue Oct 04 06:32:58 2016 -0700
tree 9f4daf4f175bc47cdfd1960794462c095f88f9ba
parent b73c99335bfbd158ad16dd59c9c52396ffd2b54b

update skia to latest sources

Update clip to use intersect verb
from canvas.

R=dsinclair@chromium.org

Review-Url: https://codereview.chromium.org/2384283002

skia/BUILD.gn

diff --git a/skia/BUILD.gn b/skia/BUILD.gn
index 61790eb..43342b6 100644
--- a/skia/BUILD.gn
+++ b/skia/BUILD.gn
@@ -175,18 +175,17 @@
   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_common.cpp",
     "//third_party/skia/src/ports/SkFontHost_FreeType.cpp",
+    "//third_party/skia/src/ports/SkFontHost_FreeType_common.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",
@@ -415,10 +414,16 @@
       "//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" ]
@@ -440,7 +445,7 @@
     sources = skia_opts.sse2_sources
     deps = [
       ":skia_opts_avx",
-      ":skia_opts_avx2",
+      ":skia_opts_hsw",
       ":skia_opts_sse3",
       ":skia_opts_sse41",
       ":skia_opts_sse42",