commit 80e96088bc608d6935b24ff623b9025b38da576e
author brianosman <brianosman@google.com> Tue Aug 16 07:09:47 2016 -0700
committer Commit bot <commit-bot@chromium.org> Tue Aug 16 07:09:47 2016 -0700
tree ed1428f04934e2c8e6dfdf3d758b8f647bf97c5f
parent b5b6de9b94c487e3f3962add406d6e7861c6c12f

Remove isOpaque from SkSpecialImage, just use alpha type

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2246193002

Review-Url: https://codereview.chromium.org/2246193002

src/core/SkSpecialImage.cpp

diff --git a/src/core/SkSpecialImage.cpp b/src/core/SkSpecialImage.cpp
index c10e88e..240d469 100644
--- a/src/core/SkSpecialImage.cpp
+++ b/src/core/SkSpecialImage.cpp
@@ -105,12 +105,10 @@
         return nullptr;
     }
 
-    SkAlphaType at = this->isOpaque() ? kOpaque_SkAlphaType : kPremul_SkAlphaType;
-
     return SkSpecialImage::MakeFromGpu(SkIRect::MakeWH(resultTex->width(), resultTex->height()),
                                        this->uniqueID(),
                                        resultTex, sk_ref_sp(this->getColorSpace()), &this->props(),
-                                       at);
+                                       this->alphaType());
 #else
     return nullptr;
 #endif
@@ -220,7 +218,7 @@
         SkASSERT(fBitmap.getPixels());
     }
 
-    bool isOpaque() const override { return fBitmap.isOpaque(); }
+    SkAlphaType alphaType() const override { return fBitmap.alphaType(); }
 
     size_t getSize() const override { return fBitmap.getSize(); }
 
@@ -334,9 +332,7 @@
         }
     }
 
-    bool isOpaque() const override {
-        return GrPixelConfigIsOpaque(fTexture->config()) || fAlphaType == kOpaque_SkAlphaType;
-    }
+    SkAlphaType alphaType() const override { return fAlphaType; }
 
     size_t getSize() const override { return fTexture->gpuMemorySize(); }
 
@@ -365,9 +361,7 @@
         }
 
         SkImageInfo info = SkImageInfo::MakeN32(this->width(), this->height(),
-                                                this->isOpaque() ? kOpaque_SkAlphaType
-                                                                 : kPremul_SkAlphaType,
-                                                fColorSpace);
+                                                this->alphaType(), fColorSpace);
 
         if (!dst->tryAllocPixels(info)) {
             return false;