Support RGBA/BGRA swizzles using SkEncodedInfo

src/codec/SkWbmpCodec.cpp

Index: src/codec/SkWbmpCodec.cpp
diff --git a/src/codec/SkWbmpCodec.cpp b/src/codec/SkWbmpCodec.cpp
index 3d398ea2ab7aa29e989878ee5c44b540eaecc847..08401f64eb49118ae85daa72524a1cefe41dced0 100644
--- a/src/codec/SkWbmpCodec.cpp
+++ b/src/codec/SkWbmpCodec.cpp
@@ -32,7 +32,8 @@ static inline void setup_color_table(SkColorType colorType,
 
 static inline bool valid_color_type(SkColorType colorType, SkAlphaType alphaType) {
     switch (colorType) {
-        case kN32_SkColorType:
+        case kRGBA_8888_SkColorType:
+        case kBGRA_8888_SkColorType:
         case kIndex_8_SkColorType:
             return true;
         case kGray_8_SkColorType:
@@ -97,7 +98,7 @@ bool SkWbmpCodec::onRewind() {
 
 SkSwizzler* SkWbmpCodec::initializeSwizzler(const SkImageInfo& info, const SkPMColor* ctable,
         const Options& opts) {
-    return SkSwizzler::CreateSwizzler(SkSwizzler::kBit, ctable, info, opts);
+    return SkSwizzler::CreateSwizzler(this->getEncodedInfo(), ctable, info, opts);
 }
 
 bool SkWbmpCodec::readRow(uint8_t* row) {