commit 7b433f15de2c69e7b37e163e50ce7984085cdf46
author piotaixr <piotaixr@chromium.org> Wed Sep 17 13:05:14 2014 -0700
committer Commit bot <commit-bot@chromium.org> Wed Sep 17 13:05:14 2014 -0700
tree 8d1541547cd1e722fc62db8b22d68e2c730e406b
parent 53e0be6d2b76321c2012085a73f1e7b269406c78

Small refactoring in SkImage_Codec

BUG=skia:2947
R=junov@chromium.org, reed@google.com

Author: piotaixr@chromium.org

Review URL: https://codereview.chromium.org/579773003

src/image/SkImage_Codec.cpp

diff --git a/src/image/SkImage_Codec.cpp b/src/image/SkImage_Codec.cpp
index 0b14216..4e00e26 100644
--- a/src/image/SkImage_Codec.cpp
+++ b/src/image/SkImage_Codec.cpp
@@ -25,6 +25,8 @@
     virtual bool isOpaque() const SK_OVERRIDE;
 
 private:
+    bool ensureBitmapDecoded() const;
+
     SkData*     fEncodedData;
     SkBitmap    fBitmap;
 
@@ -42,26 +44,31 @@
     fEncodedData->unref();
 }
 
-void SkImage_Codec::onDraw(SkCanvas* canvas, SkScalar x, SkScalar y, const SkPaint* paint) const {
+bool SkImage_Codec::ensureBitmapDecoded() const {
     if (!fBitmap.pixelRef()) {
         // todo: this needs to be thread-safe
         SkBitmap* bitmap = const_cast<SkBitmap*>(&fBitmap);
         if (!SkImageDecoder::DecodeMemory(fEncodedData->bytes(), fEncodedData->size(), bitmap)) {
-            return;
+            return false;
         }
     }
+    return true;
+}
+
+void SkImage_Codec::onDraw(SkCanvas* canvas, SkScalar x, SkScalar y, const SkPaint* paint) const {
+    if(!this->ensureBitmapDecoded()) {
+        return;
+    }
+
     canvas->drawBitmap(fBitmap, x, y, paint);
 }
 
 void SkImage_Codec::onDrawRectToRect(SkCanvas* canvas, const SkRect* src, const SkRect& dst,
                                      const SkPaint* paint) const {
-    if (!fBitmap.pixelRef()) {
-        // todo: this needs to be thread-safe
-        SkBitmap* bitmap = const_cast<SkBitmap*>(&fBitmap);
-        if (!SkImageDecoder::DecodeMemory(fEncodedData->bytes(), fEncodedData->size(), bitmap)) {
-            return;
-        }
+    if(!this->ensureBitmapDecoded()) {
+        return;
     }
+
     canvas->drawBitmapRectToRect(fBitmap, src, dst, paint);
 }