add rowbytes option to allocPixels

src/animator/SkDrawBitmap.cpp

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkDrawBitmap.h"
@@ skipping 71 matching lines @@
     }
     SkDebugf("format=\"%s\" />\n", formatName);
 }
 #endif
 
 void SkDrawBitmap::onEndElement(SkAnimateMaker&) {
     SkASSERT(width != -1);
     SkASSERT(height != -1);
     SkASSERT(rowBytes >= 0);
     SkColorType colorType = SkColorType(format);
-    fBitmap.setInfo(SkImageInfo::Make(width, height, colorType, kPremul_SkAlphaType), rowBytes);
-    fBitmap.allocPixels();
+    fBitmap.allocPixels(SkImageInfo::Make(width, height, colorType, kPremul_SkAlphaType),
+                        rowBytes);
     if (fColorSet)
         fBitmap.eraseColor(fColor);
 }
 
 bool SkDrawBitmap::setProperty(int index, SkScriptValue& value)
 {
     switch (index) {
         case SK_PROPERTY(erase):
             SkASSERT(value.fType == SkType_ARGB);
             fColor = value.fOperand.fS32;
@@ skipping 84 matching lines @@
         fLast.set(src);
         fBitmap.reset();
 
         //SkStream* stream = SkStream::GetURIStream(fUriBase, src.c_str());
         SkAutoTUnref<SkStreamAsset> stream(SkStream::NewFromFile(src.c_str()));
         if (stream.get()) {
             SkImageDecoder::DecodeStream(stream, &fBitmap);
         }
     }
 }