Index: cc/layer_tree_host.cc |
diff --git a/cc/layer_tree_host.cc b/cc/layer_tree_host.cc |
index 003f13031f6ff46d1fadbba44f5e22ebcf329160..411e29f906762793d984fa77970368bdb25ff7c3 100644 |
--- a/cc/layer_tree_host.cc |
+++ b/cc/layer_tree_host.cc |
@@ -734,17 +734,17 @@ void LayerTreeHost::applyScrollAndScale(const ScrollAndScaleSet& info) |
gfx::PointF LayerTreeHost::adjustEventPointForPinchZoom(const gfx::PointF& point) |
const |
{ |
- WebKit::WebTransformationMatrix inverseImplTransform = m_implTransform; |
+ gfx::Transform inverseImplTransform = m_implTransform; |
// TODO(wjmaclean) Need to determine why the next two lines are |
// necessary for this to work ... it seems like just inverting |
// m_implTransform should be sufficient. |
- DCHECK(inverseImplTransform.m11()); |
- DCHECK(inverseImplTransform.m22()); |
- inverseImplTransform.setM41(inverseImplTransform.m41() |
- / inverseImplTransform.m11()); |
- inverseImplTransform.setM42(inverseImplTransform.m42() |
- / inverseImplTransform.m22()); |
- inverseImplTransform = inverseImplTransform.inverse(); |
+ DCHECK(inverseImplTransform.matrix().getDouble(0, 0)); |
+ DCHECK(inverseImplTransform.matrix().getDouble(1, 1)); |
+ inverseImplTransform.matrix().setDouble(0, 3, inverseImplTransform.matrix().getDouble(0, 3) |
+ / inverseImplTransform.matrix().getDouble(0, 0)); |
+ inverseImplTransform.matrix().setDouble(1, 3, inverseImplTransform.matrix().getDouble(1, 3) |
+ / inverseImplTransform.matrix().getDouble(1, 1)); |
+ inverseImplTransform = MathUtil::inverse(inverseImplTransform); |
bool wasClipped = false; |
gfx::PointF adjustedPoint = MathUtil::projectPoint(inverseImplTransform, point, wasClipped); |
DCHECK(!wasClipped); |
@@ -752,7 +752,7 @@ gfx::PointF LayerTreeHost::adjustEventPointForPinchZoom(const gfx::PointF& point |
return adjustedPoint; |
} |
-void LayerTreeHost::setImplTransform(const WebKit::WebTransformationMatrix& transform) |
+void LayerTreeHost::setImplTransform(const gfx::Transform& transform) |
{ |
m_implTransform = transform; |
} |