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

Unified Diff: cc/paint/draw_image.cc

Issue 2857923004: cc: Keep PaintImage in DrawImage. (Closed)
Patch Set: .. Created 3 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/paint/draw_image.h ('k') | cc/paint/image_id.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/paint/draw_image.cc
diff --git a/cc/paint/draw_image.cc b/cc/paint/draw_image.cc
index 6c0bb644864aa9bcbbf9e737d42b394ee300a0ca..6ffb3ae839b95d4fce420eed185b2d98e54c22e6 100644
--- a/cc/paint/draw_image.cc
+++ b/cc/paint/draw_image.cc
@@ -23,19 +23,18 @@ bool ExtractScale(const SkMatrix& matrix, SkSize* scale) {
} // namespace
DrawImage::DrawImage()
- : image_(nullptr),
- src_rect_(SkIRect::MakeXYWH(0, 0, 0, 0)),
+ : src_rect_(SkIRect::MakeXYWH(0, 0, 0, 0)),
filter_quality_(kNone_SkFilterQuality),
matrix_(SkMatrix::I()),
scale_(SkSize::Make(1.f, 1.f)),
matrix_is_decomposable_(true) {}
-DrawImage::DrawImage(sk_sp<const SkImage> image,
+DrawImage::DrawImage(PaintImage image,
const SkIRect& src_rect,
SkFilterQuality filter_quality,
const SkMatrix& matrix,
const gfx::ColorSpace& target_color_space)
- : image_(std::move(image)),
+ : paint_image_(std::move(image)),
src_rect_(src_rect),
filter_quality_(filter_quality),
matrix_(matrix),
« no previous file with comments | « cc/paint/draw_image.h ('k') | cc/paint/image_id.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698