Index: cc/trees/draw_property_utils.h |
diff --git a/cc/trees/draw_property_utils.h b/cc/trees/draw_property_utils.h |
index 5303d4834536b4d2e7a5f5bee0ea422954520d88..d0c0121ccf7e693f22c49ef4605e76f81753baa2 100644 |
--- a/cc/trees/draw_property_utils.h |
+++ b/cc/trees/draw_property_utils.h |
@@ -6,6 +6,7 @@ |
#define CC_TREES_DRAW_PROPERTY_UTILS_H_ |
#include "cc/base/cc_export.h" |
+#include "cc/layers/draw_properties.h" |
#include "cc/layers/layer_lists.h" |
namespace gfx { |
@@ -74,25 +75,34 @@ ComputeVisibleRectsUsingPropertyTrees(LayerImpl* root_layer, |
PropertyTrees* property_trees, |
LayerImplList* update_layer_list); |
+void CC_EXPORT ComputeLayerDrawPropertiesUsingPropertyTrees( |
+ const LayerImpl* layer, |
+ const PropertyTrees* property_trees, |
+ bool layers_always_allowed_lcd_text, |
+ bool can_use_lcd_text, |
+ DrawProperties<LayerImpl>* draw_properties); |
+ |
+struct CC_EXPORT SurfaceDrawProperties { |
+ SurfaceDrawProperties(); |
+ ~SurfaceDrawProperties(); |
+ |
+ bool is_clipped; |
+ float draw_opacity; |
+ gfx::Transform draw_transform; |
+ gfx::Transform screen_space_transform; |
+ gfx::Transform replica_draw_transform; |
+ gfx::Transform replica_screen_space_transform; |
+ gfx::Rect clip_rect; |
+}; |
+ |
+void CC_EXPORT ComputeSurfaceDrawPropertiesUsingPropertyTrees( |
+ RenderSurfaceImpl* render_surface, |
+ const PropertyTrees* property_trees, |
+ SurfaceDrawProperties* draw_properties); |
+ |
gfx::Transform CC_EXPORT |
DrawTransformFromPropertyTrees(const Layer* layer, const TransformTree& tree); |
-gfx::Transform CC_EXPORT DrawTransformOfRenderSurfaceFromPropertyTrees( |
- const RenderSurfaceImpl* render_Surface, |
- const TransformTree& tree); |
- |
-bool CC_EXPORT |
-RenderSurfaceIsClippedFromPropertyTrees(const RenderSurfaceImpl* render_surface, |
- const ClipTree& tree); |
- |
-gfx::Rect CC_EXPORT ClipRectOfRenderSurfaceFromPropertyTrees( |
- const RenderSurfaceImpl* render_surface, |
- const ClipTree& clip_tree); |
- |
-gfx::Transform CC_EXPORT ScreenSpaceTransformOfRenderSurfaceFromPropertyTrees( |
- const RenderSurfaceImpl* render_surface, |
- const TransformTree& tree); |
- |
gfx::Transform CC_EXPORT |
DrawTransformFromPropertyTrees(const LayerImpl* layer, |
const TransformTree& tree); |
@@ -105,61 +115,11 @@ gfx::Transform CC_EXPORT |
ScreenSpaceTransformFromPropertyTrees(const LayerImpl* layer, |
const TransformTree& tree); |
-bool CC_EXPORT |
-ScreenSpaceTransformIsAnimatingFromPropertyTrees(const Layer* layer, |
- const TransformTree& tree); |
- |
-bool CC_EXPORT |
-ScreenSpaceTransformIsAnimatingFromPropertyTrees(const LayerImpl* layer, |
- const TransformTree& tree); |
- |
-float CC_EXPORT |
-MaximumAnimationTargetScaleFromPropertyTrees(const LayerImpl* layer, |
- const TransformTree& tree); |
- |
-float CC_EXPORT |
-StartingAnimationScaleFromPropertyTrees(const LayerImpl* layer, |
- const TransformTree& tree); |
- |
-float CC_EXPORT DrawOpacityFromPropertyTrees(const Layer* layer, |
- const EffectTree& tree); |
- |
-float CC_EXPORT DrawOpacityFromPropertyTrees(const LayerImpl* layer, |
- const EffectTree& tree); |
- |
-float CC_EXPORT |
-DrawOpacityOfRenderSurfaceFromPropertyTrees(RenderSurfaceImpl* render_surface, |
- const EffectTree& tree); |
- |
-bool CC_EXPORT |
-CanUseLcdTextFromPropertyTrees(const LayerImpl* layer, |
- bool layers_always_allowed_lcd_text, |
- bool can_use_lcd_text, |
- PropertyTrees* property_trees); |
- |
-gfx::Rect CC_EXPORT DrawableContentRectOfSurfaceFromPropertyTrees( |
- const RenderSurfaceImpl* render_surface, |
- const TransformTree& transform_tree); |
- |
gfx::Rect CC_EXPORT |
-DrawableContentRectFromPropertyTrees(const LayerImpl* layer, |
- const TransformTree& transform_tree); |
- |
-gfx::Rect CC_EXPORT |
-ClipRectFromPropertyTrees(const LayerImpl* layer, |
- const TransformTree& transform_tree); |
+DrawableContentRectOfSurface(const RenderSurfaceImpl* render_surface); |
gfx::Rect CC_EXPORT ViewportRectFromPropertyTrees(const ClipTree& tree); |
-gfx::Transform CC_EXPORT DrawTransformOfRenderSurfaceReplicaFromPropertyTrees( |
- const RenderSurfaceImpl* render_surface, |
- const TransformTree& tree); |
- |
-gfx::Transform CC_EXPORT |
-ScreenSpaceTransformOfRenderSurfaceReplicaFromPropertyTrees( |
- const RenderSurfaceImpl* render_surface, |
- const TransformTree& tree); |
- |
} // namespace cc |
#endif // CC_TREES_DRAW_PROPERTY_UTILS_H_ |