Manually roll Skia, picking up new SSE4 procs.

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")
 if (cpu_arch == "arm") {
   import("//build/config/arm.gni")
 }
 
@@ skipping 520 matching lines @@
       "//third_party/skia/src/opts/opts_check_x86.cpp",
       "//third_party/skia/src/opts/SkBitmapFilter_opts_SSE2.cpp",
       "//third_party/skia/src/opts/SkBitmapProcState_opts_SSE2.cpp",
       "//third_party/skia/src/opts/SkBlitRect_opts_SSE2.cpp",
       "//third_party/skia/src/opts/SkBlitRow_opts_SSE2.cpp",
       "//third_party/skia/src/opts/SkBlurImage_opts_SSE2.cpp",
       "//third_party/skia/src/opts/SkMorphology_opts_SSE2.cpp",
       "//third_party/skia/src/opts/SkUtils_opts_SSE2.cpp",
       "//third_party/skia/src/opts/SkXfermode_opts_SSE2.cpp",
 
-      # SSE 3
+      # SSSE 3
       "//third_party/skia/src/opts/SkBitmapProcState_opts_SSSE3.cpp",
 
       # Chrome-specific.
       "ext/convolver_SSE2.cc",
 
       # These are header files used by this target from the skia one above.
       "ext/convolver.h",
       "//third_party/skia/include/core/SkTypes.h",
     ]
 
+    # SSE 4
+    if (cpu_arch == "x86") {
+      sources += [ "//third_party/skia/src/opts/SkBlitRow_opts_SSE4_asm.S" ]
+    } else {  # x64
+      sources += [ "//third_party/skia/src/opts/SkBlitRow_opts_SSE4_x64_asm.S" ]
+    }
+
     if (is_linux || is_mac) {
-      cflags += [ "-mssse3" ]  # Note third 's'.
+      cflags += [ "-msse4" ]
     }
   } else if (cpu_arch == "arm") {
     sources = [
       "//third_party/skia/src/opts/SkBitmapProcState_opts_arm.cpp",
     ]
 
     # The assembly uses the frame pointer register (r7 in Thumb/r11 in
     # ARM), the compiler doesn't like that.
     cflags += [ "-fomit-frame-pointer" ]
 
@@ skipping 85 matching lines @@
     ":skia_config",
     "//build/config/compiler:no_chromium_code"
   ]
 
   deps = [
     "//base",
   ]
 
   visibility = ":skia"
 }