| 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 "cc/trees/draw_property_utils.h" | 5 #include "cc/trees/draw_property_utils.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 1008 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1019 // TODO(sunxd): the draw transform of a mask layer misses the "scale to fit" | 1019 // TODO(sunxd): the draw transform of a mask layer misses the "scale to fit" |
| 1020 // factor from mask layer to its parent. So does the screen space transform. | 1020 // factor from mask layer to its parent. So does the screen space transform. |
| 1021 // It does not cause a problem because currently we only have 1:1 mask layer. | 1021 // It does not cause a problem because currently we only have 1:1 mask layer. |
| 1022 mask_layer->draw_properties().target_space_transform = DrawTransform( | 1022 mask_layer->draw_properties().target_space_transform = DrawTransform( |
| 1023 mask_layer, property_trees->transform_tree, property_trees->effect_tree); | 1023 mask_layer, property_trees->transform_tree, property_trees->effect_tree); |
| 1024 mask_layer->draw_properties().screen_space_transform = | 1024 mask_layer->draw_properties().screen_space_transform = |
| 1025 ScreenSpaceTransformInternal(mask_layer, | 1025 ScreenSpaceTransformInternal(mask_layer, |
| 1026 property_trees->transform_tree); | 1026 property_trees->transform_tree); |
| 1027 mask_layer->draw_properties().visible_layer_rect = | 1027 mask_layer->draw_properties().visible_layer_rect = |
| 1028 gfx::Rect(mask_layer->bounds()); | 1028 gfx::Rect(mask_layer->bounds()); |
| 1029 mask_layer->draw_properties().opacity = 1; |
| 1029 } | 1030 } |
| 1030 | 1031 |
| 1031 void ComputeSurfaceDrawProperties(PropertyTrees* property_trees, | 1032 void ComputeSurfaceDrawProperties(PropertyTrees* property_trees, |
| 1032 RenderSurfaceImpl* render_surface) { | 1033 RenderSurfaceImpl* render_surface) { |
| 1033 SetSurfaceIsClipped(property_trees->clip_tree, render_surface); | 1034 SetSurfaceIsClipped(property_trees->clip_tree, render_surface); |
| 1034 SetSurfaceDrawOpacity(property_trees->effect_tree, render_surface); | 1035 SetSurfaceDrawOpacity(property_trees->effect_tree, render_surface); |
| 1035 SetSurfaceDrawTransform(property_trees, render_surface); | 1036 SetSurfaceDrawTransform(property_trees, render_surface); |
| 1036 render_surface->SetScreenSpaceTransform( | 1037 render_surface->SetScreenSpaceTransform( |
| 1037 property_trees->ToScreenSpaceTransformWithoutSurfaceContentsScale( | 1038 property_trees->ToScreenSpaceTransformWithoutSurfaceContentsScale( |
| 1038 render_surface->TransformTreeIndex(), | 1039 render_surface->TransformTreeIndex(), |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1073 void UpdateElasticOverscroll(PropertyTrees* property_trees, | 1074 void UpdateElasticOverscroll(PropertyTrees* property_trees, |
| 1074 const Layer* overscroll_elasticity_layer, | 1075 const Layer* overscroll_elasticity_layer, |
| 1075 const gfx::Vector2dF& elastic_overscroll) { | 1076 const gfx::Vector2dF& elastic_overscroll) { |
| 1076 UpdateElasticOverscrollInternal(property_trees, overscroll_elasticity_layer, | 1077 UpdateElasticOverscrollInternal(property_trees, overscroll_elasticity_layer, |
| 1077 elastic_overscroll); | 1078 elastic_overscroll); |
| 1078 } | 1079 } |
| 1079 | 1080 |
| 1080 } // namespace draw_property_utils | 1081 } // namespace draw_property_utils |
| 1081 | 1082 |
| 1082 } // namespace cc | 1083 } // namespace cc |
| OLD | NEW |