Roll Skia to f459c85457c

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 527 matching lines @@
   }
 }
 
 # Separated out so it can be compiled with different flags for SSE.
 source_set("skia_opts") {
   cflags = []
   defines = []
 
   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",
       "//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",
@@ skipping 18 matching lines @@
     } else {  # x64
       sources += [ "//third_party/skia/src/opts/SkBlitRow_opts_SSE4_x64_asm.S" ]
     }
 
     if (is_linux || is_mac) {
       cflags += [ "-msse4.1" ]
     }
   } 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
     # ARM), the compiler doesn't like that.
     cflags += [ "-fomit-frame-pointer" ]
 
     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 += [
           # The neon assembly contains conditional instructions which aren't
           # enclosed in an IT block. The assembler complains without this
           # option. See #86592.
           "-Wa,-mimplicit-it=always",
         ]
 
         # Root build config sets -mfpu=$arm_fpu, which we expect to be neon
         # when running this.
         assert(arm_fpu == "neon")
 
         #ldflags = [
         #  "-march=armv7-a",
         #  "-Wl,--fix-cortex-a8",
         #]
       }
 
       if (arm_use_neon) {
         defines += [ "__ARM_HAVE_NEON" ]
       }
       if (arm_optionally_use_neon) {
         defines += [ "__ARM_HAVE_OPTIONAL_NEON_SUPPORT" ]
       }
     }
 
     # Non-Neon ARM code.

[krajcevski, 2014/07/14 18:52:57]

Does one of these need a:
       "//third_party/skia/src/opts/SkTextureCompression_opts_none.cpp",

..?

     if (arm_version < 7 || (!arm_use_neon && arm_optionally_use_neon)) {
       sources += [ "//third_party/skia/src/opts/memset.arm.S" ]
     }
 
     if (arm_version < 6) {
       sources += [
         "//third_party/skia/src/opts/SkBlitMask_opts_none.cpp",
         "//third_party/skia/src/opts/SkBlitRow_opts_none.cpp",
         "//third_party/skia/src/opts/SkUtils_opts_none.cpp",
         "//third_party/skia/src/opts/SkXfermode_opts_none.cpp",
@@ skipping 12 matching lines @@
         "//third_party/skia/src/opts/SkXfermode_opts_none.cpp",
       ]
     }
 
   } else if (cpu_arch == "mipsel") {
     cflags += [ "-fomit-frame-pointer" ]
     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",
     ]
   } else {
     assert(false, "Need to port cpu specific stuff from skia_library_opts.gyp")
   }
 
   configs -= [ "//build/config/compiler:chromium_code" ]
   configs += [
     ":skia_config",
     "//build/config/compiler:no_chromium_code"
   ]
 
   deps = [
     "//base",
   ]
 
   visibility = ":skia"
 }