| OLD | NEW |
| 1 // Copyright 2010 The Chromium Authors. All rights reserved. | 1 // Copyright 2010 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/layer.h" | 5 #include "cc/layers/layer.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/atomic_sequence_num.h" | 9 #include "base/atomic_sequence_num.h" |
| 10 #include "base/location.h" | 10 #include "base/location.h" |
| (...skipping 1166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1177 // If we did not SavePaintProperties() for the layer this frame, then push the | 1177 // If we did not SavePaintProperties() for the layer this frame, then push the |
| 1178 // real property values, not the paint property values. | 1178 // real property values, not the paint property values. |
| 1179 bool use_paint_properties = paint_properties_.source_frame_number == | 1179 bool use_paint_properties = paint_properties_.source_frame_number == |
| 1180 layer_tree_host_->source_frame_number(); | 1180 layer_tree_host_->source_frame_number(); |
| 1181 | 1181 |
| 1182 layer->SetTransformOrigin(transform_origin_); | 1182 layer->SetTransformOrigin(transform_origin_); |
| 1183 layer->SetBackgroundColor(background_color_); | 1183 layer->SetBackgroundColor(background_color_); |
| 1184 layer->SetBounds(use_paint_properties ? paint_properties_.bounds | 1184 layer->SetBounds(use_paint_properties ? paint_properties_.bounds |
| 1185 : bounds_); | 1185 : bounds_); |
| 1186 | 1186 |
| 1187 #if defined(NDEBUG) |
| 1187 if (frame_viewer_instrumentation::IsTracingLayerTreeSnapshots()) | 1188 if (frame_viewer_instrumentation::IsTracingLayerTreeSnapshots()) |
| 1188 layer->SetDebugInfo(TakeDebugInfo()); | 1189 layer->SetDebugInfo(TakeDebugInfo()); |
| 1190 #else |
| 1191 layer->SetDebugInfo(TakeDebugInfo()); |
| 1192 #endif |
| 1189 | 1193 |
| 1190 layer->SetTransformTreeIndex(transform_tree_index()); | 1194 layer->SetTransformTreeIndex(transform_tree_index()); |
| 1191 layer->SetEffectTreeIndex(effect_tree_index()); | 1195 layer->SetEffectTreeIndex(effect_tree_index()); |
| 1192 layer->SetClipTreeIndex(clip_tree_index()); | 1196 layer->SetClipTreeIndex(clip_tree_index()); |
| 1193 layer->set_offset_to_transform_parent(offset_to_transform_parent_); | 1197 layer->set_offset_to_transform_parent(offset_to_transform_parent_); |
| 1194 layer->SetDoubleSided(double_sided_); | 1198 layer->SetDoubleSided(double_sided_); |
| 1195 layer->SetDrawsContent(DrawsContent()); | 1199 layer->SetDrawsContent(DrawsContent()); |
| 1196 layer->SetHideLayerAndSubtree(hide_layer_and_subtree_); | 1200 layer->SetHideLayerAndSubtree(hide_layer_and_subtree_); |
| 1197 layer->SetHasRenderSurface(has_render_surface_); | 1201 layer->SetHasRenderSurface(has_render_surface_); |
| 1198 if (!layer->FilterIsAnimatingOnImplOnly() && !FilterIsAnimating()) | 1202 if (!layer->FilterIsAnimatingOnImplOnly() && !FilterIsAnimating()) |
| (...skipping 504 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1703 this, layer_tree_host_->property_trees()->transform_tree); | 1707 this, layer_tree_host_->property_trees()->transform_tree); |
| 1704 } | 1708 } |
| 1705 | 1709 |
| 1706 gfx::Transform Layer::screen_space_transform() const { | 1710 gfx::Transform Layer::screen_space_transform() const { |
| 1707 DCHECK_NE(transform_tree_index_, -1); | 1711 DCHECK_NE(transform_tree_index_, -1); |
| 1708 return ScreenSpaceTransformFromPropertyTrees( | 1712 return ScreenSpaceTransformFromPropertyTrees( |
| 1709 this, layer_tree_host_->property_trees()->transform_tree); | 1713 this, layer_tree_host_->property_trees()->transform_tree); |
| 1710 } | 1714 } |
| 1711 | 1715 |
| 1712 } // namespace cc | 1716 } // namespace cc |
| OLD | NEW |