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

Unified Diff: cc/layer_tree_host_impl.cc

Issue 11308153: Migrate most of cc/ from WebKit::WebTransformationMatrix to gfx::Transform (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased to tip of tree and addressed feedback Created 8 years, 1 month 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
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..96612959c323e49d4b1999a6ac0c480da49f0784 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 {
@@ -135,19 +135,19 @@ 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.PreconcatScale(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.PreconcatTranslate(-zoomedDeviceViewportOffset.x(), -zoomedDeviceViewportOffset.y());
}
return transform;
@@ -448,7 +448,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 +461,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.
@@ -1198,8 +1198,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);
@@ -1462,7 +1462,7 @@ scoped_ptr<ScrollAndScaleSet> LayerTreeHostImpl::processScrollDeltas()
return scrollInfo.Pass();
}
-WebTransformationMatrix LayerTreeHostImpl::implTransform() const
+Transform LayerTreeHostImpl::implTransform() const
{
return m_pinchZoomViewport.implTransform(m_settings.pageScalePinchZoomEnabled);
}

Powered by Google App Engine
This is Rietveld 408576698