Index: cc/CCVideoLayerImpl.cpp |
diff --git a/cc/CCVideoLayerImpl.cpp b/cc/CCVideoLayerImpl.cpp |
index 3643c1b92a0c20479bf5b89271f9b6459d373014..b83cb88da19ef4a90d3d216d4aa9cbbcc278dd2f 100644 |
--- a/cc/CCVideoLayerImpl.cpp |
+++ b/cc/CCVideoLayerImpl.cpp |
@@ -156,7 +156,7 @@ void CCVideoLayerImpl::willDrawInternal(CCResourceProvider* resourceProvider) |
m_externalTextureResource = resourceProvider->createResourceFromExternalTexture(m_frame->textureId()); |
} |
-void CCVideoLayerImpl::appendQuads(CCQuadSink& quadSink, bool&) |
+void CCVideoLayerImpl::appendQuads(CCQuadSink& quadSink, CCAppendQuadsData& appendQuadsData) |
{ |
ASSERT(CCProxy::isImplThread()); |
@@ -164,7 +164,7 @@ void CCVideoLayerImpl::appendQuads(CCQuadSink& quadSink, bool&) |
return; |
CCSharedQuadState* sharedQuadState = quadSink.useSharedQuadState(createSharedQuadState()); |
- appendDebugBorderQuad(quadSink, sharedQuadState); |
+ appendDebugBorderQuad(quadSink, sharedQuadState, appendQuadsData); |
// FIXME: When we pass quads out of process, we need to double-buffer, or |
// otherwise synchonize use of all textures in the quad. |
@@ -178,7 +178,7 @@ void CCVideoLayerImpl::appendQuads(CCQuadSink& quadSink, bool&) |
const FramePlane& uPlane = m_framePlanes[WebKit::WebVideoFrame::uPlane]; |
const FramePlane& vPlane = m_framePlanes[WebKit::WebVideoFrame::vPlane]; |
OwnPtr<CCYUVVideoDrawQuad> yuvVideoQuad = CCYUVVideoDrawQuad::create(sharedQuadState, quadRect, yPlane, uPlane, vPlane); |
- quadSink.append(yuvVideoQuad.release()); |
+ quadSink.append(yuvVideoQuad.release(), appendQuadsData); |
break; |
} |
case GraphicsContext3D::RGBA: { |
@@ -190,7 +190,7 @@ void CCVideoLayerImpl::appendQuads(CCQuadSink& quadSink, bool&) |
FloatRect uvRect(0, 0, widthScaleFactor, 1); |
bool flipped = false; |
OwnPtr<CCTextureDrawQuad> textureQuad = CCTextureDrawQuad::create(sharedQuadState, quadRect, plane.resourceId, premultipliedAlpha, uvRect, flipped); |
- quadSink.append(textureQuad.release()); |
+ quadSink.append(textureQuad.release(), appendQuadsData); |
break; |
} |
case GraphicsContext3D::TEXTURE_2D: { |
@@ -199,19 +199,19 @@ void CCVideoLayerImpl::appendQuads(CCQuadSink& quadSink, bool&) |
FloatRect uvRect(0, 0, 1, 1); |
bool flipped = false; |
OwnPtr<CCTextureDrawQuad> textureQuad = CCTextureDrawQuad::create(sharedQuadState, quadRect, m_externalTextureResource, premultipliedAlpha, uvRect, flipped); |
- quadSink.append(textureQuad.release()); |
+ quadSink.append(textureQuad.release(), appendQuadsData); |
break; |
} |
case Extensions3D::TEXTURE_RECTANGLE_ARB: { |
IntSize textureSize(m_frame->width(), m_frame->height()); |
OwnPtr<CCIOSurfaceDrawQuad> ioSurfaceQuad = CCIOSurfaceDrawQuad::create(sharedQuadState, quadRect, textureSize, m_frame->textureId(), CCIOSurfaceDrawQuad::Unflipped); |
- quadSink.append(ioSurfaceQuad.release()); |
+ quadSink.append(ioSurfaceQuad.release(), appendQuadsData); |
break; |
} |
case Extensions3DChromium::GL_TEXTURE_EXTERNAL_OES: { |
// StreamTexture hardware decoder. |
OwnPtr<CCStreamVideoDrawQuad> streamVideoQuad = CCStreamVideoDrawQuad::create(sharedQuadState, quadRect, m_frame->textureId(), m_streamTextureMatrix); |
- quadSink.append(streamVideoQuad.release()); |
+ quadSink.append(streamVideoQuad.release(), appendQuadsData); |
break; |
} |
default: |