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

Side by Side Diff: cc/layers/picture_layer.cc

Issue 196023015: Revert of cc: Replace recorded region with direct map lookup (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | cc/layers/picture_layer_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "cc/layers/picture_layer.h" 5 #include "cc/layers/picture_layer.h"
6 6
7 #include "cc/layers/content_layer_client.h" 7 #include "cc/layers/content_layer_client.h"
8 #include "cc/layers/picture_layer_impl.h" 8 #include "cc/layers/picture_layer_impl.h"
9 #include "cc/trees/layer_tree_impl.h" 9 #include "cc/trees/layer_tree_impl.h"
10 #include "ui/gfx/rect_conversions.h" 10 #include "ui/gfx/rect_conversions.h"
(...skipping 25 matching lines...) Expand all
36 36
37 void PictureLayer::PushPropertiesTo(LayerImpl* base_layer) { 37 void PictureLayer::PushPropertiesTo(LayerImpl* base_layer) {
38 Layer::PushPropertiesTo(base_layer); 38 Layer::PushPropertiesTo(base_layer);
39 PictureLayerImpl* layer_impl = static_cast<PictureLayerImpl*>(base_layer); 39 PictureLayerImpl* layer_impl = static_cast<PictureLayerImpl*>(base_layer);
40 40
41 if (layer_impl->bounds().IsEmpty()) { 41 if (layer_impl->bounds().IsEmpty()) {
42 // Update may not get called for an empty layer, so resize here instead. 42 // Update may not get called for an empty layer, so resize here instead.
43 // Using layer_impl because either bounds() or paint_properties().bounds 43 // Using layer_impl because either bounds() or paint_properties().bounds
44 // may disagree and either one could have been pushed to layer_impl. 44 // may disagree and either one could have been pushed to layer_impl.
45 pile_->Resize(gfx::Size()); 45 pile_->Resize(gfx::Size());
46 pile_->UpdateRecordedRegion();
46 } else if (update_source_frame_number_ == 47 } else if (update_source_frame_number_ ==
47 layer_tree_host()->source_frame_number()) { 48 layer_tree_host()->source_frame_number()) {
48 // If update called, then pile size must match bounds pushed to impl layer. 49 // If update called, then pile size must match bounds pushed to impl layer.
49 DCHECK_EQ(layer_impl->bounds().ToString(), pile_->size().ToString()); 50 DCHECK_EQ(layer_impl->bounds().ToString(), pile_->size().ToString());
50 } 51 }
51 52
52 layer_impl->SetIsMask(is_mask_); 53 layer_impl->SetIsMask(is_mask_);
53 // Unlike other properties, invalidation must always be set on layer_impl. 54 // Unlike other properties, invalidation must always be set on layer_impl.
54 // See PictureLayerImpl::PushPropertiesTo for more details. 55 // See PictureLayerImpl::PushPropertiesTo for more details.
55 layer_impl->invalidation_.Clear(); 56 layer_impl->invalidation_.Clear();
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 client_->PaintContents(canvas, gfx::Rect(width, height), &opaque); 154 client_->PaintContents(canvas, gfx::Rect(width, height), &opaque);
154 picture->endRecording(); 155 picture->endRecording();
155 return picture; 156 return picture;
156 } 157 }
157 158
158 void PictureLayer::RunMicroBenchmark(MicroBenchmark* benchmark) { 159 void PictureLayer::RunMicroBenchmark(MicroBenchmark* benchmark) {
159 benchmark->RunOnLayer(this); 160 benchmark->RunOnLayer(this);
160 } 161 }
161 162
162 } // namespace cc 163 } // namespace cc
OLDNEW
« no previous file with comments | « no previous file | cc/layers/picture_layer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698