Finish migrating cc/ from WebKit::WebTransformationMatrix to gfx::Transform

webkit/compositor_bindings/web_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 "webkit/compositor_bindings/web_layer_impl.h"
 
 #include "base/string_util.h"
 #include "cc/animation.h"
 #include "cc/layer.h"
 #include "cc/region.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebFloatPoint.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebFloatRect.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebTransformationMatrix.h"
 #include "third_party/skia/include/utils/SkMatrix44.h"
 #include "webkit/compositor_bindings/web_animation_impl.h"
+#include "webkit/compositor_bindings/web_transformation_matrix_util.h"
 
 using cc::Animation;
 using cc::Layer;
-
-namespace {
-gfx::Transform convertWebTransformationMatrixToTransform(const WebKit::WebTransformationMatrix& matrix)
-{
-    // TODO(jamesr): When gfx::Transform provides a constructor that does not
-    // initialize the matrix, use that.
-    gfx::Transform transform;
-    transform.matrix().setDouble(0, 0, matrix.m11());
-    transform.matrix().setDouble(0, 1, matrix.m21());
-    transform.matrix().setDouble(0, 2, matrix.m31());
-    transform.matrix().setDouble(0, 3, matrix.m41());
-    transform.matrix().setDouble(1, 0, matrix.m12());
-    transform.matrix().setDouble(1, 1, matrix.m22());
-    transform.matrix().setDouble(1, 2, matrix.m32());
-    transform.matrix().setDouble(1, 3, matrix.m42());
-    transform.matrix().setDouble(2, 0, matrix.m13());
-    transform.matrix().setDouble(2, 1, matrix.m23());
-    transform.matrix().setDouble(2, 2, matrix.m33());
-    transform.matrix().setDouble(2, 3, matrix.m43());
-    transform.matrix().setDouble(3, 0, matrix.m14());
-    transform.matrix().setDouble(3, 1, matrix.m24());
-    transform.matrix().setDouble(3, 2, matrix.m34());
-    transform.matrix().setDouble(3, 3, matrix.m44());
-    return transform;
-}
-}  // namespace
-
+using webkit::WebTransformationMatrixUtil;
 
 namespace WebKit {
 
 WebLayerImpl::WebLayerImpl()
     : m_layer(Layer::create())
 {
 }
 
 WebLayerImpl::WebLayerImpl(scoped_refptr<Layer> layer)
     : m_layer(layer)
@@ skipping 129 matching lines @@
 
 void WebLayerImpl::setSublayerTransform(const SkMatrix44& matrix)
 {
     gfx::Transform subLayerTransform;
     subLayerTransform.matrix() = matrix;
     m_layer->setSublayerTransform(subLayerTransform);
 }
 
 void WebLayerImpl::setSublayerTransform(const WebTransformationMatrix& matrix)
 {
-    m_layer->setSublayerTransform(convertWebTransformationMatrixToTransform(matrix));
+    m_layer->setSublayerTransform(WebTransformationMatrixUtil::ToTransform(matrix));
 }
 
 SkMatrix44 WebLayerImpl::sublayerTransform() const
 {
     return m_layer->sublayerTransform().matrix();
 }
 
 void WebLayerImpl::setTransform(const SkMatrix44& matrix)
 {
     gfx::Transform transform;
     transform.matrix() = matrix;
     m_layer->setTransform(transform);
 }
 
 void WebLayerImpl::setTransform(const WebTransformationMatrix& matrix)
 {
-    m_layer->setTransform(convertWebTransformationMatrixToTransform(matrix));
+    m_layer->setTransform(WebTransformationMatrixUtil::ToTransform(matrix));
 }
 
 SkMatrix44 WebLayerImpl::transform() const
 {
     return m_layer->transform().matrix();
 }
 
 void WebLayerImpl::setDrawsContent(bool drawsContent)
 {
     m_layer->setIsDrawable(drawsContent);
@@ skipping 217 matching lines @@
 {
     m_layer->setLayerScrollClient(scrollClient);
 }
 
 Layer* WebLayerImpl::layer() const
 {
     return m_layer.get();
 }
 
 } // namespace WebKit