Updating Chromium to Skia SkBaseDevice/SkBitmapDevice split

skia/ext/benchmarking_canvas.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 "base/containers/hash_tables.h"
 #include "base/logging.h"
 #include "base/time/time.h"
 #include "skia/ext/benchmarking_canvas.h"
-#include "third_party/skia/include/core/SkDevice.h"
+#include "third_party/skia/include/core/SkBitmapDevice.h"
 #include "third_party/skia/include/utils/SkProxyCanvas.h"
 
 namespace skia {
 
 class AutoStamper {
 public:
   AutoStamper(TimingCanvas* timing_canvas);
   ~AutoStamper();
 
 private:
   TimingCanvas* timing_canvas_;
   base::TimeTicks start_ticks_;
 };
 
 class TimingCanvas : public SkProxyCanvas {
 public:
   TimingCanvas(int width, int height, const BenchmarkingCanvas* track_canvas)
       : tracking_canvas_(track_canvas) {
-    skia::RefPtr<SkDevice> device = skia::AdoptRef(
-        SkNEW_ARGS(SkDevice, (SkBitmap::kARGB_8888_Config, width, height)));
+    skia::RefPtr<SkBaseDevice> device = skia::AdoptRef(
+        SkNEW_ARGS(SkBitmapDevice, (SkBitmap::kARGB_8888_Config, width, height)));
     canvas_ = skia::AdoptRef(SkNEW_ARGS(SkCanvas, (device.get())));
 
     setProxy(canvas_.get());
   }
 
   virtual ~TimingCanvas() {
   }
 
   double GetTime(size_t index) {
     TimingsMap::const_iterator timing_info = timings_map_.find(index);
@@ skipping 190 matching lines @@
   DCHECK_LT(index, static_cast<size_t>(debug_canvas_->getSize()));
   return debug_canvas_->getDrawCommandAt(index);
 }
 
 double BenchmarkingCanvas::GetTime(size_t index) {
   DCHECK_LT(index,  static_cast<size_t>(debug_canvas_->getSize()));
   return timing_canvas_->GetTime(index);
 }
 
 } // namespace skia