Roll Skia to f459c85457c

skia/BUILD.gn

Index: skia/BUILD.gn
diff --git a/skia/BUILD.gn b/skia/BUILD.gn
index df86f1a04570ce06d87da04391baf70b8b3ff161..c585e4472db378559412115f018fa0f5329abcc4 100644
--- a/skia/BUILD.gn
+++ b/skia/BUILD.gn
@@ -545,6 +545,8 @@ source_set("skia_opts") {
 
   if (cpu_arch == "x86" || cpu_arch == "x64") {
     sources = [
+      "//third_party/skia/src/opts/SkTextureCompression_opts_none.cpp",
+
       # SSE 2
       "//third_party/skia/src/opts/opts_check_x86.cpp",
       "//third_party/skia/src/opts/SkBitmapFilter_opts_SSE2.cpp",
@@ -583,6 +585,7 @@ source_set("skia_opts") {
   } else if (cpu_arch == "arm") {
     sources = [
       "//third_party/skia/src/opts/SkBitmapProcState_opts_arm.cpp",
+      "//third_party/skia/src/opts/SkTextureCompression_opts_arm.cpp",
     ]
 
     # The assembly uses the frame pointer register (r7 in Thumb/r11 in
@@ -592,17 +595,18 @@ source_set("skia_opts") {
     if (arm_version >= 7) {
       if (arm_use_neon || arm_optionally_use_neon) {
         sources += [
-          "//third_party/skia/src/opts/memset16_neon.S",
-          "//third_party/skia/src/opts/memset32_neon.S",
           "//third_party/skia/src/opts/SkBitmapProcState_arm_neon.cpp",
           "//third_party/skia/src/opts/SkBitmapProcState_matrixProcs_neon.cpp",
           "//third_party/skia/src/opts/SkBitmapProcState_matrix_clamp_neon.h",
           "//third_party/skia/src/opts/SkBitmapProcState_matrix_repeat_neon.h",
           "//third_party/skia/src/opts/SkBlitMask_opts_arm_neon.cpp",
           "//third_party/skia/src/opts/SkBlitRow_opts_arm_neon.cpp",
-          "//third_party/skia/src/opts/SkXfermode_opts_arm_neon.cpp",
           "//third_party/skia/src/opts/SkBlurImage_opts_neon.cpp",
           "//third_party/skia/src/opts/SkMorphology_opts_neon.cpp",
+          "//third_party/skia/src/opts/SkTextureCompression_opts_neon.cpp",
+          "//third_party/skia/src/opts/SkXfermode_opts_arm_neon.cpp",
+          "//third_party/skia/src/opts/memset16_neon.S",
+          "//third_party/skia/src/opts/memset32_neon.S",
         ]
 
         cflags += [
@@ -663,10 +667,11 @@ source_set("skia_opts") {
       "//third_party/skia/src/opts/SkBitmapProcState_opts_none.cpp",
       "//third_party/skia/src/opts/SkBlitMask_opts_none.cpp",
       "//third_party/skia/src/opts/SkBlitRow_opts_none.cpp",
+      "//third_party/skia/src/opts/SkBlurImage_opts_none.cpp",
+      "//third_party/skia/src/opts/SkMorphology_opts_none.cpp",
+      "//third_party/skia/src/opts/SkTextureCompression_opts_none.cpp",
       "//third_party/skia/src/opts/SkUtils_opts_none.cpp",
       "//third_party/skia/src/opts/SkXfermode_opts_none.cpp",
-      "//third_party/skia/src/opts/SkMorphology_opts_none.cpp",
-      "//third_party/skia/src/opts/SkBlurImage_opts_none.cpp",
     ]
   } else {
     assert(false, "Need to port cpu specific stuff from skia_library_opts.gyp")