| 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 1439 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1450 render_surface->SetIsClipped(effect_node->surface_is_clipped); | 1450 render_surface->SetIsClipped(effect_node->surface_is_clipped); |
| 1451 SetSurfaceDrawOpacity(property_trees->effect_tree, render_surface); | 1451 SetSurfaceDrawOpacity(property_trees->effect_tree, render_surface); |
| 1452 SetSurfaceDrawTransform(property_trees, render_surface); | 1452 SetSurfaceDrawTransform(property_trees, render_surface); |
| 1453 render_surface->SetScreenSpaceTransform( | 1453 render_surface->SetScreenSpaceTransform( |
| 1454 property_trees->ToScreenSpaceTransformWithoutSurfaceContentsScale( | 1454 property_trees->ToScreenSpaceTransformWithoutSurfaceContentsScale( |
| 1455 render_surface->TransformTreeIndex(), | 1455 render_surface->TransformTreeIndex(), |
| 1456 render_surface->EffectTreeIndex())); | 1456 render_surface->EffectTreeIndex())); |
| 1457 | 1457 |
| 1458 const ClipNode* clip_node = | 1458 const ClipNode* clip_node = |
| 1459 property_trees->clip_tree.Node(render_surface->ClipTreeIndex()); | 1459 property_trees->clip_tree.Node(render_surface->ClipTreeIndex()); |
| 1460 SetSurfaceClipRect(property_trees->clip_tree.parent(clip_node), | 1460 SetSurfaceClipRect(clip_node, property_trees, render_surface); |
| 1461 property_trees, render_surface); | |
| 1462 } | 1461 } |
| 1463 | 1462 |
| 1464 #if DCHECK_IS_ON() | 1463 #if DCHECK_IS_ON() |
| 1465 static void ValidatePageScaleLayer(const Layer* page_scale_layer) { | 1464 static void ValidatePageScaleLayer(const Layer* page_scale_layer) { |
| 1466 DCHECK_EQ(page_scale_layer->position().ToString(), gfx::PointF().ToString()); | 1465 DCHECK_EQ(page_scale_layer->position().ToString(), gfx::PointF().ToString()); |
| 1467 DCHECK_EQ(page_scale_layer->transform_origin().ToString(), | 1466 DCHECK_EQ(page_scale_layer->transform_origin().ToString(), |
| 1468 gfx::Point3F().ToString()); | 1467 gfx::Point3F().ToString()); |
| 1469 } | 1468 } |
| 1470 | 1469 |
| 1471 static void ValidatePageScaleLayer(const LayerImpl* page_scale_layer) {} | 1470 static void ValidatePageScaleLayer(const LayerImpl* page_scale_layer) {} |
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1557 void UpdateElasticOverscroll(PropertyTrees* property_trees, | 1556 void UpdateElasticOverscroll(PropertyTrees* property_trees, |
| 1558 const Layer* overscroll_elasticity_layer, | 1557 const Layer* overscroll_elasticity_layer, |
| 1559 const gfx::Vector2dF& elastic_overscroll) { | 1558 const gfx::Vector2dF& elastic_overscroll) { |
| 1560 UpdateElasticOverscrollInternal(property_trees, overscroll_elasticity_layer, | 1559 UpdateElasticOverscrollInternal(property_trees, overscroll_elasticity_layer, |
| 1561 elastic_overscroll); | 1560 elastic_overscroll); |
| 1562 } | 1561 } |
| 1563 | 1562 |
| 1564 } // namespace draw_property_utils | 1563 } // namespace draw_property_utils |
| 1565 | 1564 |
| 1566 } // namespace cc | 1565 } // namespace cc |
| OLD | NEW |