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

Unified Diff: cc/resources/managed_tile_state.cc

Issue 16190002: cc: Add new RasterWorkerPool interface. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: pass unit tests Created 7 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
Index: cc/resources/managed_tile_state.cc
diff --git a/cc/resources/managed_tile_state.cc b/cc/resources/managed_tile_state.cc
index 2b40f7f3a5325a01e9098e1d0a106d258b0d9483..836dd2290a279fb0dd176e84668930992248ccf7 100644
--- a/cc/resources/managed_tile_state.cc
+++ b/cc/resources/managed_tile_state.cc
@@ -49,6 +49,7 @@ ManagedTileState::ManagedTileState()
ManagedTileState::TileVersion::TileVersion()
: mode_(RESOURCE_MODE),
+ resource_id_(0),
resource_format_(GL_RGBA),
memory_state_(NOT_ALLOWED_TO_USE_MEMORY),
forced_upload_(false) {
@@ -62,10 +63,9 @@ ManagedTileState::TileVersion::~TileVersion() {
bool ManagedTileState::TileVersion::IsReadyToDraw() const {
switch (mode_) {
case RESOURCE_MODE:
- return resource_ &&
+ return resource_id_ &&
(memory_state_ == USING_RELEASABLE_MEMORY ||
- (memory_state_ == USING_UNRELEASABLE_MEMORY && forced_upload_)) &&
- resource_->id();
+ (memory_state_ == USING_UNRELEASABLE_MEMORY && forced_upload_));
case SOLID_COLOR_MODE:
case PICTURE_PILE_MODE:
return true;

Powered by Google App Engine
This is Rietveld 408576698