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

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

Issue 1413363002: Revert of Always call LayerImpl::SetDebugInfo in debug builds. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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)
1188 if (frame_viewer_instrumentation::IsTracingLayerTreeSnapshots()) 1187 if (frame_viewer_instrumentation::IsTracingLayerTreeSnapshots())
1189 layer->SetDebugInfo(TakeDebugInfo()); 1188 layer->SetDebugInfo(TakeDebugInfo());
1190 #else
1191 layer->SetDebugInfo(TakeDebugInfo());
1192 #endif
1193 1189
1194 layer->SetTransformTreeIndex(transform_tree_index()); 1190 layer->SetTransformTreeIndex(transform_tree_index());
1195 layer->SetEffectTreeIndex(effect_tree_index()); 1191 layer->SetEffectTreeIndex(effect_tree_index());
1196 layer->SetClipTreeIndex(clip_tree_index()); 1192 layer->SetClipTreeIndex(clip_tree_index());
1197 layer->set_offset_to_transform_parent(offset_to_transform_parent_); 1193 layer->set_offset_to_transform_parent(offset_to_transform_parent_);
1198 layer->SetDoubleSided(double_sided_); 1194 layer->SetDoubleSided(double_sided_);
1199 layer->SetDrawsContent(DrawsContent()); 1195 layer->SetDrawsContent(DrawsContent());
1200 layer->SetHideLayerAndSubtree(hide_layer_and_subtree_); 1196 layer->SetHideLayerAndSubtree(hide_layer_and_subtree_);
1201 layer->SetHasRenderSurface(has_render_surface_); 1197 layer->SetHasRenderSurface(has_render_surface_);
1202 if (!layer->FilterIsAnimatingOnImplOnly() && !FilterIsAnimating()) 1198 if (!layer->FilterIsAnimatingOnImplOnly() && !FilterIsAnimating())
(...skipping 504 matching lines...) Expand 10 before | Expand all | Expand 10 after
1707 this, layer_tree_host_->property_trees()->transform_tree); 1703 this, layer_tree_host_->property_trees()->transform_tree);
1708 } 1704 }
1709 1705
1710 gfx::Transform Layer::screen_space_transform() const { 1706 gfx::Transform Layer::screen_space_transform() const {
1711 DCHECK_NE(transform_tree_index_, -1); 1707 DCHECK_NE(transform_tree_index_, -1);
1712 return ScreenSpaceTransformFromPropertyTrees( 1708 return ScreenSpaceTransformFromPropertyTrees(
1713 this, layer_tree_host_->property_trees()->transform_tree); 1709 this, layer_tree_host_->property_trees()->transform_tree);
1714 } 1710 }
1715 1711
1716 } // namespace cc 1712 } // namespace cc
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698