OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 <stddef.h> | 5 #include <stddef.h> |
6 | 6 |
7 #include <set> | 7 #include <set> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
(...skipping 1684 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1695 transform_tree.UpdateOuterViewportContainerBoundsDelta(); | 1695 transform_tree.UpdateOuterViewportContainerBoundsDelta(); |
1696 } | 1696 } |
1697 | 1697 |
1698 void PropertyTrees::SetInnerViewportScrollBoundsDelta( | 1698 void PropertyTrees::SetInnerViewportScrollBoundsDelta( |
1699 gfx::Vector2dF bounds_delta) { | 1699 gfx::Vector2dF bounds_delta) { |
1700 inner_viewport_scroll_bounds_delta_ = bounds_delta; | 1700 inner_viewport_scroll_bounds_delta_ = bounds_delta; |
1701 } | 1701 } |
1702 | 1702 |
1703 void PropertyTrees::PushOpacityIfNeeded(PropertyTrees* target_tree) { | 1703 void PropertyTrees::PushOpacityIfNeeded(PropertyTrees* target_tree) { |
1704 for (int id : target_tree->always_use_active_tree_opacity_effect_ids) { | 1704 for (int id : target_tree->always_use_active_tree_opacity_effect_ids) { |
1705 if (EffectNode* source_effect_node = | 1705 if (const EffectNode* source_effect_node = |
1706 effect_tree.FindNodeFromOwningLayerId(id)) { | 1706 effect_tree.FindNodeFromOwningLayerId(id)) { |
1707 EffectNode* target_effect_node = | 1707 EffectNode* target_effect_node = |
1708 target_tree->effect_tree.FindNodeFromOwningLayerId(id); | 1708 target_tree->effect_tree.UpdateNodeFromOwningLayerId(id); |
1709 float source_opacity = source_effect_node->opacity; | 1709 float source_opacity = source_effect_node->opacity; |
1710 float target_opacity = target_effect_node->opacity; | 1710 float target_opacity = target_effect_node->opacity; |
1711 if (source_opacity == target_opacity) | 1711 if (source_opacity == target_opacity) |
1712 continue; | 1712 continue; |
1713 target_effect_node->opacity = source_opacity; | 1713 target_effect_node->opacity = source_opacity; |
1714 target_tree->effect_tree.set_needs_update(true); | 1714 target_tree->effect_tree.set_needs_update(true); |
1715 } | 1715 } |
1716 } | 1716 } |
1717 } | 1717 } |
1718 | 1718 |
(...skipping 363 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2082 const EffectNode* effect_node = effect_tree.Node(effect_id); | 2082 const EffectNode* effect_node = effect_tree.Node(effect_id); |
2083 | 2083 |
2084 if (effect_node->surface_contents_scale.x() != 0.0 && | 2084 if (effect_node->surface_contents_scale.x() != 0.0 && |
2085 effect_node->surface_contents_scale.y() != 0.0) | 2085 effect_node->surface_contents_scale.y() != 0.0) |
2086 screen_space_transform.Scale(1.0 / effect_node->surface_contents_scale.x(), | 2086 screen_space_transform.Scale(1.0 / effect_node->surface_contents_scale.x(), |
2087 1.0 / effect_node->surface_contents_scale.y()); | 2087 1.0 / effect_node->surface_contents_scale.y()); |
2088 return screen_space_transform; | 2088 return screen_space_transform; |
2089 } | 2089 } |
2090 | 2090 |
2091 } // namespace cc | 2091 } // namespace cc |
OLD | NEW |