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

cc/layer_impl.cc

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/layer_impl.h"
 
 #include "base/debug/trace_event.h"
 #include "base/stringprintf.h"
 #include "cc/debug_border_draw_quad.h"
 #include "cc/debug_colors.h"
 #include "cc/layer_sorter.h"
 #include "cc/layer_tree_host_impl.h"
 #include "cc/math_util.h"
 #include "cc/proxy.h"
 #include "cc/quad_sink.h"
 #include "cc/scrollbar_animation_controller.h"
 #include "third_party/skia/include/core/SkImageFilter.h"
 #include "ui/gfx/point_conversions.h"
 #include "ui/gfx/rect_conversions.h"
 
-using WebKit::WebTransformationMatrix;
+using gfx::Transform;
 
 namespace cc {
 
 LayerImpl::LayerImpl(int id)
     : m_parent(0)
     , m_maskLayerId(-1)
     , m_replicaLayerId(-1)
     , m_layerId(id)
     , m_layerTreeHostImpl(0)
     , m_anchorPoint(0.5, 0.5)
@@ skipping 197 matching lines @@
     return unscrolled;
 }
 
 InputHandlerClient::ScrollStatus LayerImpl::tryScroll(const gfx::PointF& screenSpacePoint, InputHandlerClient::ScrollInputType type) const
 {
     if (shouldScrollOnMainThread()) {
         TRACE_EVENT0("cc", "LayerImpl::tryScroll: Failed shouldScrollOnMainThread");
         return InputHandlerClient::ScrollOnMainThread;
     }
 
-    if (!screenSpaceTransform().isInvertible()) {
+    if (!screenSpaceTransform().IsInvertible()) {
         TRACE_EVENT0("cc", "LayerImpl::tryScroll: Ignored nonInvertibleTransform");
         return InputHandlerClient::ScrollIgnored;
     }
 
     if (!nonFastScrollableRegion().IsEmpty()) {
         bool clipped = false;
-        gfx::PointF hitTestPointInContentSpace = MathUtil::projectPoint(screenSpaceTransform().inverse(), screenSpacePoint, clipped);
+        gfx::PointF hitTestPointInContentSpace = MathUtil::projectPoint(MathUtil::inverse(screenSpaceTransform()), screenSpacePoint, clipped);
         gfx::PointF hitTestPointInLayerSpace = gfx::ScalePoint(hitTestPointInContentSpace, 1 / contentsScaleX(), 1 / contentsScaleY());
         if (!clipped && nonFastScrollableRegion().Contains(gfx::ToRoundedPoint(hitTestPointInLayerSpace))) {
             TRACE_EVENT0("cc", "LayerImpl::tryScroll: Failed nonFastScrollableRegion");
             return InputHandlerClient::ScrollOnMainThread;
         }
     }
 
     if (type == InputHandlerClient::Wheel && haveWheelEventHandlers()) {
         TRACE_EVENT0("cc", "LayerImpl::tryScroll: Failed wheelEventHandlers");
         return InputHandlerClient::ScrollOnMainThread;
@@ skipping 44 matching lines @@
     }
 
     str->append(indentStr);
     base::StringAppendF(str, "position: %f, %f\n", m_position.x(), m_position.y());
 
     str->append(indentStr);
     base::StringAppendF(str, "contentsOpaque: %d\n", m_contentsOpaque);
 
     str->append(indentStr);
     base::StringAppendF(str, "drawTransform: %f, %f, %f, %f  //  %f, %f, %f, %f  //  %f, %f, %f, %f  //  %f, %f, %f, %f\n",
-        m_drawTransform.m11(), m_drawTransform.m12(), m_drawTransform.m13(), m_drawTransform.m14(),
-        m_drawTransform.m21(), m_drawTransform.m22(), m_drawTransform.m23(), m_drawTransform.m24(),
-        m_drawTransform.m31(), m_drawTransform.m32(), m_drawTransform.m33(), m_drawTransform.m34(),
-        m_drawTransform.m41(), m_drawTransform.m42(), m_drawTransform.m43(), m_drawTransform.m44());
+        m_drawTransform.matrix().getDouble(0, 0), m_drawTransform.matrix().getDouble(1, 0), m_drawTransform.matrix().getDouble(2, 0), m_drawTransform.matrix().getDouble(3, 0),

[danakj, 2012/11/24 02:34:54]

I think these should be (0,0) (0,1) etc.. invert this. It's debugging info,
shouldn't break tests, and it'd be nice to have the output match the internals
of the matrix still.

[shawnsingh, 2012/11/24 02:56:14]

Just to clarify, This patch doesn't change the way the elements would be output
as debug info, it's the same as always (outputting one column at a time).  Are
you sure you want me to transpose it?

[danakj, 2012/11/24 03:20:09]

Ya, It used to output in or order, and we should do the same, even tho the
values will be transposed now. Let's get used to the new SkMatrix internal
order.

[danakj, 2012/11/24 03:24:11]

s/or order/row order/.

+        m_drawTransform.matrix().getDouble(0, 1), m_drawTransform.matrix().getDouble(1, 1), m_drawTransform.matrix().getDouble(2, 1), m_drawTransform.matrix().getDouble(3, 1),
+        m_drawTransform.matrix().getDouble(0, 2), m_drawTransform.matrix().getDouble(1, 2), m_drawTransform.matrix().getDouble(2, 2), m_drawTransform.matrix().getDouble(3, 2),
+        m_drawTransform.matrix().getDouble(0, 3), m_drawTransform.matrix().getDouble(1, 3), m_drawTransform.matrix().getDouble(2, 3), m_drawTransform.matrix().getDouble(3, 3));
 
     str->append(indentStr);
     base::StringAppendF(str, "drawsContent: %s\n", m_drawsContent ? "yes" : "no");
 }
 
 void sortLayers(std::vector<LayerImpl*>::iterator first, std::vector<LayerImpl*>::iterator end, LayerSorter* layerSorter)
 {
     TRACE_EVENT0("cc", "LayerImpl::sortLayers");
     layerSorter->sort(first, end);
 }
