Revert 254567 "don't create SkDevice directly, use SkBitmap or (..."

trunk/src/content/renderer/skia_benchmarking_extension.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/skia_benchmarking_extension.h"
 
 #include "base/base64.h"
 #include "base/time/time.h"
 #include "base/values.h"
 #include "cc/base/math_util.h"
 #include "cc/resources/picture.h"
 #include "content/public/renderer/v8_value_converter.h"
 #include "content/renderer/render_thread_impl.h"
 #include "gin/arguments.h"
 #include "gin/handle.h"
 #include "gin/object_template_builder.h"
 #include "skia/ext/benchmarking_canvas.h"
 #include "third_party/WebKit/public/platform/WebArrayBuffer.h"
 #include "third_party/WebKit/public/web/WebArrayBufferConverter.h"
 #include "third_party/WebKit/public/web/WebFrame.h"
 #include "third_party/WebKit/public/web/WebKit.h"
+#include "third_party/skia/include/core/SkBitmapDevice.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkColorPriv.h"
 #include "third_party/skia/include/core/SkGraphics.h"
 #include "third_party/skia/include/core/SkStream.h"
 #include "third_party/skia/src/utils/debugger/SkDebugCanvas.h"
 #include "third_party/skia/src/utils/debugger/SkDrawCommand.h"
 #include "ui/gfx/rect_conversions.h"
 #include "ui/gfx/skia_util.h"
 #include "v8/include/v8.h"
 
@@ skipping 223 matching lines @@
   v8::Handle<v8::Value> picture_handle;
   args->GetNext(&picture_handle);
   scoped_refptr<cc::Picture> picture =
       ParsePictureHash(isolate, picture_handle);
   if (!picture.get())
     return;
 
   gfx::Rect bounds = picture->LayerRect();
 
   // Measure the total time by drawing straight into a bitmap-backed canvas.
-  SkBitmap bitmap;
-  bitmap.allocN32Pixels(bounds.width(), bounds.height());
-  SkCanvas bitmap_canvas(bitmap);
+  skia::RefPtr<SkBaseDevice> device = skia::AdoptRef(SkNEW_ARGS(
+      SkBitmapDevice,
+      (SkBitmap::kARGB_8888_Config, bounds.width(), bounds.height())));
+  SkCanvas bitmap_canvas(device.get());
   bitmap_canvas.clear(SK_ColorTRANSPARENT);
   base::TimeTicks t0 = base::TimeTicks::HighResNow();
   picture->Replay(&bitmap_canvas);
   base::TimeDelta total_time = base::TimeTicks::HighResNow() - t0;
 
   // Gather per-op timing info by drawing into a BenchmarkingCanvas.
   skia::BenchmarkingCanvas benchmarking_canvas(bounds.width(), bounds.height());
   picture->Replay(&benchmarking_canvas);
 
   v8::Local<v8::Array> op_times =
@@ skipping 23 matching lines @@
   v8::Handle<v8::Object> result = v8::Object::New(isolate);
   result->Set(v8::String::NewFromUtf8(isolate, "width"),
               v8::Number::New(isolate, picture->LayerRect().width()));
   result->Set(v8::String::NewFromUtf8(isolate, "height"),
               v8::Number::New(isolate, picture->LayerRect().height()));
 
   args->Return(result);
 }
 
 } // namespace content