| OLD | NEW |
| 1 // Copyright 2011 The Chromium Authors. All rights reserved. | 1 // Copyright 2011 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/trees/layer_tree_host_common.h" | 5 #include "cc/trees/layer_tree_host_common.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/trace_event/trace_event.h" | 9 #include "base/trace_event/trace_event.h" |
| 10 #include "cc/base/math_util.h" | 10 #include "cc/base/math_util.h" |
| (...skipping 2488 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2499 DrawOpacityFromPropertyTrees(current_layer, property_trees->opacity_tree); | 2499 DrawOpacityFromPropertyTrees(current_layer, property_trees->opacity_tree); |
| 2500 CHECK(draw_opacities_match) | 2500 CHECK(draw_opacities_match) |
| 2501 << "expected: " << current_layer->draw_opacity() | 2501 << "expected: " << current_layer->draw_opacity() |
| 2502 << " actual: " << DrawOpacityFromPropertyTrees( | 2502 << " actual: " << DrawOpacityFromPropertyTrees( |
| 2503 current_layer, property_trees->opacity_tree); | 2503 current_layer, property_trees->opacity_tree); |
| 2504 const bool can_use_lcd_text_match = | 2504 const bool can_use_lcd_text_match = |
| 2505 CanUseLcdTextFromPropertyTrees( | 2505 CanUseLcdTextFromPropertyTrees( |
| 2506 current_layer, layers_always_allowed_lcd_text, can_use_lcd_text, | 2506 current_layer, layers_always_allowed_lcd_text, can_use_lcd_text, |
| 2507 property_trees) == current_layer->can_use_lcd_text(); | 2507 property_trees) == current_layer->can_use_lcd_text(); |
| 2508 CHECK(can_use_lcd_text_match); | 2508 CHECK(can_use_lcd_text_match); |
| 2509 |
| 2510 CHECK_EQ(current_layer->is_clipped(), |
| 2511 current_layer->draw_properties().is_clipped_from_property_trees); |
| 2509 } | 2512 } |
| 2510 | 2513 |
| 2511 void VerifyPropertyTreeValues( | 2514 void VerifyPropertyTreeValues( |
| 2512 LayerTreeHostCommon::CalcDrawPropsMainInputs* inputs) { | 2515 LayerTreeHostCommon::CalcDrawPropsMainInputs* inputs) { |
| 2513 } | 2516 } |
| 2514 | 2517 |
| 2515 void VerifyPropertyTreeValues( | 2518 void VerifyPropertyTreeValues( |
| 2516 LayerTreeHostCommon::CalcDrawPropsImplInputs* inputs) { | 2519 LayerTreeHostCommon::CalcDrawPropsImplInputs* inputs) { |
| 2517 LayerIterator it, end; | 2520 LayerIterator it, end; |
| 2518 for (it = LayerIterator::Begin(inputs->render_surface_layer_list), | 2521 for (it = LayerIterator::Begin(inputs->render_surface_layer_list), |
| (...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2639 | 2642 |
| 2640 PropertyTrees* GetPropertyTrees(Layer* layer) { | 2643 PropertyTrees* GetPropertyTrees(Layer* layer) { |
| 2641 return layer->layer_tree_host()->property_trees(); | 2644 return layer->layer_tree_host()->property_trees(); |
| 2642 } | 2645 } |
| 2643 | 2646 |
| 2644 PropertyTrees* GetPropertyTrees(LayerImpl* layer) { | 2647 PropertyTrees* GetPropertyTrees(LayerImpl* layer) { |
| 2645 return layer->layer_tree_impl()->property_trees(); | 2648 return layer->layer_tree_impl()->property_trees(); |
| 2646 } | 2649 } |
| 2647 | 2650 |
| 2648 } // namespace cc | 2651 } // namespace cc |
| OLD | NEW |