Updating Chromium to Skia SkBaseDevice/SkBitmapDevice split

skia/ext/vector_platform_device_emf_win.h

Index: skia/ext/vector_platform_device_emf_win.h
diff --git a/skia/ext/vector_platform_device_emf_win.h b/skia/ext/vector_platform_device_emf_win.h
index 9baee32e0a463ba3423a87e1a5bbaeb84c769d2e..8e02e9928c6f8b3543daece6c992bfed8961a1be 100644
--- a/skia/ext/vector_platform_device_emf_win.h
+++ b/skia/ext/vector_platform_device_emf_win.h
@@ -17,13 +17,13 @@ namespace skia {
 // SkCanvas to draw into. This specific device is not not backed by a surface
 // and is thus unreadable. This is because the backend is completely vectorial.
 // This device is a simple wrapper over a Windows device context (HDC) handle.
-class VectorPlatformDeviceEmf : public SkDevice, public PlatformDevice {
+class VectorPlatformDeviceEmf : public SkBitmapDevice, public PlatformDevice {

[vandebo (ex-Chrome), 2013/08/22 20:41:58]

Should this be SkBaseDevice ?

[robertphillips, 2013/08/23 14:01:03]

Ultimately yes - short term no. Please see earlier comment.

[vandebo (ex-Chrome), 2013/08/23 17:10:04]

Does it make sense to add a TODO? Down the road it might be hard to remember
which ones should be changed.

[robertphillips, 2013/08/26 13:11:48]

Done.

  public:
-  SK_API static SkDevice* CreateDevice(int width, int height, bool isOpaque,
-                                       HANDLE shared_section);
+  SK_API static SkBaseDevice* CreateDevice(int width, int height, bool isOpaque,
+                                           HANDLE shared_section);
 
   // Factory function. The DC is kept as the output context.
-  static SkDevice* create(HDC dc, int width, int height);
+  static SkBaseDevice* create(HDC dc, int width, int height);
 
   VectorPlatformDeviceEmf(HDC dc, const SkBitmap& bitmap);
   virtual ~VectorPlatformDeviceEmf();
@@ -32,7 +32,7 @@ class VectorPlatformDeviceEmf : public SkDevice, public PlatformDevice {
   virtual PlatformSurface BeginPlatformPaint() OVERRIDE;
   virtual void DrawToNativeContext(HDC dc, int x, int y,
                                    const RECT* src_rect) OVERRIDE;
-  // SkDevice methods.
+  // SkBaseDevice methods.
   virtual uint32_t getDeviceCapabilities();
   virtual void drawPaint(const SkDraw& draw, const SkPaint& paint) OVERRIDE;
   virtual void drawPoints(const SkDraw& draw, SkCanvas::PointMode mode,
@@ -67,7 +67,7 @@ class VectorPlatformDeviceEmf : public SkDevice, public PlatformDevice {
                             const SkColor colors[], SkXfermode* xmode,
                             const uint16_t indices[], int indexCount,
                             const SkPaint& paint) OVERRIDE;
-  virtual void drawDevice(const SkDraw& draw, SkDevice*, int x, int y,
+  virtual void drawDevice(const SkDraw& draw, SkBaseDevice*, int x, int y,
                           const SkPaint&) OVERRIDE;
 
   virtual void setMatrixClip(const SkMatrix& transform, const SkRegion& region,
@@ -76,9 +76,9 @@ class VectorPlatformDeviceEmf : public SkDevice, public PlatformDevice {
   void LoadClipRegion();
 
  protected:
-  virtual SkDevice* onCreateCompatibleDevice(SkBitmap::Config, int width,
-                                             int height, bool isOpaque,
-                                             Usage usage) OVERRIDE;
+  virtual SkBaseDevice* onCreateCompatibleDevice(SkBitmap::Config, int width,
+                                                 int height, bool isOpaque,
+                                                 Usage usage) OVERRIDE;
 
  private:
   // Applies the SkPaint's painting properties in the current GDI context, if