| Index: ui/gfx/compositor/compositor_gl.cc
|
| diff --git a/ui/gfx/compositor/compositor_gl.cc b/ui/gfx/compositor/compositor_gl.cc
|
| index cd2c4824b90c17e1201728130004e824208b8ad2..c16a76551c8c4ed030abd61f2d93b91abbccca31 100644
|
| --- a/ui/gfx/compositor/compositor_gl.cc
|
| +++ b/ui/gfx/compositor/compositor_gl.cc
|
| @@ -162,30 +162,7 @@ void TextureGL::Draw(const ui::Transform& transform) {
|
| glBindTexture(GL_TEXTURE_2D, texture_id_);
|
|
|
| GLfloat m[16];
|
| - const SkMatrix& matrix = t.matrix();
|
| -
|
| - // Convert 3x3 view transform matrix (row major) into 4x4 GL matrix (column
|
| - // major). Assume 2-D rotations/translations restricted to XY plane.
|
| -
|
| - m[ 0] = matrix[0];
|
| - m[ 1] = matrix[3];
|
| - m[ 2] = 0;
|
| - m[ 3] = matrix[6];
|
| -
|
| - m[ 4] = matrix[1];
|
| - m[ 5] = matrix[4];
|
| - m[ 6] = 0;
|
| - m[ 7] = matrix[7];
|
| -
|
| - m[ 8] = 0;
|
| - m[ 9] = 0;
|
| - m[10] = 1;
|
| - m[11] = 0;
|
| -
|
| - m[12] = matrix[2];
|
| - m[13] = matrix[5];
|
| - m[14] = 0;
|
| - m[15] = matrix[8];
|
| + transform.matrix().asColMajorf(m);
|
|
|
| const GLfloat vertices[] = { -1., -1., +0., +0., +1.,
|
| +1., -1., +0., +1., +1.,
|
|
|