Updating Chromium to Skia SkBaseDevice/SkBitmapDevice split

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/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 "skia/ext/benchmarking_canvas.h"
 #include "third_party/WebKit/public/platform/WebArrayBuffer.h"
 #include "third_party/WebKit/public/web/WebFrame.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/SkDevice.h"
 #include "third_party/skia/include/core/SkGraphics.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"
 
 using WebKit::WebFrame;
 
 namespace {
@@ skipping 215 matching lines @@
     if (args.Length() != 1)
       return;
 
     scoped_refptr<cc::Picture> picture = ParsePictureArg(args[0]);
     if (!picture.get())
       return;
 
     gfx::Rect bounds = picture->LayerRect();
 
     // Measure the total time by drawing straight into a bitmap-backed canvas.
-    skia::RefPtr<SkDevice> device = skia::AdoptRef(SkNEW_ARGS(SkDevice,
-        (SkBitmap::kARGB_8888_Config, bounds.width(), bounds.height())));
+    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);
@@ skipping 26 matching lines @@
     // FIXME: remove this after Skia updates SkGraphics::Init() to be
     //        thread-safe and idempotent.
     static bool skia_initialized = false;
     if (!skia_initialized) {
       SkGraphics::Init();
       skia_initialized = true;
     }
 }
 
 } // namespace content