Refactor swizzle names and types.

src/core/SkOpts.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkOnce.h"
 #include "SkOpts.h"
 
@@ skipping 63 matching lines @@
     decltype(fill_block_dimensions) fill_block_dimensions = sk_default::fill_block_dimensions;
 
     decltype(blit_mask_d32_a8) blit_mask_d32_a8 = sk_default::blit_mask_d32_a8;
 
     decltype(blit_row_color32) blit_row_color32 = sk_default::blit_row_color32;
 
     decltype(matrix_translate)       matrix_translate       = sk_default::matrix_translate;
     decltype(matrix_scale_translate) matrix_scale_translate = sk_default::matrix_scale_translate;
     decltype(matrix_affine)          matrix_affine          = sk_default::matrix_affine;
 
-    decltype(       premul_xxxa)        premul_xxxa = sk_default::       premul_xxxa;
-    decltype(       swaprb_xxxa)        swaprb_xxxa = sk_default::       swaprb_xxxa;
-    decltype(premul_swaprb_xxxa) premul_swaprb_xxxa = sk_default::premul_swaprb_xxxa;
+    decltype(RGBA_to_BGRA) RGBA_to_BGRA = sk_default::RGBA_to_BGRA;
+    decltype(RGBA_to_rgbA) RGBA_to_rgbA = sk_default::RGBA_to_rgbA;
+    decltype(RGBA_to_bgrA) RGBA_to_bgrA = sk_default::RGBA_to_bgrA;
 
     // Each Init_foo() is defined in src/opts/SkOpts_foo.cpp.
     void Init_ssse3();
     void Init_sse41();
     void Init_sse42() {}
     void Init_avx();
     void Init_avx2() {}
     void Init_neon();
 
     static void init() {
@@ skipping 26 matching lines @@
 
     SK_DECLARE_STATIC_ONCE(gInitOnce);
     void Init() { SkOnce(&gInitOnce, init); }
 
 #if SK_ALLOW_STATIC_GLOBAL_INITIALIZERS
     static struct AutoInit {
         AutoInit() { Init(); }
     } gAutoInit;
 #endif
 }