support either 32bit swizzle in HQ mode

Bug: skia:6515
Change-Id: I8570a76824026d973fd0cc7247b34de7ae70a190
Reviewed-on: https://skia-review.googlesource.com/13593
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Mike Reed <reed@google.com>

1 files changed, 12 insertions, 5 deletions

diff --git a/src/core/SkBitmapController.cpp b/src/core/SkBitmapController.cpp
index ba287b584a..d44f89cd0f 100644
--- a/src/core/SkBitmapController.cpp
+++ b/src/core/SkBitmapController.cpp
@@ -85,9 +85,16 @@ bool SkDefaultBitmapControllerState::processHQRequest(const SkBitmapProvider& pr
     return false;
 #endif
 
-    if (kN32_SkColorType != provider.info().colorType() || !cache_size_okay(provider, fInvMatrix) ||
-        fInvMatrix.hasPerspective())
-    {
+    bool supported = false;
+    switch (provider.info().colorType()) {
+        case kRGBA_8888_SkColorType:
+        case kBGRA_8888_SkColorType:
+            supported = true;
+            break;
+        default:
+            break;
+    }
+    if (!supported || !cache_size_okay(provider, fInvMatrix) || fInvMatrix.hasPerspective()) {
         return false; // can't handle the reqeust
     }
 
@@ -135,8 +142,8 @@ bool SkDefaultBitmapControllerState::processHQRequest(const SkBitmapProvider& pr
 
         SkPixmap dst;
         SkBitmapCache::RecPtr rec;
-        const SkImageInfo info = SkImageInfo::MakeN32(desc.fScaledWidth, desc.fScaledHeight,
-                                                      src.alphaType());
+        const SkImageInfo info = SkImageInfo::Make(desc.fScaledWidth, desc.fScaledHeight,
+                                                   src.colorType(), src.alphaType());
         if (provider.isVolatile()) {
             if (!fResultBitmap.tryAllocPixels(info)) {
                 return false;