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

Unified Diff: cc/resources/picture_pile_base.cc

Issue 669813003: Update from chromium https://crrev.com/301725/ (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 2 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/resources/picture_pile_base.h ('k') | cc/resources/picture_pile_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/resources/picture_pile_base.cc
diff --git a/cc/resources/picture_pile_base.cc b/cc/resources/picture_pile_base.cc
index 45db79141ec757e748260aae849cf644a3ab071c..e7888f799f6358e532909fac107eb4bebfbb53fa 100644
--- a/cc/resources/picture_pile_base.cc
+++ b/cc/resources/picture_pile_base.cc
@@ -47,7 +47,6 @@ PicturePileBase::PicturePileBase()
show_debug_picture_borders_(false),
clear_canvas_with_debug_color_(kDefaultClearCanvasSetting),
has_any_recordings_(false),
- has_text_(false),
is_mask_(false),
is_solid_color_(false),
solid_color_(SK_ColorTRANSPARENT) {
@@ -71,7 +70,6 @@ PicturePileBase::PicturePileBase(const PicturePileBase* other)
show_debug_picture_borders_(other->show_debug_picture_borders_),
clear_canvas_with_debug_color_(other->clear_canvas_with_debug_color_),
has_any_recordings_(other->has_any_recordings_),
- has_text_(other->has_text_),
is_mask_(other->is_mask_),
is_solid_color_(other->is_solid_color_),
solid_color_(other->solid_color_) {
@@ -142,7 +140,7 @@ bool PicturePileBase::HasRecordingAt(int x, int y) {
}
bool PicturePileBase::CanRaster(float contents_scale,
- const gfx::Rect& content_rect) {
+ const gfx::Rect& content_rect) const {
if (tiling_.tiling_size().IsEmpty())
return false;
gfx::Rect layer_rect = gfx::ScaleToEnclosingRect(
« no previous file with comments | « cc/resources/picture_pile_base.h ('k') | cc/resources/picture_pile_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698