@@ skipping 101 matching lines @@
 float LayerImpl::opacity() const
 {
      return m_opacity;
 }
 
 void LayerImpl::setOpacityFromAnimation(float opacity)
 {
     setOpacity(opacity);
 }
 
-const WebKit::WebTransformationMatrix& LayerImpl::transform() const
+const gfx::Transform& LayerImpl::transform() const
 {
      return m_transform;
 }
 
-void LayerImpl::setTransformFromAnimation(const WebTransformationMatrix& transform)
+void LayerImpl::setTransformFromAnimation(const Transform& transform)
 {
     setTransform(transform);
 }
 
 void LayerImpl::setBounds(const gfx::Size& bounds)
 {
     if (m_bounds == bounds)
         return;
 
     m_bounds = bounds;
@@ skipping 136 matching lines @@
 
 void LayerImpl::setPreserves3D(bool preserves3D)
 {
     if (m_preserves3D == preserves3D)
         return;
 
     m_preserves3D = preserves3D;
     noteLayerPropertyChangedForSubtree();
 }
 
-void LayerImpl::setSublayerTransform(const WebTransformationMatrix& sublayerTransform)
+void LayerImpl::setSublayerTransform(const Transform& sublayerTransform)
 {
     if (m_sublayerTransform == sublayerTransform)
         return;
 
     m_sublayerTransform = sublayerTransform;
     // sublayer transform does not affect the current layer; it affects only its children.
     noteLayerPropertyChangedForDescendants();
 }
 
-void LayerImpl::setTransform(const WebTransformationMatrix& transform)
+void LayerImpl::setTransform(const Transform& transform)
 {
     if (m_transform == transform)
         return;
 
     m_transform = transform;
     m_layerSurfacePropertyChanged = true;
 }
 
 bool LayerImpl::transformIsAnimating() const
 {
@@ skipping 30 matching lines @@
 
 void LayerImpl::setScrollDelta(const gfx::Vector2dF& scrollDelta)
 {
     if (m_scrollDelta == scrollDelta)
         return;
 
     m_scrollDelta = scrollDelta;
     noteLayerPropertyChangedForSubtree();
 }
 
-void LayerImpl::setImplTransform(const WebKit::WebTransformationMatrix& transform)
+void LayerImpl::setImplTransform(const gfx::Transform& transform)
 {
     if (m_implTransform == transform)
         return;
 
     m_implTransform = transform;
     noteLayerPropertyChangedForSubtree();
 }
 
 void LayerImpl::setDoubleSided(bool doubleSided)
 {
@@ skipping 54 matching lines @@
 
 void LayerImpl::setVerticalScrollbarLayer(ScrollbarLayerImpl* scrollbarLayer)
 {
     if (!m_scrollbarAnimationController)
         m_scrollbarAnimationController = ScrollbarAnimationController::create(this);
     m_scrollbarAnimationController->setVerticalScrollbarLayer(scrollbarLayer);
     m_scrollbarAnimationController->updateScrollOffset(this);
 }
 
 }  // namespace cc