Make BRD take advantage of zero initialized memory

This is the third step in a three part change:
(1) Skia: Add SkBRDAllocator.
(2) Android: Make JavaPixelAllocator and RecyclingClippingPixelAllocator
             implement SkBRDAllocator.
(3) Skia: Change SkBitmapRegionDecoder to use SkBRDAllocator and take
          advantage of zero allocated memory when possible.

BUG=skia:

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

1 files changed, 6 insertions, 5 deletions

diff --git a/tools/android/SkBitmapRegionCanvas.cpp b/tools/android/SkBitmapRegionCanvas.cpp
index ffcab9596a..bac5dc1ffc 100644
--- a/tools/android/SkBitmapRegionCanvas.cpp
+++ b/tools/android/SkBitmapRegionCanvas.cpp
@@ -15,7 +15,7 @@ SkBitmapRegionCanvas::SkBitmapRegionCanvas(SkCodec* decoder)
     , fDecoder(decoder)
 {}
 
-bool SkBitmapRegionCanvas::decodeRegion(SkBitmap* bitmap, SkBitmap::Allocator* allocator,
+bool SkBitmapRegionCanvas::decodeRegion(SkBitmap* bitmap, SkBRDAllocator* allocator,
         const SkIRect& desiredSubset, int sampleSize, SkColorType dstColorType,
         bool requireUnpremul) {
     // Reject color types not supported by this method
@@ -102,11 +102,12 @@ bool SkBitmapRegionCanvas::decodeRegion(SkBitmap* bitmap, SkBitmap::Allocator* a
     // TODO (msarett): Can we make this faster by implementing it to only
     //                 zero parts of the image that we won't overwrite with
     //                 pixels?
-    // TODO (msarett): This could be skipped if memory is zero initialized.
-    //                 This would matter if this code is moved to Android and
-    //                 uses Android bitmaps.
     if (SubsetType::kPartiallyInside_SubsetType == type) {
-        bitmap->eraseColor(0);
+        SkCodec::ZeroInitialized zeroInit = allocator ? allocator->zeroInit() :
+                    SkCodec::kNo_ZeroInitialized;
+        if (SkCodec::kNo_ZeroInitialized == zeroInit) {
+            bitmap->eraseColor(0);
+        }
     }
 
     // Use a canvas to crop and scale to the destination bitmap