trim off more bgra stages

Same deal as before, just swap_rb where needed.

The change to SkWebpCodec could probably land independently if we want.

Change-Id: Idd53ab76232cb95eb2f41cd65c6903fa7c5b01d6
Reviewed-on: https://skia-review.googlesource.com/c/163440
Commit-Queue: Brian Osman <brianosman@google.com>
Auto-Submit: Mike Klein <mtklein@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
diff --git a/src/core/SkColorSpaceXformer.cpp b/src/core/SkColorSpaceXformer.cpp
index 65feaec..63d9e51 100644
--- a/src/core/SkColorSpaceXformer.cpp
+++ b/src/core/SkColorSpaceXformer.cpp
@@ -23,9 +23,11 @@
     , fReentryCount(0) {
 
     SkRasterPipeline p(&fAlloc);
-    p.append(SkRasterPipeline::load_bgra, &fFromSRGBSrc);
+    p.append(SkRasterPipeline::load_8888, &fFromSRGBSrc);
+    p.append(SkRasterPipeline::swap_rb);
     fFromSRGBSteps.apply(&p);
-    p.append(SkRasterPipeline::store_bgra, &fFromSRGBDst);
+    p.append(SkRasterPipeline::swap_rb);
+    p.append(SkRasterPipeline::store_8888, &fFromSRGBDst);
     fFromSRGB = p.compile();
 }