Index: cc/layer_tree_host_impl.cc |
diff --git a/cc/layer_tree_host_impl.cc b/cc/layer_tree_host_impl.cc |
index a8a3faae276bbe07ce031349488be941567726af..3f530ec0c78dda5e3f978a7f4e63ae091447a4cd 100644 |
--- a/cc/layer_tree_host_impl.cc |
+++ b/cc/layer_tree_host_impl.cc |
@@ -36,7 +36,7 @@ |
#include "ui/gfx/size_conversions.h" |
#include "ui/gfx/vector2d_conversions.h" |
-using WebKit::WebTransformationMatrix; |
+using gfx::Transform; |
namespace { |
@@ -134,16 +134,16 @@ gfx::Vector2dF PinchZoomViewport::applyScroll(const gfx::Vector2dF& delta) |
return overflow; |
} |
-WebTransformationMatrix PinchZoomViewport::implTransform(bool pageScalePinchZoomEnabled) const |
+Transform PinchZoomViewport::implTransform(bool pageScalePinchZoomEnabled) const |
{ |
- WebTransformationMatrix transform; |
- transform.scale(m_pageScaleDelta); |
+ Transform transform; |
+ transform.PreconcatScale(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.translate(-m_pinchViewportScrollDelta.x(), |
+ transform.PreconcatScale(m_pageScaleFactor, m_pageScaleFactor); |
+ transform.PreconcatTranslate(-m_pinchViewportScrollDelta.x(), |
-m_pinchViewportScrollDelta.y()); |
} |
@@ -445,7 +445,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; |
@@ -456,7 +456,7 @@ static void appendQuadsToFillScreen(RenderPass* targetRenderPass, LayerImpl* roo |
opacity); |
AppendQuadsData appendQuadsData; |
- WebTransformationMatrix transformToLayerSpace = rootLayer->screenSpaceTransform().inverse(); |
+ 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. |
@@ -1192,8 +1192,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()); |
+ Transform inverseScreenSpaceTransform = MathUtil::inverse(layerImpl.screenSpaceTransform()); |
gfx::PointF screenSpacePoint = gfx::ScalePoint(viewportPoint, scaleFromViewportToScreenSpace); |
@@ -1455,7 +1455,7 @@ scoped_ptr<ScrollAndScaleSet> LayerTreeHostImpl::processScrollDeltas() |
return scrollInfo.Pass(); |
} |
-WebTransformationMatrix LayerTreeHostImpl::implTransform() const |
+Transform LayerTreeHostImpl::implTransform() const |
{ |
return m_pinchZoomViewport.implTransform(m_settings.pageScalePinchZoomEnabled); |
} |