Index: cc/animation/transform_operations.h |
diff --git a/cc/animation/transform_operations.h b/cc/animation/transform_operations.h |
index f086eb1baac1d7a0405189066569d8878e383f64..1c110fffc75a0964520c26b1879ad4155934f799 100644 |
--- a/cc/animation/transform_operations.h |
+++ b/cc/animation/transform_operations.h |
@@ -63,14 +63,6 @@ class CC_EXPORT TransformOperations { |
// Returns true if these operations are only translations. |
bool IsTranslation() const; |
- // Sets |max_scale| to be the maximum scale in any dimension when calling |
- // Blend on |from| with progress in the range [min_progress, max_progress]. If |
- // this maximum scale cannot be computed, returns false. |
- bool MaximumScale(const TransformOperations& from, |
- SkMScalar min_progress, |
- SkMScalar max_progress, |
- float* max_scale) const; |
- |
// Returns true if this operation and its descendants have the same types |
// as other and its descendants. |
bool MatchesTypes(const TransformOperations& other) const; |
@@ -80,6 +72,11 @@ class CC_EXPORT TransformOperations { |
// fails (this can happen if either matrix cannot be decomposed). |
bool CanBlendWith(const TransformOperations& other) const; |
+ // If these operations have no more than one scale operation, and if the only |
+ // other operations are translations, sets |scale| to the scale component |
+ // of these operations. Otherwise, returns false. |
+ bool ScaleComponent(gfx::Vector3dF* scale) const; |
+ |
void AppendTranslate(SkMScalar x, SkMScalar y, SkMScalar z); |
void AppendRotate(SkMScalar x, SkMScalar y, SkMScalar z, SkMScalar degrees); |
void AppendScale(SkMScalar x, SkMScalar y, SkMScalar z); |
@@ -98,11 +95,6 @@ class CC_EXPORT TransformOperations { |
bool ComputeDecomposedTransform() const; |
- // If these operations have no more than one scale operation, and if the only |
- // other operations are translations, sets |scale| to the scale component |
- // of these operations. Otherwise, returns false. |
- bool ScaleComponent(gfx::Vector3dF* scale) const; |
- |
// For efficiency, we cache the decomposed transform. |
mutable scoped_ptr<gfx::DecomposedTransform> decomposed_transform_; |
mutable bool decomposed_transform_dirty_; |