Index: cc/resources/managed_tile_state.h |
diff --git a/cc/resources/managed_tile_state.h b/cc/resources/managed_tile_state.h |
index 7d5eec7cdf764f4e3417fde4a763aad3c0f55ba4..e8abed9a5d8ecaabe6cc65434aca0794dbf905e3 100644 |
--- a/cc/resources/managed_tile_state.h |
+++ b/cc/resources/managed_tile_state.h |
@@ -45,9 +45,9 @@ class CC_EXPORT ManagedTileState { |
ResourceProvider::ResourceId get_resource_id() const { |
DCHECK(mode_ == RESOURCE_MODE); |
- DCHECK(resource_); |
+ DCHECK(resource_id_); |
DCHECK(memory_state_ == USING_RELEASABLE_MEMORY || forced_upload_); |
- return resource_->id(); |
+ return resource_id_; |
enne (OOO)
2013/05/30 19:38:31
Sorry for such a naive question, but I'm not sure
reveman
2013/05/30 23:25:18
This is because of the current force upload mess.
enne (OOO)
2013/05/31 17:05:38
Ok, thanks. Can you add a FIXME here and some com
reveman
2013/06/01 03:02:38
Done.
|
} |
SkColor get_solid_color() const { |
@@ -90,16 +90,19 @@ class CC_EXPORT ManagedTileState { |
mode_ = SOLID_COLOR_MODE; |
solid_color_ = color; |
memory_state_ = NOT_ALLOWED_TO_USE_MEMORY; |
+ resource_id_ = 0; |
} |
void set_rasterize_on_demand() { |
mode_ = PICTURE_PILE_MODE; |
memory_state_ = NOT_ALLOWED_TO_USE_MEMORY; |
+ resource_id_ = 0; |
} |
Mode mode_; |
SkColor solid_color_; |
+ ResourceProvider::ResourceId resource_id_; |
scoped_ptr<ResourcePool::Resource> resource_; |
GLenum resource_format_; |
TileVersionMemoryState memory_state_; |
@@ -116,7 +119,7 @@ class CC_EXPORT ManagedTileState { |
TileVersion tile_version; |
bool picture_pile_analyzed; |
PicturePileImpl::Analysis picture_pile_analysis; |
- RasterWorkerPool::Task raster_task; |
+ RasterWorkerPool::RasterTask raster_task; |
// Ephemeral state, valid only during TileManager::ManageTiles. |
bool is_in_never_bin_on_both_trees() const { |