Update cc snapshot to WK r126941

cc/CCVideoLayerImpl.cpp

 // Copyright 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 "config.h"
 
 #if USE(ACCELERATED_COMPOSITING)
 
 #include "CCVideoLayerImpl.h"
 
@@ skipping 138 matching lines @@
     if (!copyPlaneData(resourceProvider)) {
         m_provider->putCurrentFrame(m_frame);
         m_frame = 0;
         return;
     }
 
     if (m_format == GraphicsContext3D::TEXTURE_2D)
         m_externalTextureResource = resourceProvider->createResourceFromExternalTexture(m_frame->textureId());
 }
 
-void CCVideoLayerImpl::appendQuads(CCQuadSink& quadSink, bool&)
+void CCVideoLayerImpl::appendQuads(CCQuadSink& quadSink, CCAppendQuadsData& appendQuadsData)
 {
     ASSERT(CCProxy::isImplThread());
 
     if (!m_frame)
         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.
 
     IntRect quadRect(IntPoint(), contentBounds());
 
     switch (m_format) {
     case GraphicsContext3D::LUMINANCE: {
         // YUV software decoder.
         const FramePlane& yPlane = m_framePlanes[WebKit::WebVideoFrame::yPlane];
         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: {
         // RGBA software decoder.
         const FramePlane& plane = m_framePlanes[WebKit::WebVideoFrame::rgbPlane];
         float widthScaleFactor = static_cast<float>(plane.visibleSize.width()) / plane.size.width();
 
         bool premultipliedAlpha = true;
         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: {
         // NativeTexture hardware decoder.
         bool premultipliedAlpha = true;
         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:
         CRASH(); // Someone updated convertVFCFormatToGC3DFormat above but update this!
     }
 }
 
 void CCVideoLayerImpl::didDraw(CCResourceProvider* resourceProvider)
 {
     ASSERT(CCProxy::isImplThread());
@@ skipping 154 matching lines @@
 void CCVideoLayerImpl::dumpLayerProperties(TextStream& ts, int indent) const
 {
     writeIndent(ts, indent);
     ts << "video layer\n";
     CCLayerImpl::dumpLayerProperties(ts, indent);
 }
 
 }
 
 #endif // USE(ACCELERATED_COMPOSITING)