Migrate most of cc/ from WebKit::WebTransformationMatrix to gfx::Transform

cc/layer_tree_host_impl.cc

Index: cc/layer_tree_host_impl.cc
diff --git a/cc/layer_tree_host_impl.cc b/cc/layer_tree_host_impl.cc
index 0f96a43d766c2875c3607fe3da222e0af5cd57d2..96b4a0275ce26f5b393042042ed43bd5498e8c9b 100644
--- a/cc/layer_tree_host_impl.cc
+++ b/cc/layer_tree_host_impl.cc
@@ -36,8 +36,6 @@
 #include "ui/gfx/size_conversions.h"
 #include "ui/gfx/vector2d_conversions.h"
 
-using WebKit::WebTransformationMatrix;
-
 namespace {
 
 void didVisibilityChange(cc::LayerTreeHostImpl* id, bool visible)
@@ -135,19 +133,19 @@ gfx::Vector2dF PinchZoomViewport::applyScroll(const gfx::Vector2dF& delta)
     return overflow;
 }
 
-WebTransformationMatrix PinchZoomViewport::implTransform(bool pageScalePinchZoomEnabled) const
+gfx::Transform PinchZoomViewport::implTransform(bool pageScalePinchZoomEnabled) const
 {
-    WebTransformationMatrix transform;
-    transform.scale(m_pageScaleDelta);
+    gfx::Transform transform;
+    transform.Scale(m_pageScaleDelta, m_pageScaleDelta);
 
     // If the pinch state is applied in the impl, then push it to the
     // impl transform, otherwise the scale is handled by WebCore.
     if (pageScalePinchZoomEnabled) {
-        transform.scale(m_pageScaleFactor);
+        transform.Scale(m_pageScaleFactor, m_pageScaleFactor);
         // The offset needs to be scaled by deviceScaleFactor as this transform
         // needs to work with physical pixels.
         gfx::Vector2dF zoomedDeviceViewportOffset = gfx::ScaleVector2d(m_zoomedViewportOffset, m_deviceScaleFactor);
-        transform.translate(-zoomedDeviceViewportOffset.x(), -zoomedDeviceViewportOffset.y());
+        transform.Translate(-zoomedDeviceViewportOffset.x(), -zoomedDeviceViewportOffset.y());
     }
 
     return transform;
@@ -448,7 +446,7 @@ static void appendQuadsToFillScreen(RenderPass* targetRenderPass, LayerImpl* roo
     // doesn't have any bounds and so can't generate this itself.
     // FIXME: Make the gutter quads generated by the solid color layer (make it smarter about generating quads to fill unoccluded areas).
 
-    DCHECK(rootLayer->screenSpaceTransform().isInvertible());
+    DCHECK(rootLayer->screenSpaceTransform().IsInvertible());
 
     gfx::Rect rootTargetRect = rootLayer->renderSurface()->contentRect();
     float opacity = 1;
@@ -461,7 +459,7 @@ static void appendQuadsToFillScreen(RenderPass* targetRenderPass, LayerImpl* roo
                             opacity);
 
     AppendQuadsData appendQuadsData;
-    WebTransformationMatrix transformToLayerSpace = rootLayer->screenSpaceTransform().inverse();
+    gfx::Transform transformToLayerSpace = MathUtil::inverse(rootLayer->screenSpaceTransform());
     for (Region::Iterator fillRects(fillRegion); fillRects.has_rect(); fillRects.next()) {
         // The root layer transform is composed of translations and scales only,
         // no perspective, so mapping is sufficient.
@@ -1198,8 +1196,8 @@ static gfx::Vector2dF scrollLayerWithViewportSpaceDelta(PinchZoomViewport* viewp
 {
     // Layers with non-invertible screen space transforms should not have passed the scroll hit
     // test in the first place.
-    DCHECK(layerImpl.screenSpaceTransform().isInvertible());
-    WebTransformationMatrix inverseScreenSpaceTransform = layerImpl.screenSpaceTransform().inverse();
+    DCHECK(layerImpl.screenSpaceTransform().IsInvertible());
+    gfx::Transform inverseScreenSpaceTransform = MathUtil::inverse(layerImpl.screenSpaceTransform());
 
     gfx::PointF screenSpacePoint = gfx::ScalePoint(viewportPoint, scaleFromViewportToScreenSpace);
 
@@ -1462,7 +1460,7 @@ scoped_ptr<ScrollAndScaleSet> LayerTreeHostImpl::processScrollDeltas()
     return scrollInfo.Pass();
 }
 
-WebTransformationMatrix LayerTreeHostImpl::implTransform() const
+gfx::Transform LayerTreeHostImpl::implTransform() const
 {
     return m_pinchZoomViewport.implTransform(m_settings.pageScalePinchZoomEnabled);
 }