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

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

Issue 11225: Fix a proto-type mismatch on a virtual override. (Closed)
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
« no previous file with comments | « src/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
(...skipping 20 matching lines...) Expand all
31 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; 32 return true;
33 } 33 }
34 34
35 PlatformDeviceLinux& PlatformCanvasLinux::getTopPlatformDevice() const { 35 PlatformDeviceLinux& PlatformCanvasLinux::getTopPlatformDevice() const {
36 // All of our devices should be our special PlatformDevice. 36 // All of our devices should be our special PlatformDevice.
37 SkCanvas::LayerIter iter(const_cast<PlatformCanvasLinux*>(this), false); 37 SkCanvas::LayerIter iter(const_cast<PlatformCanvasLinux*>(this), false);
38 return *static_cast<PlatformDeviceLinux*>(iter.device()); 38 return *static_cast<PlatformDeviceLinux*>(iter.device());
39 } 39 }
40 40
41 SkDevice* PlatformCanvasLinux::createDevice(SkBitmap::Config, int width, 41 SkDevice* PlatformCanvasLinux::createDevice(SkBitmap::Config config,
42 int height, bool is_opaque) { 42 int width,
43 int height,
44 bool is_opaque, bool isForLayer) {
45 DCHECK(config == SkBitmap::kARGB_8888_Config);
43 return createPlatformDevice(width, height, is_opaque); 46 return createPlatformDevice(width, height, is_opaque);
44 } 47 }
45 48
46 SkDevice* PlatformCanvasLinux::createPlatformDevice(int width, 49 SkDevice* PlatformCanvasLinux::createPlatformDevice(int width,
47 int height, 50 int height,
48 bool is_opaque) { 51 bool is_opaque) {
49 return BitmapPlatformDeviceLinux::Create(width, height, is_opaque); 52 return BitmapPlatformDeviceLinux::Create(width, height, is_opaque);
50 } 53 }
51 54
52 } // namespace gfx 55 } // namespace gfx
OLDNEW
« no previous file with comments | « src/base/gfx/platform_canvas_linux.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698