summaryrefslogtreecommitdiffstats
path: root/cc/raster
diff options
context:
space:
mode:
authordanakj <danakj@chromium.org>2015-06-03 17:24:46 -0700
committerCommit bot <commit-bot@chromium.org>2015-06-04 00:25:10 +0000
commit68ed2157fd8e37400456c798184cdc8afb702cd1 (patch)
treed15b2aed5c4b57c1300b611bd3bf3cb0c8bb2dc2 /cc/raster
parentc331f31fd1ad267cc83801e111a7a7bb3971a057 (diff)
downloadchromium_src-68ed2157fd8e37400456c798184cdc8afb702cd1.zip
chromium_src-68ed2157fd8e37400456c798184cdc8afb702cd1.tar.gz
chromium_src-68ed2157fd8e37400456c798184cdc8afb702cd1.tar.bz2
cc: Fix partial raster with one copy resource finding.
Only save the resource content id as the previous id if we actually found a previous resource. Otherwise it's a lie. Just like the cake. R=vmpstr BUG=487387 Review URL: https://codereview.chromium.org/1159673003 Cr-Commit-Position: refs/heads/master@{#332747}
Diffstat (limited to 'cc/raster')
-rw-r--r--cc/raster/one_copy_tile_task_worker_pool.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/cc/raster/one_copy_tile_task_worker_pool.cc b/cc/raster/one_copy_tile_task_worker_pool.cc
index 0a8c1e6..ebc2301 100644
--- a/cc/raster/one_copy_tile_task_worker_pool.cc
+++ b/cc/raster/one_copy_tile_task_worker_pool.cc
@@ -39,9 +39,9 @@ class RasterBufferImpl : public RasterBuffer {
previous_content_id) {
raster_resource_ =
resource_pool->TryAcquireResourceWithContentId(previous_content_id);
- raster_content_id_ = previous_content_id;
}
if (raster_resource_) {
+ raster_content_id_ = previous_content_id;
DCHECK_EQ(resource_format, raster_resource_->format());
DCHECK_EQ(output_resource->size().ToString(),
raster_resource_->size().ToString());