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

cc/render_surface_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/render_surface_impl.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/stringprintf.h"
 #include "cc/damage_tracker.h"
 #include "cc/debug_border_draw_quad.h"
 #include "cc/debug_colors.h"
 #include "cc/delegated_renderer_layer_impl.h"
 #include "cc/layer_impl.h"
 #include "cc/math_util.h"
 #include "cc/quad_sink.h"
 #include "cc/render_pass.h"
 #include "cc/render_pass_draw_quad.h"
 #include "cc/render_pass_sink.h"
 #include "cc/shared_quad_state.h"
 #include "third_party/skia/include/core/SkImageFilter.h"
 #include "ui/gfx/rect_conversions.h"
-#include <public/WebTransformationMatrix.h>
+#include "ui/gfx/transform.h"
 
-using WebKit::WebTransformationMatrix;
+using gfx::Transform;
 
 namespace cc {
 
 RenderSurfaceImpl::RenderSurfaceImpl(LayerImpl* owningLayer)
     : m_owningLayer(owningLayer)
     , m_surfacePropertyChanged(false)
     , m_drawOpacity(1)
     , m_drawOpacityIsAnimating(false)
     , m_targetSurfaceTransformsAreAnimating(false)
     , m_screenSpaceTransformsAreAnimating(false)
@@ skipping 36 matching lines @@
     std::string indentStr = indentString(indent);
     str->append(indentStr);
     base::StringAppendF(str, "%s\n", name().data());
 
     indentStr.append("  ");
     str->append(indentStr);
     base::StringAppendF(str, "contentRect: (%d, %d, %d, %d)\n", m_contentRect.x(), m_contentRect.y(), m_contentRect.width(), m_contentRect.height());
 
     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]

Here also, make the output match the actual insides of the matrix, don't
transpose it.

+        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, "damageRect is pos(%f, %f), size(%f, %f)\n",
         m_damageTracker->currentDamageRect().x(), m_damageTracker->currentDamageRect().y(),
         m_damageTracker->currentDamageRect().width(), m_damageTracker->currentDamageRect().height());
 }
 
 int RenderSurfaceImpl::owningLayerId() const
 {
     return m_owningLayer ? m_owningLayer->id() : 0;
@@ skipping 95 matching lines @@
     SkRefCnt_SafeAssign(pass->filter, m_owningLayer->filter());
     pass->background_filters = m_owningLayer->backgroundFilters();
     passSink.appendRenderPass(pass.Pass());
 }
 
 void RenderSurfaceImpl::appendQuads(QuadSink& quadSink, AppendQuadsData& appendQuadsData, bool forReplica, RenderPass::Id renderPassId)
 {
     DCHECK(!forReplica || m_owningLayer->hasReplica());
 
     gfx::Rect clippedRectInTarget = computeClippedRectInTarget(m_owningLayer);
-    const WebTransformationMatrix& drawTransform = forReplica ? m_replicaDrawTransform : m_drawTransform;
+    const Transform& drawTransform = forReplica ? m_replicaDrawTransform : m_drawTransform;
     SharedQuadState* sharedQuadState = quadSink.useSharedQuadState(SharedQuadState::Create());
     sharedQuadState->SetAll(drawTransform, m_contentRect, clippedRectInTarget, m_clipRect, m_isClipped, m_drawOpacity);
 
     if (m_owningLayer->showDebugBorders()) {
         SkColor color = forReplica ? DebugColors::SurfaceReplicaBorderColor() : DebugColors::SurfaceBorderColor();
         float width = forReplica ? DebugColors::SurfaceReplicaBorderWidth(m_owningLayer->layerTreeHostImpl()) : DebugColors::SurfaceBorderWidth(m_owningLayer->layerTreeHostImpl());
         scoped_ptr<DebugBorderDrawQuad> debugBorderQuad = DebugBorderDrawQuad::Create();
         debugBorderQuad->SetNew(sharedQuadState, contentRect(), color, width);
         quadSink.append(debugBorderQuad.PassAs<DrawQuad>(), appendQuadsData);
     }
@@ skipping 28 matching lines @@
     ResourceProvider::ResourceId maskResourceId = maskLayer ? maskLayer->contentsResourceId() : 0;
     gfx::Rect contentsChangedSinceLastFrame = contentsChanged() ? m_contentRect : gfx::Rect();
 
     scoped_ptr<RenderPassDrawQuad> quad = RenderPassDrawQuad::Create();
     quad->SetNew(sharedQuadState, contentRect(), renderPassId, forReplica, maskResourceId, contentsChangedSinceLastFrame,
                  maskTexCoordScaleX, maskTexCoordScaleY, maskTexCoordOffsetX, maskTexCoordOffsetY);
     quadSink.append(quad.PassAs<DrawQuad>(), appendQuadsData);
 }
 
 }  // namespace cc