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

Side by Side Diff: cc/paint/skia_paint_canvas.cc

Issue 2758413002: cc/paint: Remove PaintCanvas::peekPixels. (Closed)
Patch Set: canvas Created 3 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
OLDNEW
1 // Copyright 2017 The Chromium Authors. All rights reserved. 1 // Copyright 2017 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 "cc/paint/paint_canvas.h" 5 #include "cc/paint/paint_canvas.h"
6 6
7 #include "base/memory/ptr_util.h" 7 #include "base/memory/ptr_util.h"
8 #include "cc/paint/paint_record.h" 8 #include "cc/paint/paint_record.h"
9 #include "cc/paint/paint_recorder.h" 9 #include "cc/paint/paint_recorder.h"
10 #include "third_party/skia/include/core/SkAnnotation.h" 10 #include "third_party/skia/include/core/SkAnnotation.h"
11 #include "third_party/skia/include/core/SkMetaData.h" 11 #include "third_party/skia/include/core/SkMetaData.h"
12 #include "third_party/skia/include/utils/SkNWayCanvas.h" 12 #include "third_party/skia/include/utils/SkNWayCanvas.h"
13 13
14 namespace cc { 14 namespace cc {
15 15
16 SkiaPaintCanvas::SkiaPaintCanvas(SkCanvas* canvas) : canvas_(canvas) {} 16 SkiaPaintCanvas::SkiaPaintCanvas(SkCanvas* canvas) : canvas_(canvas) {}
17 17
18 SkiaPaintCanvas::SkiaPaintCanvas(const SkBitmap& bitmap) 18 SkiaPaintCanvas::SkiaPaintCanvas(const SkBitmap& bitmap)
19 : canvas_(new SkCanvas(bitmap)), owned_(canvas_) {} 19 : canvas_(new SkCanvas(bitmap)), owned_(canvas_) {}
20 20
21 SkiaPaintCanvas::SkiaPaintCanvas(const SkBitmap& bitmap, 21 SkiaPaintCanvas::SkiaPaintCanvas(const SkBitmap& bitmap,
22 const SkSurfaceProps& props) 22 const SkSurfaceProps& props)
23 : canvas_(new SkCanvas(bitmap, props)), owned_(canvas_) {} 23 : canvas_(new SkCanvas(bitmap, props)), owned_(canvas_) {}
24 24
25 SkiaPaintCanvas::SkiaPaintCanvas(SkiaPaintCanvas&& other) = default;
25 SkiaPaintCanvas::~SkiaPaintCanvas() = default; 26 SkiaPaintCanvas::~SkiaPaintCanvas() = default;
26 27
27 SkMetaData& SkiaPaintCanvas::getMetaData() { 28 SkMetaData& SkiaPaintCanvas::getMetaData() {
28 return canvas_->getMetaData(); 29 return canvas_->getMetaData();
29 } 30 }
30 31
31 SkImageInfo SkiaPaintCanvas::imageInfo() const { 32 SkImageInfo SkiaPaintCanvas::imageInfo() const {
32 return canvas_->imageInfo(); 33 return canvas_->imageInfo();
33 } 34 }
34 35
35 void SkiaPaintCanvas::flush() { 36 void SkiaPaintCanvas::flush() {
36 canvas_->flush(); 37 canvas_->flush();
37 } 38 }
38 39
39 SkISize SkiaPaintCanvas::getBaseLayerSize() const { 40 SkISize SkiaPaintCanvas::getBaseLayerSize() const {
40 return canvas_->getBaseLayerSize(); 41 return canvas_->getBaseLayerSize();
41 } 42 }
42 43
43 bool SkiaPaintCanvas::peekPixels(SkPixmap* pixmap) {
44 return canvas_->peekPixels(pixmap);
45 }
46
47 bool SkiaPaintCanvas::readPixels(const SkImageInfo& dest_info, 44 bool SkiaPaintCanvas::readPixels(const SkImageInfo& dest_info,
48 void* dest_pixels, 45 void* dest_pixels,
49 size_t dest_row_bytes, 46 size_t dest_row_bytes,
50 int src_x, 47 int src_x,
51 int src_y) { 48 int src_y) {
52 return canvas_->readPixels(dest_info, dest_pixels, dest_row_bytes, src_x, 49 return canvas_->readPixels(dest_info, dest_pixels, dest_row_bytes, src_x,
53 src_y); 50 src_y);
54 } 51 }
55 52
56 bool SkiaPaintCanvas::readPixels(SkBitmap* bitmap, int src_x, int src_y) { 53 bool SkiaPaintCanvas::readPixels(SkBitmap* bitmap, int src_x, int src_y) {
(...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after
340 SkData* data) { 337 SkData* data) {
341 SkAnnotateNamedDestination(canvas_, point, data); 338 SkAnnotateNamedDestination(canvas_, point, data);
342 } 339 }
343 340
344 void SkiaPaintCanvas::AnnotateLinkToDestination(const SkRect& rect, 341 void SkiaPaintCanvas::AnnotateLinkToDestination(const SkRect& rect,
345 SkData* data) { 342 SkData* data) {
346 SkAnnotateLinkToDestination(canvas_, rect, data); 343 SkAnnotateLinkToDestination(canvas_, rect, data);
347 } 344 }
348 345
349 } // namespace cc 346 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698