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

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

Issue 1009053002: Revert "Revert "add new signature so skia can rely on it (subclass of SkDevice)"" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 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
« no previous file with comments | « skia/ext/bitmap_platform_device_skia.h ('k') | skia/ext/bitmap_platform_device_win.h » ('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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/bitmap_platform_device_skia.h" 5 #include "skia/ext/bitmap_platform_device_skia.h"
6 #include "skia/ext/platform_canvas.h" 6 #include "skia/ext/platform_canvas.h"
7 7
8 namespace skia { 8 namespace skia {
9 9
10 BitmapPlatformDevice* BitmapPlatformDevice::Create(int width, int height, 10 BitmapPlatformDevice* BitmapPlatformDevice::Create(int width, int height,
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 BitmapPlatformDevice::~BitmapPlatformDevice() { 42 BitmapPlatformDevice::~BitmapPlatformDevice() {
43 } 43 }
44 44
45 SkBaseDevice* BitmapPlatformDevice::onCreateCompatibleDevice( 45 SkBaseDevice* BitmapPlatformDevice::onCreateCompatibleDevice(
46 const CreateInfo& info) { 46 const CreateInfo& info) {
47 SkASSERT(info.fInfo.colorType() == kN32_SkColorType); 47 SkASSERT(info.fInfo.colorType() == kN32_SkColorType);
48 return BitmapPlatformDevice::Create(info.fInfo.width(), info.fInfo.height(), 48 return BitmapPlatformDevice::Create(info.fInfo.width(), info.fInfo.height(),
49 info.fInfo.isOpaque()); 49 info.fInfo.isOpaque());
50 } 50 }
51 51
52 SkBaseDevice* BitmapPlatformDevice::onCreateDevice(const CreateInfo& info,
53 const SkPaint*) {
54 SkASSERT(info.fInfo.colorType() == kN32_SkColorType);
55 return BitmapPlatformDevice::Create(info.fInfo.width(), info.fInfo.height(),
56 info.fInfo.isOpaque());
57 }
58
52 PlatformSurface BitmapPlatformDevice::BeginPlatformPaint() { 59 PlatformSurface BitmapPlatformDevice::BeginPlatformPaint() {
53 // TODO(zhenghao): What should we return? The ptr to the address of the 60 // TODO(zhenghao): What should we return? The ptr to the address of the
54 // pixels? Maybe this won't be called at all. 61 // pixels? Maybe this won't be called at all.
55 return accessBitmap(true).getPixels(); 62 return accessBitmap(true).getPixels();
56 } 63 }
57 64
58 // PlatformCanvas impl 65 // PlatformCanvas impl
59 66
60 SkCanvas* CreatePlatformCanvas(int width, int height, bool is_opaque, 67 SkCanvas* CreatePlatformCanvas(int width, int height, bool is_opaque,
61 uint8_t* data, OnFailureType failureType) { 68 uint8_t* data, OnFailureType failureType) {
62 skia::RefPtr<SkBaseDevice> dev = skia::AdoptRef( 69 skia::RefPtr<SkBaseDevice> dev = skia::AdoptRef(
63 BitmapPlatformDevice::Create(width, height, is_opaque, data)); 70 BitmapPlatformDevice::Create(width, height, is_opaque, data));
64 return CreateCanvas(dev, failureType); 71 return CreateCanvas(dev, failureType);
65 } 72 }
66 73
67 // Port of PlatformBitmap to android 74 // Port of PlatformBitmap to android
68 PlatformBitmap::~PlatformBitmap() { 75 PlatformBitmap::~PlatformBitmap() {
69 // Nothing to do. 76 // Nothing to do.
70 } 77 }
71 78
72 bool PlatformBitmap::Allocate(int width, int height, bool is_opaque) { 79 bool PlatformBitmap::Allocate(int width, int height, bool is_opaque) {
73 if (!bitmap_.tryAllocN32Pixels(width, height, is_opaque)) 80 if (!bitmap_.tryAllocN32Pixels(width, height, is_opaque))
74 return false; 81 return false;
75 82
76 surface_ = bitmap_.getPixels(); 83 surface_ = bitmap_.getPixels();
77 return true; 84 return true;
78 } 85 }
79 86
80 } // namespace skia 87 } // namespace skia
OLDNEW
« no previous file with comments | « skia/ext/bitmap_platform_device_skia.h ('k') | skia/ext/bitmap_platform_device_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698