Refactor swizzle names and types.

tests/SwizzlerTest.cpp

Index: tests/SwizzlerTest.cpp
diff --git a/tests/SwizzlerTest.cpp b/tests/SwizzlerTest.cpp
index f67cfeef7a028101781a58606aff3474ef22b931..e1626d52f114d761c8ac3331d8d40205f8f955a7 100644
--- a/tests/SwizzlerTest.cpp
+++ b/tests/SwizzlerTest.cpp
@@ -132,28 +132,28 @@ DEF_TEST(SwizzleOpts, r) {
     // forall c, c*255 == c, c*0 == 0
     for (int c = 0; c <= 255; c++) {
         src = (255<<24) | c;
-        SkOpts::premul_xxxa(&dst, &src, 1);
+        SkOpts::RGBA_to_rgbA(&dst, &src, 1);
         REPORTER_ASSERT(r, dst == src);
-        SkOpts::premul_swaprb_xxxa(&dst, &src, 1);
+        SkOpts::RGBA_to_bgrA(&dst, &src, 1);
         REPORTER_ASSERT(r, dst == (uint32_t)((255<<24) | (c<<16)));
 
         src = (0<<24) | c;
-        SkOpts::premul_xxxa(&dst, &src, 1);
+        SkOpts::RGBA_to_rgbA(&dst, &src, 1);
         REPORTER_ASSERT(r, dst == 0);
-        SkOpts::premul_swaprb_xxxa(&dst, &src, 1);
+        SkOpts::RGBA_to_bgrA(&dst, &src, 1);
         REPORTER_ASSERT(r, dst == 0);
     }
 
     // check a totally arbitrary color
     src = 0xFACEB004;
-    SkOpts::premul_xxxa(&dst, &src, 1);
+    SkOpts::RGBA_to_rgbA(&dst, &src, 1);
     REPORTER_ASSERT(r, dst == 0xFACAAD04);
 
     // swap red and blue
-    SkOpts::swaprb_xxxa(&dst, &src, 1);
+    SkOpts::RGBA_to_BGRA(&dst, &src, 1);
     REPORTER_ASSERT(r, dst == 0xFA04B0CE);
 
     // all together now
-    SkOpts::premul_swaprb_xxxa(&dst, &src, 1);
+    SkOpts::RGBA_to_bgrA(&dst, &src, 1);
     REPORTER_ASSERT(r, dst == 0xFA04ADCA);
 }