Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2971)

Unified Diff: cc/trees/property_tree.h

Issue 2452303003: Revert of cc : Move screen space scale factor to root transform node (Closed)
Patch Set: resolve merge conflicts Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/trees/layer_tree_host_common_unittest.cc ('k') | cc/trees/property_tree.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/property_tree.h
diff --git a/cc/trees/property_tree.h b/cc/trees/property_tree.h
index 23ff38a622a723a086a7004f42dcdf40789ec908..c97a9ccd2a073b9df8dd15b8fd5156357613d500 100644
--- a/cc/trees/property_tree.h
+++ b/cc/trees/property_tree.h
@@ -224,11 +224,9 @@ class CC_EXPORT TransformTree final : public PropertyTree<TransformNode> {
}
float device_scale_factor() const { return device_scale_factor_; }
- void SetRootTransformsAndScales(float device_scale_factor,
- float page_scale_factor_for_root,
- const gfx::Transform& device_transform,
- gfx::PointF root_position);
-
+ void SetDeviceTransform(const gfx::Transform& transform,
+ gfx::PointF root_position);
+ void SetDeviceTransformScaleFactor(const gfx::Transform& transform);
float device_transform_scale_factor() const {
return device_transform_scale_factor_;
}
@@ -304,10 +302,6 @@ class CC_EXPORT TransformTree final : public PropertyTree<TransformNode> {
TransformNode* node,
TransformNode* parent_node);
bool NeedsSourceToParentUpdate(TransformNode* node);
- void SetContentsRootPostLocalTransform(const gfx::Transform& transform,
- gfx::PointF root_position);
- void SetScreenSpaceScaleOnRootNode(
- gfx::Vector2dF screen_space_scale_components);
bool source_to_parent_updates_allowed_;
// When to_screen transform has perspective, the transform node's sublayer
« no previous file with comments | « cc/trees/layer_tree_host_common_unittest.cc ('k') | cc/trees/property_tree.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698