Revert 91504 - Stop using deprecated factory API for SkDevice

skia/ext/bitmap_platform_device_linux.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 "skia/ext/bitmap_platform_device_linux.h"
 
 #include "skia/ext/bitmap_platform_device_data.h"
 
 #include <cairo/cairo.h>
 
@@ skipping 19 matching lines @@
   // TODO(brettw) support non-rect clips.
   SkIRect bounding = clip.getBounds();
   cairo_rectangle(context, bounding.fLeft, bounding.fTop,
                   bounding.fRight - bounding.fLeft,
                   bounding.fBottom - bounding.fTop);
   cairo_clip(context);
 }
 
 }  // namespace
 
+SkDevice* BitmapPlatformDeviceFactory::newDevice(SkCanvas* ignored,
+                                                 SkBitmap::Config config,
+                                                 int width, int height,
+                                                 bool isOpaque,
+                                                 bool isForLayer) {
+  SkASSERT(config == SkBitmap::kARGB_8888_Config);
+  return BitmapPlatformDevice::Create(width, height, isOpaque);
+}
+
 BitmapPlatformDevice::BitmapPlatformDeviceData::BitmapPlatformDeviceData(
     cairo_surface_t* surface)
     : surface_(surface),
       config_dirty_(true) {  // Want to load the config next time.
   bitmap_context_ = cairo_create(surface);
 }
 
 BitmapPlatformDevice::BitmapPlatformDeviceData::~BitmapPlatformDeviceData() {
   cairo_destroy(bitmap_context_);
   cairo_surface_destroy(surface_);
@@ skipping 70 matching lines @@
 BitmapPlatformDevice::BitmapPlatformDevice(
     const SkBitmap& bitmap,
     BitmapPlatformDeviceData* data)
     : PlatformDevice(bitmap),
       data_(data) {
 }
 
 BitmapPlatformDevice::~BitmapPlatformDevice() {
 }
 
-SkDevice* BitmapPlatformDevice::onCreateCompatibleDevice(
-    SkBitmap::Config config, int width, int height, bool isOpaque,
-    Usage /*usage*/) {
-  SkASSERT(config == SkBitmap::kARGB_8888_Config);
-  return BitmapPlatformDevice::Create(width, height, isOpaque);
+SkDeviceFactory* BitmapPlatformDevice::onNewDeviceFactory() {
+  return SkNEW(BitmapPlatformDeviceFactory);
 }
 
 cairo_t* BitmapPlatformDevice::BeginPlatformPaint() {
   data_->LoadConfig();
   cairo_t* cairo = data_->bitmap_context();
   cairo_surface_t* surface = cairo_get_target(cairo);
   // Tell cairo to flush anything it has pending.
   cairo_surface_flush(surface);
   // Tell Cairo that we (probably) modified (actually, will modify) its pixel
   // buffer directly.
   cairo_surface_mark_dirty(surface);
   return cairo;
 }
 
 void BitmapPlatformDevice::setMatrixClip(const SkMatrix& transform,
                                          const SkRegion& region,
                                          const SkClipStack&) {
   data_->SetMatrixClip(transform, region);
 }
 
 }  // namespace skia