Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(610)

Side by Side Diff: skia/ext/platform_canvas_linux.cc

Issue 7193040: Revert 91504 - Stop using deprecated factory API for SkDevice (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « skia/ext/platform_canvas.cc ('k') | skia/ext/platform_canvas_mac.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "skia/ext/platform_canvas.h" 5 #include "skia/ext/platform_canvas.h"
6 6
7 #include <cairo/cairo.h> 7 #include <cairo/cairo.h>
8 8
9 #include "skia/ext/bitmap_platform_device.h" 9 #include "skia/ext/bitmap_platform_device.h"
10 #include "skia/ext/platform_device.h" 10 #include "skia/ext/platform_device.h"
11 #include "third_party/skia/include/core/SkTypes.h" 11 #include "third_party/skia/include/core/SkTypes.h"
12 12
13 namespace skia { 13 namespace skia {
14 14
15 PlatformCanvas::PlatformCanvas(int width, int height, bool is_opaque) { 15 PlatformCanvas::PlatformCanvas(int width, int height, bool is_opaque) {
16 setDeviceFactory(SkNEW(BitmapPlatformDeviceFactory))->unref();
16 if (!initialize(width, height, is_opaque)) 17 if (!initialize(width, height, is_opaque))
17 SK_CRASH(); 18 SK_CRASH();
18 } 19 }
19 20
20 PlatformCanvas::PlatformCanvas(int width, int height, bool is_opaque, 21 PlatformCanvas::PlatformCanvas(int width, int height, bool is_opaque,
21 uint8_t* data) { 22 uint8_t* data) {
23 setDeviceFactory(SkNEW(BitmapPlatformDeviceFactory))->unref();
22 if (!initialize(width, height, is_opaque, data)) 24 if (!initialize(width, height, is_opaque, data))
23 SK_CRASH(); 25 SK_CRASH();
24 } 26 }
25 27
26 PlatformCanvas::~PlatformCanvas() { 28 PlatformCanvas::~PlatformCanvas() {
27 } 29 }
28 bool PlatformCanvas::initialize(int width, int height, bool is_opaque, 30 bool PlatformCanvas::initialize(int width, int height, bool is_opaque,
29 uint8_t* data) { 31 uint8_t* data) {
30 return initializeWithDevice(BitmapPlatformDevice::Create( 32 return initializeWithDevice(BitmapPlatformDevice::Create(
31 width, height, is_opaque, data)); 33 width, height, is_opaque, data));
32 } 34 }
33 35
34 } // namespace skia 36 } // namespace skia
OLDNEW
« no previous file with comments | « skia/ext/platform_canvas.cc ('k') | skia/ext/platform_canvas_mac.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698