Index: ui/compositor/layer.cc |
diff --git a/ui/compositor/layer.cc b/ui/compositor/layer.cc |
index e71cbd594ff27677bf7f7e34fe790a97579f9b90..ad6aaf1e19681edb123d81219aa19a9c8b747100 100644 |
--- a/ui/compositor/layer.cc |
+++ b/ui/compositor/layer.cc |
@@ -186,7 +186,7 @@ LayerAnimator* Layer::GetAnimator() { |
return animator_.get(); |
} |
-void Layer::SetTransform(const ui::Transform& transform) { |
+void Layer::SetTransform(const gfx::Transform& transform) { |
GetAnimator()->SetTransform(transform); |
} |
@@ -563,7 +563,7 @@ void Layer::StackRelativeTo(Layer* child, Layer* other, bool above) { |
bool Layer::ConvertPointForAncestor(const Layer* ancestor, |
gfx::Point* point) const { |
- ui::Transform transform; |
+ gfx::Transform transform; |
bool result = GetTransformRelativeTo(ancestor, &transform); |
gfx::Point3f p(*point); |
transform.TransformPoint(p); |
@@ -573,7 +573,7 @@ bool Layer::ConvertPointForAncestor(const Layer* ancestor, |
bool Layer::ConvertPointFromAncestor(const Layer* ancestor, |
gfx::Point* point) const { |
- ui::Transform transform; |
+ gfx::Transform transform; |
bool result = GetTransformRelativeTo(ancestor, &transform); |
gfx::Point3f p(*point); |
transform.TransformPointReverse(p); |
@@ -582,7 +582,7 @@ bool Layer::ConvertPointFromAncestor(const Layer* ancestor, |
} |
bool Layer::GetTransformRelativeTo(const Layer* ancestor, |
- ui::Transform* transform) const { |
+ gfx::Transform* transform) const { |
const Layer* p = this; |
for (; p && p != ancestor; p = p->parent()) { |
if (p->transform().HasChange()) |
@@ -619,7 +619,7 @@ void Layer::SetBoundsImmediately(const gfx::Rect& bounds) { |
} |
} |
-void Layer::SetTransformImmediately(const ui::Transform& transform) { |
+void Layer::SetTransformImmediately(const gfx::Transform& transform) { |
transform_ = transform; |
RecomputeTransform(); |
@@ -725,7 +725,7 @@ void Layer::CreateWebLayer() { |
} |
void Layer::RecomputeTransform() { |
- ui::Transform scale_translate; |
+ gfx::Transform scale_translate; |
scale_translate.matrix().set3x3(device_scale_factor_, 0, 0, |
0, device_scale_factor_, 0, |
0, 0, 1); |