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

Unified Diff: cc/resources/tile_draw_info.h

Issue 951673002: Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b" (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 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/tile.cc ('k') | cc/resources/tile_draw_info.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/resources/tile_draw_info.h
diff --git a/cc/resources/tile_draw_info.h b/cc/resources/tile_draw_info.h
index 0c6bbf61286b5d8f57f7e2fefe5d3579da608dd0..54ca946a23247b0fb32abcd0c89d18b17aea2505 100644
--- a/cc/resources/tile_draw_info.h
+++ b/cc/resources/tile_draw_info.h
@@ -17,7 +17,7 @@ namespace cc {
// This class holds all the state relevant to drawing a tile.
class CC_EXPORT TileDrawInfo {
public:
- enum Mode { RESOURCE_MODE, SOLID_COLOR_MODE, OOM_MODE };
+ enum Mode { RESOURCE_MODE, SOLID_COLOR_MODE, PICTURE_PILE_MODE };
TileDrawInfo();
~TileDrawInfo();
@@ -49,7 +49,7 @@ class CC_EXPORT TileDrawInfo {
}
bool requires_resource() const {
- return mode_ == RESOURCE_MODE || mode_ == OOM_MODE;
+ return mode_ == RESOURCE_MODE || mode_ == PICTURE_PILE_MODE;
}
inline bool has_resource() const { return !!resource_; }
@@ -72,7 +72,7 @@ class CC_EXPORT TileDrawInfo {
solid_color_ = color;
}
- void set_oom() { mode_ = OOM_MODE; }
+ void set_rasterize_on_demand() { mode_ = PICTURE_PILE_MODE; }
Mode mode_;
SkColor solid_color_;
« no previous file with comments | « cc/resources/tile.cc ('k') | cc/resources/tile_draw_info.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698