Stop using deprecated factory API for SkDevice

skia/ext/vector_platform_device_emf_win.cc

Index: skia/ext/vector_platform_device_emf_win.cc
===================================================================
--- skia/ext/vector_platform_device_emf_win.cc	(revision 91287)
+++ skia/ext/vector_platform_device_emf_win.cc	(working copy)
@@ -12,18 +12,10 @@
 
 namespace skia {
 
-SkDevice* VectorPlatformDeviceEmfFactory::newDevice(SkCanvas* unused,
-                                                    SkBitmap::Config config,
-                                                    int width, int height,
-                                                    bool isOpaque,
-                                                    bool isForLayer) {
-  SkASSERT(config == SkBitmap::kARGB_8888_Config);
-  return CreateDevice(width, height, isOpaque, NULL);
-}
-
 //static
-PlatformDevice* VectorPlatformDeviceEmfFactory::CreateDevice(
-        int width, int height, bool is_opaque, HANDLE shared_section) {
+PlatformDevice* VectorPlatformDeviceEmf::CreateDevice(int width, int height,
+                                                      bool is_opaque,
+                                                      HANDLE shared_section) {
   if (!is_opaque) {
     // TODO(maruel):  http://crbug.com/18382 When restoring a semi-transparent
     // layer, i.e. merging it, we need to rasterize it because GDI doesn't
@@ -115,10 +107,6 @@
   SkASSERT(previous_pen_ == NULL);
 }
 
-SkDeviceFactory* VectorPlatformDeviceEmf::onNewDeviceFactory() {
-  return SkNEW(VectorPlatformDeviceEmfFactory);
-}
-
 HDC VectorPlatformDeviceEmf::BeginPlatformPaint() {
   return hdc_;
 }
@@ -450,6 +438,14 @@
   LoadClippingRegionToDC(hdc_, clip_region_, t);
 }
 
+SkDevice* VectorPlatformDeviceEmf::onCreateCompatibleDevice(
+                                                        SkBitmap::Config config,

[vandebo (ex-Chrome), 2011/07/01 17:20:14]

nit: arg doesn't fit, so it should be indented 4 space.

+                                                        int width, int height,
+                                                        bool isOpaque, Usage) {
+  SkASSERT(config == SkBitmap::kARGB_8888_Config);
+  return VectorPlatformDeviceEmf::CreateDevice(width, height, isOpaque, NULL);
+}
+
 bool VectorPlatformDeviceEmf::CreateBrush(bool use_brush, COLORREF color) {
   SkASSERT(previous_brush_ == NULL);
   // We can't use SetDCBrushColor() or DC_BRUSH when drawing to a EMF buffer.