Roll Skia to f459c85457c

https://skia.googlesource.com/skia/+log/bf0b9ced0b..f459c85457c

Updates Chrome GN and GYP for Pavel's SkTextureCompressor opts.

Due to http://crbug.com/393856, landing now
NOTRY=True

Review URL: https://codereview.chromium.org/389343005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@283230 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 36 insertions, 19 deletions

diff --git a/skia/BUILD.gn b/skia/BUILD.gn
index 3c32f67..b626d3e 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",
@@ -592,17 +594,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 += [
@@ -639,10 +642,11 @@ source_set("skia_opts") {
       sources += [
         "//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 {
       # arm version >= 6.
@@ -652,6 +656,7 @@ source_set("skia_opts") {
         "//third_party/skia/src/opts/SkBlitRow_opts_arm.h",
         "//third_party/skia/src/opts/SkBlurImage_opts_arm.cpp",
         "//third_party/skia/src/opts/SkMorphology_opts_arm.cpp",
+        "//third_party/skia/src/opts/SkTextureCompression_opts_arm.cpp",
         "//third_party/skia/src/opts/SkUtils_opts_arm.cpp",
         "//third_party/skia/src/opts/SkXfermode_opts_none.cpp",
       ]
@@ -663,10 +668,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")
diff --git a/skia/skia_library_opts.gyp b/skia/skia_library_opts.gyp
index e46273d..32c3979 100644
--- a/skia/skia_library_opts.gyp
+++ b/skia/skia_library_opts.gyp
@@ -35,6 +35,7 @@
         '../third_party/skia/include/effects',
         '../third_party/skia/src/core',
         '../third_party/skia/src/opts',
+        '../third_party/skia/src/utils',
       ],
       'conditions': [
         [ 'os_posix == 1 and OS != "mac" and OS != "android" and \
@@ -47,14 +48,15 @@
         [ 'target_arch != "arm" and target_arch != "mipsel" and \
            target_arch != "arm64"', {
           'sources': [
+            '../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/SkTextureCompression_opts_none.cpp',
             '../third_party/skia/src/opts/SkUtils_opts_SSE2.cpp',
             '../third_party/skia/src/opts/SkXfermode_opts_SSE2.cpp',
-            '../third_party/skia/src/opts/SkBitmapFilter_opts_SSE2.cpp',
-            '../third_party/skia/src/opts/SkMorphology_opts_SSE2.cpp',
-            '../third_party/skia/src/opts/SkBlurImage_opts_SSE2.cpp',
           ],
           'dependencies': [
             'skia_opts_ssse3',
@@ -111,10 +113,11 @@
           'sources': [
             '../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',
           ],
         }],
         [ 'target_arch == "arm" and arm_version >= 6', {
@@ -124,6 +127,7 @@
             '../third_party/skia/src/opts/SkBlitRow_opts_arm.h',
             '../third_party/skia/src/opts/SkBlurImage_opts_arm.cpp',
             '../third_party/skia/src/opts/SkMorphology_opts_arm.cpp',
+            '../third_party/skia/src/opts/SkTextureCompression_opts_arm.cpp',
             '../third_party/skia/src/opts/SkUtils_opts_arm.cpp',
             '../third_party/skia/src/opts/SkXfermode_opts_none.cpp',
           ],
@@ -136,10 +140,11 @@
             '../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',
           ],
         }],
         [ 'target_arch == "arm64"', {
@@ -154,6 +159,8 @@
             '../third_party/skia/src/opts/SkBlurImage_opts_neon.cpp',
             '../third_party/skia/src/opts/SkMorphology_opts_arm.cpp',
             '../third_party/skia/src/opts/SkMorphology_opts_neon.cpp',
+            '../third_party/skia/src/opts/SkTextureCompression_opts_arm.cpp',
+            '../third_party/skia/src/opts/SkTextureCompression_opts_neon.cpp',
             '../third_party/skia/src/opts/SkUtils_opts_none.cpp',
             '../third_party/skia/src/opts/SkXfermode_opts_arm.cpp',
             '../third_party/skia/src/opts/SkXfermode_opts_arm_neon.cpp',
@@ -255,15 +262,17 @@
         '../third_party/skia/include/core',
         '../third_party/skia/include/effects',
         '../third_party/skia/src/core',
+        '../third_party/skia/src/utils',
       ],
       'sources': [
         '../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',
       ],
     },
   ],
@@ -285,6 +294,7 @@
             '../third_party/skia/include/effects',
             '../third_party/skia/src/core',
             '../third_party/skia/src/opts',
+            '../third_party/skia/src/utils',
           ],
           'cflags!': [
             '-fno-omit-frame-pointer',
@@ -301,17 +311,18 @@
             '-Wl,--fix-cortex-a8',
           ],
           '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',
           ],
           'conditions': [
             ['arm_neon == 1', {