Index: cc/video_layer_impl.cc |
diff --git a/cc/video_layer_impl.cc b/cc/video_layer_impl.cc |
index 130e6f2460a25cd0b60ce6c9612d6a1c1846addb..6223eec8464f518e55b7110e3917a6dbaf5ea8e2 100644 |
--- a/cc/video_layer_impl.cc |
+++ b/cc/video_layer_impl.cc |
@@ -29,11 +29,11 @@ VideoLayerImpl::VideoLayerImpl(LayerTreeImpl* treeImpl, int id, VideoFrameProvid |
, m_externalTextureResource(0) |
{ |
// This matrix is the default transformation for stream textures, and flips on the Y axis. |
- m_streamTextureMatrix = MathUtil::createGfxTransform( |
+ m_streamTextureMatrix = gfx::Transform( |
1, 0, 0, 0, |
danakj
2013/01/11 04:14:12
nit: here too, .0 suffixes
|
- 0, -1, 0, 0, |
+ 0, -1, 0, 1, |
0, 0, 1, 0, |
- 0, 1, 0, 1); |
+ 0, 0, 0, 1); |
// This only happens during a commit on the compositor thread while the main |
// thread is blocked. That makes this a thread-safe call to set the video |
@@ -401,11 +401,11 @@ void VideoLayerImpl::DidReceiveFrame() |
void VideoLayerImpl::DidUpdateMatrix(const float matrix[16]) |
{ |
- m_streamTextureMatrix = MathUtil::createGfxTransform( |
- matrix[0], matrix[1], matrix[2], matrix[3], |
- matrix[4], matrix[5], matrix[6], matrix[7], |
- matrix[8], matrix[9], matrix[10], matrix[11], |
- matrix[12], matrix[13], matrix[14], matrix[15]); |
+ m_streamTextureMatrix = gfx::Transform( |
+ matrix[0], matrix[4], matrix[8], matrix[12], |
+ matrix[1], matrix[5], matrix[9], matrix[13], |
+ matrix[2], matrix[6], matrix[10], matrix[14], |
+ matrix[3], matrix[7], matrix[11], matrix[15]); |
setNeedsRedraw(); |
} |