Chromium Code Reviews| Index: cc/trees/layer_tree_host_common.cc |
| diff --git a/cc/trees/layer_tree_host_common.cc b/cc/trees/layer_tree_host_common.cc |
| index cdb67611826cc66e8cb3af2567c46f5a84729c48..6fb51d382d726bff69900e5a11699db54ad98d31 100644 |
| --- a/cc/trees/layer_tree_host_common.cc |
| +++ b/cc/trees/layer_tree_host_common.cc |
| @@ -2556,7 +2556,10 @@ void LayerTreeHostCommon::CalculateDrawProperties( |
| current_layer->draw_opacity() == |
| current_layer->DrawOpacityFromPropertyTrees( |
| inputs->property_trees->opacity_tree); |
| - CHECK(draw_opacities_match); |
| + CHECK(draw_opacities_match) |
|
enne (OOO)
2015/04/17 20:04:21
<_<
|
| + << "expected: " << current_layer->draw_opacity() << " actual: " |
| + << current_layer->DrawOpacityFromPropertyTrees( |
| + inputs->property_trees->opacity_tree); |
| } |
| } |
| @@ -2593,4 +2596,14 @@ void LayerTreeHostCommon::CalculateDrawProperties( |
| DCHECK(inputs->root_layer->render_surface()); |
| } |
| +PropertyTrees* GetPropertyTrees(Layer* layer, |
| + PropertyTrees* trees_from_inputs) { |
| + return layer->layer_tree_host()->property_trees(); |
| +} |
| + |
| +PropertyTrees* GetPropertyTrees(LayerImpl* layer, |
| + PropertyTrees* trees_from_inputs) { |
| + return trees_from_inputs; |
| +} |
| + |
| } // namespace cc |