Updating Chromium to Skia SkBaseDevice/SkBitmapDevice split

skia/ext/platform_device.cc

Index: skia/ext/platform_device.cc
diff --git a/skia/ext/platform_device.cc b/skia/ext/platform_device.cc
index c7f156516f98bcaeb48735f0ee61b14c2b2a2bfd..ae720dfb45a0eb4b825d1104b16b2134c20bece7 100644
--- a/skia/ext/platform_device.cc
+++ b/skia/ext/platform_device.cc
@@ -33,12 +33,12 @@ bool GetBoolMetaData(const SkCanvas& canvas, const char* key) {
 
 }  // namespace
 
-void SetPlatformDevice(SkDevice* device, PlatformDevice* platform_behaviour) {
+void SetPlatformDevice(SkBaseDevice* device, PlatformDevice* platform_behaviour) {
   SkMetaData& meta_data = device->getMetaData();
   meta_data.setPtr(kDevicePlatformBehaviour, platform_behaviour);
 }
 
-PlatformDevice* GetPlatformDevice(SkDevice* device) {
+PlatformDevice* GetPlatformDevice(SkBaseDevice* device) {
   if (device) {
     SkMetaData& meta_data = device->getMetaData();
     PlatformDevice* device_behaviour = NULL;
@@ -50,7 +50,7 @@ PlatformDevice* GetPlatformDevice(SkDevice* device) {
 }
 
 SkMetaData& getMetaData(const SkCanvas& canvas) {
-  SkDevice* device = canvas.getDevice();
+  SkBaseDevice* device = canvas.getDevice();
   DCHECK(device != NULL);
   return device->getMetaData();
 }