diff options
| author | shawnsingh@chromium.org <shawnsingh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-27 08:29:00 +0000 |
|---|---|---|
| committer | shawnsingh@chromium.org <shawnsingh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-27 08:29:00 +0000 |
| commit | c8686a05e1fa4cb3aa82690d7450791828096840 (patch) | |
| tree | c43ef1a56ac27a06bc1ed7c069850cf7c6790002 /cc/video_layer_impl.cc | |
| parent | 5006a4185d3a95976ced07022188f9abb48790be (diff) | |
| download | chromium_src-c8686a05e1fa4cb3aa82690d7450791828096840.zip chromium_src-c8686a05e1fa4cb3aa82690d7450791828096840.tar.gz chromium_src-c8686a05e1fa4cb3aa82690d7450791828096840.tar.bz2 | |
Animation code is not yet migrated by this patch, due to WebTransformOperations.
BUG=159972
Review URL: https://codereview.chromium.org/11308153
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@169609 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/video_layer_impl.cc')
| -rw-r--r-- | cc/video_layer_impl.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/cc/video_layer_impl.cc b/cc/video_layer_impl.cc index a322541..918fac6 100644 --- a/cc/video_layer_impl.cc +++ b/cc/video_layer_impl.cc @@ -7,6 +7,7 @@ #include "base/logging.h" #include "cc/io_surface_draw_quad.h" #include "cc/layer_tree_host_impl.h" +#include "cc/math_util.h" #include "cc/quad_sink.h" #include "cc/resource_provider.h" #include "cc/stream_video_draw_quad.h" @@ -30,7 +31,7 @@ VideoLayerImpl::VideoLayerImpl(int id, WebKit::WebVideoFrameProvider* provider, , m_externalTextureResource(0) { // This matrix is the default transformation for stream textures, and flips on the Y axis. - m_streamTextureMatrix = WebKit::WebTransformationMatrix( + m_streamTextureMatrix = MathUtil::createGfxTransform( 1, 0, 0, 0, 0, -1, 0, 0, 0, 0, 1, 0, @@ -252,8 +253,8 @@ void VideoLayerImpl::appendQuads(QuadSink& quadSink, AppendQuadsData& appendQuad } case GL_TEXTURE_EXTERNAL_OES: { // StreamTexture hardware decoder. - WebKit::WebTransformationMatrix transform(m_streamTextureMatrix); - transform.scaleNonUniform(texWidthScale, texHeightScale); + gfx::Transform transform(m_streamTextureMatrix); + transform.Scale(texWidthScale, texHeightScale); scoped_ptr<StreamVideoDrawQuad> streamVideoQuad = StreamVideoDrawQuad::Create(); streamVideoQuad->SetNew(sharedQuadState, quadRect, opaqueRect, m_frame->texture_id(), transform); quadSink.append(streamVideoQuad.PassAs<DrawQuad>(), appendQuadsData); @@ -401,7 +402,7 @@ void VideoLayerImpl::didReceiveFrame() void VideoLayerImpl::didUpdateMatrix(const float matrix[16]) { - m_streamTextureMatrix = WebKit::WebTransformationMatrix( + 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], |