Changing SkDeferredCanvas to use factories for creation

bench/benchmain.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "BenchTimer.h"
@@ skipping 802 matching lines @@
             SkCanvas* canvas = NULL;
             SkPicture pictureRecordFrom;
             SkPicture pictureRecordTo;
 
             if (kNonRendering_Backend != backend) {
                 device = make_device(outConfig, dim, backend, sampleCount, context);
 
                 switch(benchMode) {
                     case kDeferredSilent_benchModes:
                     case kDeferred_benchModes:
-                        canvas = new SkDeferredCanvas(device);
+                        canvas = 
+#if SK_DEFERRED_CANVAS_USES_FACTORIES
+                            SkDeferredCanvas::Create(device);
+#else
+                            SkNEW_ARGS(SkDeferredCanvas, (device));
+#endif
                         break;
                     case kRecord_benchModes:
                         canvas = pictureRecordTo.beginRecording(dim.fX, dim.fY,
                             SkPicture::kUsePathBoundsForClip_RecordingFlag);
                         canvas->ref();
                         break;
                     case kPictureRecord_benchModes: {
                         // This sets up picture-to-picture recording.
                         // The C++ drawing calls for the benchmark are recorded into
                         // pictureRecordFrom. As the benchmark, we will time how
@@ skipping 148 matching lines @@
     }
 
     return 0;
 }
 
 #if !defined(SK_BUILD_FOR_IOS) && !defined(SK_BUILD_FOR_NACL)
 int main(int argc, char * const argv[]) {
     return tool_main(argc, (char**) argv);
 }
 #endif