Stop using deprecated factory API for SkDevice

skia/ext/vector_platform_device_emf_win.cc

 // 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.
 
 #include <windows.h>
 
 #include "skia/ext/vector_platform_device_emf_win.h"
 
 #include "skia/ext/bitmap_platform_device.h"
 #include "skia/ext/skia_utils_win.h"
 #include "third_party/skia/include/core/SkUtils.h"
 
 namespace skia {
 
-SkDevice* VectorPlatformDeviceEmfFactory::newDevice(SkCanvas* unused,
-                                                    SkBitmap::Config config,
-                                                    int width, int height,
-                                                    bool isOpaque,
-                                                    bool isForLayer) {
+SkDevice* VectorPlatformDeviceEmf::onCreateCompatibleDevice(
+         SkBitmap::Config config, int width, int height, bool isOpaque, Usage) {
   SkASSERT(config == SkBitmap::kARGB_8888_Config);
-  return CreateDevice(width, height, isOpaque, NULL);
+  return VectorPlatformDeviceEmfFactory::CreateDevice(width, height, isOpaque, 
+                                                      NULL);
 }
 
 //static
 PlatformDevice* VectorPlatformDeviceEmfFactory::CreateDevice(

[vandebo (ex-Chrome), 2011/06/28 19:07:54]

CreateDevice used to be a method of VectorCanvas, but it got moved into the
factory when I added them (see http://codereview.chromium.org/3590011/).  It
seems reasonable to me to make it a static method on VectorPlatforDeviceEmf. 
(Same goes for the cairo version.)

         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
     // support transparency except for AlphaBlend(). Right now, a
     // BitmapPlatformDevice is created when VectorCanvas think a saveLayers()
     // call is being done. The way to save a layer would be to create an
     // EMF-based VectorDevice and have this device registers the drawing. When
     // playing back the device into a bitmap, do it at the printer's dpi instead
     // of the layout's dpi (which is much lower).
@@ skipping 72 matching lines @@
       previous_pen_(NULL),
       alpha_blend_used_(false) {
   transform_.reset();
 }
 
 VectorPlatformDeviceEmf::~VectorPlatformDeviceEmf() {
   SkASSERT(previous_brush_ == NULL);
   SkASSERT(previous_pen_ == NULL);
 }
 
-SkDeviceFactory* VectorPlatformDeviceEmf::onNewDeviceFactory() {
-  return SkNEW(VectorPlatformDeviceEmfFactory);
-}
-
 HDC VectorPlatformDeviceEmf::BeginPlatformPaint() {
   return hdc_;
 }
 
 uint32_t VectorPlatformDeviceEmf::getDeviceCapabilities() {
   return SkDevice::getDeviceCapabilities() | kVector_Capability;
 }
 
 void VectorPlatformDeviceEmf::drawPaint(const SkDraw& draw,
                                         const SkPaint& paint) {
@@ skipping 600 matching lines @@
                                 DIB_RGB_COLORS,
                                 SRCCOPY);
     SkASSERT(result);
   }
   EndPlatformPaint();
   Cleanup();
 }
 
 }  // namespace skia