Updating Chromium to Skia SkBaseDevice/SkBitmapDevice split

skia/ext/platform_canvas.cc

 // Copyright (c) 2011 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 "skia/ext/platform_canvas.h"
 
 #include "skia/ext/bitmap_platform_device.h"
 #include "third_party/skia/include/core/SkTypes.h"
 
 namespace skia {
 
-SkDevice* GetTopDevice(const SkCanvas& canvas) {
+SkBaseDevice* GetTopDevice(const SkCanvas& canvas) {
   return canvas.getTopDevice(true);
 }
 
 bool SupportsPlatformPaint(const SkCanvas* canvas) {
   PlatformDevice* platform_device = GetPlatformDevice(GetTopDevice(*canvas));
   return platform_device && platform_device->SupportsPlatformPaint();
 }
 
 PlatformSurface BeginPlatformPaint(SkCanvas* canvas) {
   PlatformDevice* platform_device = GetPlatformDevice(GetTopDevice(*canvas));
@@ skipping 34 matching lines @@
   skia::RefPtr<SkProcXfermode> xfermode =
       skia::AdoptRef(new SkProcXfermode(MakeOpaqueXfermodeProc));
   paint.setXfermode(xfermode.get());
   canvas->drawRect(rect, paint);
 }
 
 size_t PlatformCanvasStrideForWidth(unsigned width) {
   return 4 * width;
 }
 
-SkCanvas* CreateCanvas(const skia::RefPtr<SkDevice>& device, OnFailureType failureType) {
+SkCanvas* CreateCanvas(const skia::RefPtr<SkBaseDevice>& device, OnFailureType failureType) {
   if (!device) {
     if (CRASH_ON_FAILURE == failureType)
       SK_CRASH();
     return NULL;
   }
   return new SkCanvas(device.get());
 }
 
 PlatformBitmap::PlatformBitmap() : surface_(0), platform_extra_(0) {}
 
 }  // namespace skia