Updating Chromium to Skia SkBaseDevice/SkBitmapDevice split

skia/ext/platform_canvas.h

 // 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.
 
 #ifndef SKIA_EXT_PLATFORM_CANVAS_H_
 #define SKIA_EXT_PLATFORM_CANVAS_H_
 
 // The platform-specific device will include the necessary platform headers
 // to get the surface type.
 #include "base/basictypes.h"
@@ skipping 56 matching lines @@
                                         uint8_t* data,
                                         OnFailureType failure_type);
 #endif
 
 static inline SkCanvas* CreatePlatformCanvas(int width,
                                              int height,
                                              bool is_opaque) {
   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,
                                            int height,
                                            bool is_opaque) {
   return CreatePlatformCanvas(width, height, is_opaque, 0, CRASH_ON_FAILURE);
 }
 
 static inline SkCanvas* TryCreateBitmapCanvas(int width,
                                               int height,
                                               bool is_opaque) {
   return CreatePlatformCanvas(width, height, is_opaque, 0,
                               RETURN_NULL_ON_FAILURE);
 }
 
 // Return the stride (length of a line in bytes) for the given width. Because
 // we use 32-bits per pixel, this will be roughly 4*width. However, for
 // 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.
 //
 // This may return NULL, so callers need to check.
 //
 // This is different than SkCanvas' getDevice, because that returns the
 // bottommost device.
 //
 // 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
 // return NULL PlatformSurface.
 SK_API bool SupportsPlatformPaint(const SkCanvas* canvas);
 
 // Draws into the a native platform surface, |context|.  Forwards to
 // DrawToNativeContext on a PlatformDevice instance bound to the top device.
 // If no PlatformDevice instance is bound, is a no-operation.
 SK_API void DrawToNativeContext(SkCanvas* canvas,
@@ skipping 59 matching lines @@
   SkBitmap bitmap_;
   PlatformSurface surface_;  // initialized to 0
   intptr_t platform_extra_;  // platform specific, initialized to 0
 
   DISALLOW_COPY_AND_ASSIGN(PlatformBitmap);
 };
 
 }  // namespace skia
 
 #endif  // SKIA_EXT_PLATFORM_CANVAS_H_