Chromium Code Reviews| 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 1014 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1025 // TODO(sunxd): the draw transform of a mask layer misses the "scale to fit" | 1025 // TODO(sunxd): the draw transform of a mask layer misses the "scale to fit" |
| 1026 // factor from mask layer to its parent. So does the screen space transform. | 1026 // factor from mask layer to its parent. So does the screen space transform. |
| 1027 // It does not cause a problem because currently we only have 1:1 mask layer. | 1027 // It does not cause a problem because currently we only have 1:1 mask layer. |
| 1028 mask_layer->draw_properties().target_space_transform = DrawTransform( | 1028 mask_layer->draw_properties().target_space_transform = DrawTransform( |
| 1029 mask_layer, property_trees->transform_tree, property_trees->effect_tree); | 1029 mask_layer, property_trees->transform_tree, property_trees->effect_tree); |
| 1030 mask_layer->draw_properties().screen_space_transform = | 1030 mask_layer->draw_properties().screen_space_transform = |
| 1031 ScreenSpaceTransformInternal(mask_layer, | 1031 ScreenSpaceTransformInternal(mask_layer, |
| 1032 property_trees->transform_tree); | 1032 property_trees->transform_tree); |
| 1033 mask_layer->draw_properties().visible_layer_rect = | 1033 mask_layer->draw_properties().visible_layer_rect = |
| 1034 gfx::Rect(mask_layer->bounds()); | 1034 gfx::Rect(mask_layer->bounds()); |
| 1035 mask_layer->draw_properties().opacity = 1; | |
|
chrishtr
2017/06/16 22:34:33
Why this change?
sunxd
2017/06/20 14:36:10
SolidColorLayer deliberately skips quads with opac
| |
| 1035 } | 1036 } |
| 1036 | 1037 |
| 1037 void ComputeSurfaceDrawProperties(PropertyTrees* property_trees, | 1038 void ComputeSurfaceDrawProperties(PropertyTrees* property_trees, |
| 1038 RenderSurfaceImpl* render_surface) { | 1039 RenderSurfaceImpl* render_surface) { |
| 1039 SetSurfaceIsClipped(property_trees->clip_tree, render_surface); | 1040 SetSurfaceIsClipped(property_trees->clip_tree, render_surface); |
| 1040 SetSurfaceDrawOpacity(property_trees->effect_tree, render_surface); | 1041 SetSurfaceDrawOpacity(property_trees->effect_tree, render_surface); |
| 1041 SetSurfaceDrawTransform(property_trees, render_surface); | 1042 SetSurfaceDrawTransform(property_trees, render_surface); |
| 1042 render_surface->SetScreenSpaceTransform( | 1043 render_surface->SetScreenSpaceTransform( |
| 1043 property_trees->ToScreenSpaceTransformWithoutSurfaceContentsScale( | 1044 property_trees->ToScreenSpaceTransformWithoutSurfaceContentsScale( |
| 1044 render_surface->TransformTreeIndex(), | 1045 render_surface->TransformTreeIndex(), |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1079 void UpdateElasticOverscroll(PropertyTrees* property_trees, | 1080 void UpdateElasticOverscroll(PropertyTrees* property_trees, |
| 1080 const Layer* overscroll_elasticity_layer, | 1081 const Layer* overscroll_elasticity_layer, |
| 1081 const gfx::Vector2dF& elastic_overscroll) { | 1082 const gfx::Vector2dF& elastic_overscroll) { |
| 1082 UpdateElasticOverscrollInternal(property_trees, overscroll_elasticity_layer, | 1083 UpdateElasticOverscrollInternal(property_trees, overscroll_elasticity_layer, |
| 1083 elastic_overscroll); | 1084 elastic_overscroll); |
| 1084 } | 1085 } |
| 1085 | 1086 |
| 1086 } // namespace draw_property_utils | 1087 } // namespace draw_property_utils |
| 1087 | 1088 |
| 1088 } // namespace cc | 1089 } // namespace cc |
| OLD | NEW |