Revert 91504 - Stop using deprecated factory API for SkDevice

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_
 #pragma once
 
 #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 {
 
+class SK_API VectorPlatformDeviceEmfFactory : public SkDeviceFactory {
+ public:
+  virtual SkDevice* newDevice(SkCanvas* ignored, SkBitmap::Config config,
+                              int width, int height,
+                              bool isOpaque, bool isForLayer) OVERRIDE;
+  static PlatformDevice* CreateDevice(int width, int height, bool isOpaque,
+                                      HANDLE shared_section);
+};
+
 // 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 PlatformDevice {
  public:
-  static PlatformDevice* CreateDevice(int width, int height, bool isOpaque,
-                                      HANDLE shared_section);
-
   // Factory function. The DC is kept as the output context.
   static VectorPlatformDeviceEmf* create(HDC dc, int width, int height);
 
   VectorPlatformDeviceEmf(HDC dc, const SkBitmap& bitmap);
   virtual ~VectorPlatformDeviceEmf();
 
   // PlatformDevice methods
   virtual PlatformSurface BeginPlatformPaint();
   virtual void DrawToNativeContext(HDC dc, int x, int y, const RECT* src_rect);
 
@@ skipping 32 matching lines @@
   virtual void drawDevice(const SkDraw& draw, SkDevice*, int x, int y,
                           const SkPaint&) OVERRIDE;
 
   virtual void setMatrixClip(const SkMatrix& transform, const SkRegion& region,
                              const SkClipStack&);
 
   void LoadClipRegion();
   bool alpha_blend_used() const { return alpha_blend_used_; }
 
  protected:
-  virtual SkDevice* onCreateCompatibleDevice(SkBitmap::Config, int width,
-                                             int height, bool isOpaque,
-                                             Usage usage);
+  // Override from SkDevice (through PlatformDevice).
+  virtual SkDeviceFactory* onNewDeviceFactory();
 
  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 38 matching lines @@
   // True if AlphaBlend() was called during this print.
   bool alpha_blend_used_;
 
   DISALLOW_COPY_AND_ASSIGN(VectorPlatformDeviceEmf);
 };
 
 }  // namespace skia
 
 #endif  // SKIA_EXT_VECTOR_PLATFORM_DEVICE_EMF_WIN_H_