refactor DM::SetupBitmap

dm/DMRecordTask.cpp

 #include "DMRecordTask.h"
 #include "DMUtil.h"
 #include "DMWriteTask.h"
 #include "SkCommandLineFlags.h"
 #include "SkRecord.h"
 #include "SkRecordDraw.h"
 #include "SkRecordOpts.h"
 #include "SkRecorder.h"
 
 DEFINE_bool(skr, true, "If true, run SKR tests.");
@@ skipping 29 matching lines @@
         fPicture->draw(&recorder);
     }
 
 
     if (fOptimize) {
         SkRecordOptimize(&record);
     }
 
     // Draw the SkRecord back into a bitmap.
     SkBitmap bitmap;
-    if (fGM.get()) {
-        SetupBitmap(fReference.colorType(), fGM.get(), &bitmap);
-    } else {
-        SetupBitmap(fReference.colorType(), *fPicture, &bitmap);
-    }
+    AllocatePixels(fReference, &bitmap);
     SkCanvas target(bitmap);
     SkRecordDraw(record, &target);
 
     if (!BitmapsEqual(bitmap, fReference)) {
         this->fail();
         this->spawnChild(SkNEW_ARGS(WriteTask, (*this, bitmap)));
     }
 }
 
 bool RecordTask::shouldSkip() const {
     return !FLAGS_skr;
 }
 
 }  // namespace DM