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

Side by Side Diff: base/gfx/platform_canvas_linux.cc

Issue 9510: Make PlatformCanvasLinux match up with recent changes in the Windows one, whi... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 12 years, 1 month 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 | « base/gfx/platform_canvas_linux.h ('k') | no next file » | 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) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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 "base/gfx/platform_canvas_linux.h" 5 #include "base/gfx/platform_canvas_linux.h"
6 6
7 #include "base/gfx/platform_device_linux.h" 7 #include "base/gfx/platform_device_linux.h"
8 #include "base/gfx/bitmap_platform_device_linux.h" 8 #include "base/gfx/bitmap_platform_device_linux.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 10
11 namespace gfx { 11 namespace gfx {
12 12
13 PlatformCanvasLinux::PlatformCanvasLinux() : SkCanvas() { 13 PlatformCanvasLinux::PlatformCanvasLinux() : SkCanvas() {
14 } 14 }
15 15
16 PlatformCanvasLinux::PlatformCanvasLinux(int width, int height, bool is_opaque) 16 PlatformCanvasLinux::PlatformCanvasLinux(int width, int height, bool is_opaque)
17 : SkCanvas() { 17 : SkCanvas() {
18 initialize(width, height, is_opaque); 18 if (!initialize(width, height, is_opaque))
19 CHECK(false);
19 } 20 }
20 21
21 PlatformCanvasLinux::~PlatformCanvasLinux() { 22 PlatformCanvasLinux::~PlatformCanvasLinux() {
22 } 23 }
23 24
24 void PlatformCanvasLinux::initialize(int width, int height, bool is_opaque) { 25 bool PlatformCanvasLinux::initialize(int width, int height, bool is_opaque) {
25 SkDevice* device = createPlatformDevice(width, height, is_opaque); 26 SkDevice* device = createPlatformDevice(width, height, is_opaque);
27 if (!device)
28 return false;
29
26 setDevice(device); 30 setDevice(device);
27 device->unref(); // was created with refcount 1, and setDevice also refs 31 device->unref(); // was created with refcount 1, and setDevice also refs
32 return true;
28 } 33 }
29 34
30 PlatformDeviceLinux& PlatformCanvasLinux::getTopPlatformDevice() const { 35 PlatformDeviceLinux& PlatformCanvasLinux::getTopPlatformDevice() const {
31 // All of our devices should be our special PlatformDevice. 36 // All of our devices should be our special PlatformDevice.
32 SkCanvas::LayerIter iter(const_cast<PlatformCanvasLinux*>(this), false); 37 SkCanvas::LayerIter iter(const_cast<PlatformCanvasLinux*>(this), false);
33 return *static_cast<PlatformDeviceLinux*>(iter.device()); 38 return *static_cast<PlatformDeviceLinux*>(iter.device());
34 } 39 }
35 40
36 SkDevice* PlatformCanvasLinux::createDevice(SkBitmap::Config, int width, 41 SkDevice* PlatformCanvasLinux::createDevice(SkBitmap::Config, int width,
37 int height, bool is_opaque) { 42 int height, bool is_opaque) {
38 return createPlatformDevice(width, height, is_opaque); 43 return createPlatformDevice(width, height, is_opaque);
39 } 44 }
40 45
41 SkDevice* PlatformCanvasLinux::createPlatformDevice(int width, 46 SkDevice* PlatformCanvasLinux::createPlatformDevice(int width,
42 int height, 47 int height,
43 bool is_opaque) { 48 bool is_opaque) {
44 return BitmapPlatformDeviceLinux::Create(width, height, is_opaque); 49 return BitmapPlatformDeviceLinux::Create(width, height, is_opaque);
45 } 50 }
46 51
47 } // namespace gfx 52 } // namespace gfx
OLDNEW
« no previous file with comments | « base/gfx/platform_canvas_linux.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698