Updating Chromium to Skia SkBaseDevice/SkBitmapDevice split

skia/ext/platform_canvas.h

Index: skia/ext/platform_canvas.h
diff --git a/skia/ext/platform_canvas.h b/skia/ext/platform_canvas.h
index 9e2bc8237946aa4db25bfc70687595446a305519..85ad85e535cde37e4f45cd46bfc880e9e063753a 100644
--- a/skia/ext/platform_canvas.h
+++ b/skia/ext/platform_canvas.h
@@ -74,7 +74,7 @@ static inline SkCanvas* CreatePlatformCanvas(int width,
   return CreatePlatformCanvas(width, height, is_opaque, 0, CRASH_ON_FAILURE);
 }
 
-SK_API SkCanvas* CreateCanvas(const skia::RefPtr<SkDevice>& device,
+SK_API SkCanvas* CreateCanvas(const skia::RefPtr<SkBaseDevice>& device,
                               OnFailureType failure_type);
 
 static inline SkCanvas* CreateBitmapCanvas(int width,
@@ -95,7 +95,7 @@ static inline SkCanvas* TryCreateBitmapCanvas(int width,
 // alignment reasons we may wish to increase that.
 SK_API size_t PlatformCanvasStrideForWidth(unsigned width);
 
-// Returns the SkDevice pointer of the topmost rect with a non-empty
+// Returns the SkBaseDevice pointer of the topmost rect with a non-empty
 // clip. In practice, this is usually either the top layer or nothing, since
 // we usually set the clip to new layers when we make them.
 //
@@ -106,7 +106,7 @@ SK_API size_t PlatformCanvasStrideForWidth(unsigned width);
 //
 // Danger: the resulting device should not be saved. It will be invalidated
 // by the next call to save() or restore().
-SK_API SkDevice* GetTopDevice(const SkCanvas& canvas);
+SK_API SkBaseDevice* GetTopDevice(const SkCanvas& canvas);
 
 // Returns true if native platform routines can be used to draw on the
 // given canvas. If this function returns false, BeginPlatformPaint will