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

Unified Diff: ui/compositor/layer_animation_element.cc

Issue 11145005: Migrate ui::Transform to gfx::Transform (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Hopefully should work this time Created 8 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 | « ui/compositor/layer_animation_element.h ('k') | ui/compositor/layer_animation_element_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/compositor/layer_animation_element.cc
diff --git a/ui/compositor/layer_animation_element.cc b/ui/compositor/layer_animation_element.cc
index c48a81c99d0fd0777117891f7311b82722d87571..2b41e84a912d5b84446c486f6cb8162b9cf66fab 100644
--- a/ui/compositor/layer_animation_element.cc
+++ b/ui/compositor/layer_animation_element.cc
@@ -38,7 +38,7 @@ class Pause : public LayerAnimationElement {
class TransformTransition : public LayerAnimationElement {
public:
- TransformTransition(const Transform& target, base::TimeDelta duration)
+ TransformTransition(const gfx::Transform& target, base::TimeDelta duration)
: LayerAnimationElement(GetProperties(), duration),
target_(target) {
}
@@ -68,8 +68,8 @@ class TransformTransition : public LayerAnimationElement {
return properties;
}
- Transform start_;
- const Transform target_;
+ gfx::Transform start_;
+ const gfx::Transform target_;
DISALLOW_COPY_AND_ASSIGN(TransformTransition);
};
@@ -382,7 +382,8 @@ LayerAnimationElement::TargetValue::TargetValue()
LayerAnimationElement::TargetValue::TargetValue(
const LayerAnimationDelegate* delegate)
: bounds(delegate ? delegate->GetBoundsForAnimation() : gfx::Rect()),
- transform(delegate ? delegate->GetTransformForAnimation() : Transform()),
+ transform(delegate ?
+ delegate->GetTransformForAnimation() : gfx::Transform()),
opacity(delegate ? delegate->GetOpacityForAnimation() : 0.0f),
visibility(delegate ? delegate->GetVisibilityForAnimation() : false),
brightness(delegate ? delegate->GetBrightnessForAnimation() : 0.0f),
@@ -436,7 +437,7 @@ base::TimeDelta LayerAnimationElement::GetEffectiveDuration(
// static
LayerAnimationElement* LayerAnimationElement::CreateTransformElement(
- const Transform& transform,
+ const gfx::Transform& transform,
base::TimeDelta duration) {
return new TransformTransition(transform, duration);
}
« no previous file with comments | « ui/compositor/layer_animation_element.h ('k') | ui/compositor/layer_animation_element_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698