clean up low-hanging swap_rb

There are two remaining swap_rb uses that both look non-trivial to
replace:
   - sampling out of index8 when the color table is bgra
   - table transforms on bgra inputs in SkColorSpaceXform

I don't think it's a big deal to just leave swap_rb around,
just a little sad.

Change-Id: I3d30200cf867cbf37d6f86572b1574d3e22e3490
Reviewed-on: https://skia-review.googlesource.com/21040
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Klein <mtklein@chromium.org>

1 files changed, 6 insertions, 4 deletions

diff --git a/src/core/SkModeColorFilter.cpp b/src/core/SkModeColorFilter.cpp
index bca23c63bb..0b553333ac 100644
--- a/src/core/SkModeColorFilter.cpp
+++ b/src/core/SkModeColorFilter.cpp
@@ -87,15 +87,17 @@ void SkModeColorFilter::filterSpan(const SkPMColor shader[], int count, SkPMColo
             SkSTArenaAlloc<256> alloc;
             SkRasterPipeline p(&alloc);
 
-            p.append(SkRasterPipeline::load_8888, &shader);
             if (kN32_SkColorType == kBGRA_8888_SkColorType) {
-                p.append(SkRasterPipeline::swap_rb);
+                p.append(SkRasterPipeline::load_bgra, &shader);
+            } else {
+                p.append(SkRasterPipeline::load_8888, &shader);
             }
             this->appendStages(&p, nullptr, &alloc, false);
             if (kN32_SkColorType == kBGRA_8888_SkColorType) {
-                p.append(SkRasterPipeline::swap_rb);
+                p.append(SkRasterPipeline::store_bgra, &result);
+            } else {
+                p.append(SkRasterPipeline::store_8888, &result);
             }
-            p.append(SkRasterPipeline::store_8888, &result);
             p.run(0, 0, count);
         } break;
     }