Updating Chromium to Skia SkBaseDevice/SkBitmapDevice split

skia/ext/vector_platform_device_emf_win.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_VECTOR_PLATFORM_DEVICE_EMF_WIN_H_
 #define SKIA_EXT_VECTOR_PLATFORM_DEVICE_EMF_WIN_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "skia/ext/platform_device.h"
 #include "third_party/skia/include/core/SkMatrix.h"
 #include "third_party/skia/include/core/SkRegion.h"
 
 namespace skia {
 
 // A device is basically a wrapper around SkBitmap that provides a surface for
 // 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();
 
   // PlatformDevice methods
   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,
                           size_t count, const SkPoint[],
                           const SkPaint& paint) OVERRIDE;
   virtual void drawRect(const SkDraw& draw, const SkRect& r,
                         const SkPaint& paint) OVERRIDE;
   virtual void drawPath(const SkDraw& draw, const SkPath& path,
                         const SkPaint& paint,
                         const SkMatrix* prePathMatrix = NULL,
@@ skipping 14 matching lines @@
                            int scalarsPerPos, const SkPaint& paint) OVERRIDE;
   virtual void drawTextOnPath(const SkDraw& draw, const void* text, size_t len,
                               const SkPath& path, const SkMatrix* matrix,
                               const SkPaint& paint) OVERRIDE;
   virtual void drawVertices(const SkDraw& draw, SkCanvas::VertexMode,
                             int vertexCount,
                             const SkPoint verts[], const SkPoint texs[],
                             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,
                              const SkClipStack&) OVERRIDE;
 
   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
   // possible. If GDI can't support all paint's properties, returns false. It
   // doesn't execute the "commands" in SkPaint.
   bool ApplyPaint(const SkPaint& paint);
 
   // Selects a new object in the device context. It can be a pen, a brush, a
   // clipping region, a bitmap or a font. Returns the old selected object.
   HGDIOBJ SelectObject(HGDIOBJ object);
@@ skipping 40 matching lines @@
 
 typedef void (*SkiaEnsureTypefaceCharactersAccessible)
     (const LOGFONT& font, const wchar_t* text, unsigned int text_length);
 
 SK_API void SetSkiaEnsureTypefaceCharactersAccessible(
     SkiaEnsureTypefaceCharactersAccessible func);
 
 }  // namespace skia
 
 #endif  // SKIA_EXT_VECTOR_PLATFORM_DEVICE_EMF_WIN_H_