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

Side by Side Diff: content/renderer/pepper/ppb_image_data_impl.cc

Issue 2618373002: Remove PPB_ImageData_API::GetPlatformCanvas() (Closed)
Patch Set: Created 3 years, 11 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 | « content/renderer/pepper/ppb_image_data_impl.h ('k') | ppapi/proxy/ppb_image_data_proxy.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "content/renderer/pepper/ppb_image_data_impl.h" 5 #include "content/renderer/pepper/ppb_image_data_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <limits> 8 #include <limits>
9 #include <memory> 9 #include <memory>
10 10
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 107
108 void* PPB_ImageData_Impl::Map() { return backend_->Map(); } 108 void* PPB_ImageData_Impl::Map() { return backend_->Map(); }
109 109
110 void PPB_ImageData_Impl::Unmap() { backend_->Unmap(); } 110 void PPB_ImageData_Impl::Unmap() { backend_->Unmap(); }
111 111
112 int32_t PPB_ImageData_Impl::GetSharedMemory(base::SharedMemory** shm, 112 int32_t PPB_ImageData_Impl::GetSharedMemory(base::SharedMemory** shm,
113 uint32_t* byte_count) { 113 uint32_t* byte_count) {
114 return backend_->GetSharedMemory(shm, byte_count); 114 return backend_->GetSharedMemory(shm, byte_count);
115 } 115 }
116 116
117 SkCanvas* PPB_ImageData_Impl::GetPlatformCanvas() {
118 return backend_->GetPlatformCanvas();
119 }
120
121 SkCanvas* PPB_ImageData_Impl::GetCanvas() { return backend_->GetCanvas(); } 117 SkCanvas* PPB_ImageData_Impl::GetCanvas() { return backend_->GetCanvas(); }
122 118
123 void PPB_ImageData_Impl::SetIsCandidateForReuse() { 119 void PPB_ImageData_Impl::SetIsCandidateForReuse() {
124 // Nothing to do since we don't support image data re-use in-process. 120 // Nothing to do since we don't support image data re-use in-process.
125 } 121 }
126 122
127 SkBitmap PPB_ImageData_Impl::GetMappedBitmap() const { 123 SkBitmap PPB_ImageData_Impl::GetMappedBitmap() const {
128 return backend_->GetMappedBitmap(); 124 return backend_->GetMappedBitmap();
129 } 125 }
130 126
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 // in the future to save some memory. 188 // in the future to save some memory.
193 } 189 }
194 190
195 int32_t ImageDataPlatformBackend::GetSharedMemory(base::SharedMemory** shm, 191 int32_t ImageDataPlatformBackend::GetSharedMemory(base::SharedMemory** shm,
196 uint32_t* byte_count) { 192 uint32_t* byte_count) {
197 *byte_count = dib_->size(); 193 *byte_count = dib_->size();
198 *shm = dib_->shared_memory(); 194 *shm = dib_->shared_memory();
199 return PP_OK; 195 return PP_OK;
200 } 196 }
201 197
202 SkCanvas* ImageDataPlatformBackend::GetPlatformCanvas() {
203 return mapped_canvas_.get();
204 }
205
206 SkCanvas* ImageDataPlatformBackend::GetCanvas() { return mapped_canvas_.get(); } 198 SkCanvas* ImageDataPlatformBackend::GetCanvas() { return mapped_canvas_.get(); }
207 199
208 SkBitmap ImageDataPlatformBackend::GetMappedBitmap() const { 200 SkBitmap ImageDataPlatformBackend::GetMappedBitmap() const {
209 SkBitmap bitmap; 201 SkBitmap bitmap;
210 if (!mapped_canvas_) 202 if (!mapped_canvas_)
211 return bitmap; 203 return bitmap;
212 204
213 SkPixmap pixmap; 205 SkPixmap pixmap;
214 skia::GetWritablePixels(mapped_canvas_.get(), &pixmap); 206 skia::GetWritablePixels(mapped_canvas_.get(), &pixmap);
215 // SkPixmap does not manage the lifetime of this pointer, so it remains 207 // SkPixmap does not manage the lifetime of this pointer, so it remains
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
261 shared_memory_->Unmap(); 253 shared_memory_->Unmap();
262 } 254 }
263 255
264 int32_t ImageDataSimpleBackend::GetSharedMemory(base::SharedMemory** shm, 256 int32_t ImageDataSimpleBackend::GetSharedMemory(base::SharedMemory** shm,
265 uint32_t* byte_count) { 257 uint32_t* byte_count) {
266 *byte_count = skia_bitmap_.getSize(); 258 *byte_count = skia_bitmap_.getSize();
267 *shm = shared_memory_.get(); 259 *shm = shared_memory_.get();
268 return PP_OK; 260 return PP_OK;
269 } 261 }
270 262
271 SkCanvas* ImageDataSimpleBackend::GetPlatformCanvas() {
272 return NULL;
273 }
274
275 SkCanvas* ImageDataSimpleBackend::GetCanvas() { 263 SkCanvas* ImageDataSimpleBackend::GetCanvas() {
276 if (!IsMapped()) 264 if (!IsMapped())
277 return NULL; 265 return NULL;
278 return skia_canvas_.get(); 266 return skia_canvas_.get();
279 } 267 }
280 268
281 SkBitmap ImageDataSimpleBackend::GetMappedBitmap() const { 269 SkBitmap ImageDataSimpleBackend::GetMappedBitmap() const {
282 if (!IsMapped()) 270 if (!IsMapped())
283 return SkBitmap(); 271 return SkBitmap();
284 return skia_bitmap_; 272 return skia_bitmap_;
285 } 273 }
286 274
287 } // namespace content 275 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/pepper/ppb_image_data_impl.h ('k') | ppapi/proxy/ppb_image_data_proxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698