Use SkMatrix44 for the underlying implementation of ui::Transform

ui/gfx/compositor/compositor_win.cc

 // Copyright (c) 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 "ui/gfx/compositor/compositor.h"
 
 #include <algorithm>
 #include <d3dx10.h>
 #include <vector>
 
@@ skipping 321 matching lines @@
   CreateDevice();
   LoadEffects();
   Resize(last_size_);
   InitVertexLayout();
   CreateVertexBuffer();
   CreateIndexBuffer();
 }
 
 void CompositorWin::UpdatePerspective(const ui::Transform& transform,
                                       const gfx::Size& view_size) {
-  // Apply transform from view.
-  const SkMatrix& sk_matrix(transform.matrix());
-  // Use -1 * kMTransY for y-translation as origin for views is upper left.
-  D3DXMATRIX transform_matrix(
-      // row 1
-      sk_matrix[SkMatrix::kMScaleX], sk_matrix[SkMatrix::kMSkewX], 0.0f,
-      sk_matrix[SkMatrix::kMPersp0],
-      // row 2
-      sk_matrix[SkMatrix::kMSkewY], sk_matrix[SkMatrix::kMScaleY], 0.0f,
-      sk_matrix[SkMatrix::kMPersp1],
-      // row 3
-      0.0f, 0.0f, 1.0f, sk_matrix[SkMatrix::kMPersp2],
-      // row 4.
-      sk_matrix[SkMatrix::kMTransX], -sk_matrix[SkMatrix::kMTransY], 0.0f,
-      1.0f);
+  float transform_data_buffer[16];
+  transform.matrix().asColMajorf(transform_data_buffer);
+  D3DXMATRIX transform_matrix(&transform_data_buffer[0]);
+  std::swap(transform_matrix._12, transform_matrix._21);
+  std::swap(transform_matrix._13, transform_matrix._31);
+  std::swap(transform_matrix._23, transform_matrix._32);
+
+  // Different coordinate system; flip the y.
+  transform_matrix._42 *= -1;
 
   // Scale so x and y are from 0-2.
   D3DXMATRIX scale_matrix;
   D3DXMatrixScaling(
       &scale_matrix,
       2.0f / static_cast<float>(last_size_.width()),
       2.0f / static_cast<float>(last_size_.height()),
       1.0f);
 
   // Translate so x and y are from -1,-1 to 1,1.
   D3DXMATRIX translate_matrix;
   D3DXMatrixTranslation(&translate_matrix, -1.0f, 1.0f, 0.0f);
 
   D3DXMATRIX projection_matrix;
   D3DXMatrixIdentity(&projection_matrix);
   D3DXMatrixPerspectiveFovLH(&projection_matrix,
                              atanf(.5f) * 2.0f, 1.0f, 1.0f, 1000.0f);
   D3DXVECTOR3 pos(0.0f, 0.0f, -2.0f);
   D3DXVECTOR3 target(0.0f, 0.0f, 0.0f);
   D3DXVECTOR3 up(0.0f, 1.0f, 0.0f);
   D3DXMATRIX view;
   D3DXMatrixIdentity(&view);
   D3DXMatrixLookAtLH(&view, &pos, &target, &up);
 
   D3DXMATRIX wvp = transform_matrix * scale_matrix * translate_matrix * view *
       projection_matrix;
+
   fx_->GetVariableByName("gWVP")->AsMatrix()->SetMatrix(wvp);
 }
 
 const gfx::Size& CompositorWin::GetHostSize() {
   return last_size_;
 }
 
 ID3D10Buffer* CompositorWin::GetTextureIndexBuffer() {
   return index_buffer_.get();
 }
@@ skipping 419 matching lines @@
 
 // static
 Compositor* Compositor::Create(gfx::AcceleratedWidget widget,
                                const gfx::Size& size) {
   CompositorWin* compositor = new CompositorWin(widget, size);
   compositor->Init();
   return compositor;
 }
 
 }  // namespace ui