Plumb through cropped output size for VideoFrame

cc/layer_tree_host_impl_unittest.cc

 // 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"
 
 #include "cc/layer_tree_host_impl.h"
 
 #include "base/command_line.h"
 #include "base/hash_tables.h"
@@ skipping 2517 matching lines @@
             ADD_FAILURE() << "Trying to bind texture id " << id;
     }
 
 private:
     base::hash_set<unsigned> m_allocatedTextureIds;
 };
 
 // Fake video frame that represents a 4x4 YUV video frame.
 class FakeVideoFrame: public WebVideoFrame {
 public:
-    FakeVideoFrame() : m_textureId(0) { memset(m_data, 0x80, sizeof(m_data)); }
+    FakeVideoFrame() : m_textureId(0), m_visibleRect(0, 0, 4, 4) { memset(m_data, 0x80, sizeof(m_data)); }
     virtual ~FakeVideoFrame() { }
     virtual Format format() const { return m_textureId ? FormatNativeTexture : FormatYV12; }
-    virtual unsigned width() const { return 4; }
-    virtual unsigned height() const { return 4; }
     virtual unsigned planes() const { return m_textureId ? 0 : 3; }
     virtual int stride(unsigned plane) const { return 4; }

[Ami GONE FROM CHROMIUM, 2012/10/25 17:13:34]

16?

[sheu, 2012/10/25 21:44:13]

I guess for FormatNativeTexture that makes sense.  Done.

     virtual const void* data(unsigned plane) const { return m_data; }
     virtual unsigned textureId() const { return m_textureId; }
     virtual unsigned textureTarget() const { return m_textureId ? GL_TEXTURE_2D : 0; }
+    virtual WebKit::WebRect visibleRect() const { visibleRect; }

[Ami GONE FROM CHROMIUM, 2012/10/25 17:13:34]

missing m_?
(how is this compiling? :))

[sheu, 2012/10/25 21:44:13]

Aha.  Looks like I have -build_tests -autotest in my USE flags for
chromeos-chrome :-)

+    virtual WebKit::WebRect textureSize() const { return WebKit::WebSize(4, 4); }
 
+    void setVisibleRect(const WebKit::WebRect& visibleRect) { m_visibleRect = visibleRect; }
     void setTextureId(unsigned id) { m_textureId = id; }
 
 private:
     char m_data[16];
     unsigned m_textureId;
+    WebKit::WebRect m_visibleRect;
 };
 
 // Fake video frame provider that always provides the same FakeVideoFrame.
 class FakeVideoFrameProvider: public WebVideoFrameProvider {
 public:
     FakeVideoFrameProvider() : m_frame(0), m_client(0) { }
     virtual ~FakeVideoFrameProvider()
     {
         if (m_client)
             m_client->stopUsingProvider();
@@ skipping 135 matching lines @@
     FakeVideoFrameProvider provider;
     provider.setFrame(&videoFrame);
     scoped_ptr<VideoLayerImpl> videoLayer = VideoLayerImpl::create(layerId++, &provider);
     videoLayer->setBounds(IntSize(10, 10));
     videoLayer->setAnchorPoint(FloatPoint(0, 0));
     videoLayer->setContentBounds(IntSize(10, 10));
     videoLayer->setDrawsContent(true);
     videoLayer->setLayerTreeHostImpl(m_hostImpl.get());
     rootLayer->addChild(videoLayer.PassAs<LayerImpl>());
 
+    FakeVideoFrame videoFrameScaled;
+    FakeVideoFrameProvider providerScaled;
+    providerScaled.setFrame(&videoFrameScaled);
+    scoped_ptr<VideoLayerImpl> videoLayerScaled = VideoLayerImpl::create(layerId++, &providerScaled);
+    videoLayerScaled->setBounds(IntSize(10, 10));
+    videoLayerScaled->setAnchorPoint(FloatPoint(0, 0));
+    videoLayerScaled->setContentBounds(IntSize(10, 10));
+    videoLayerScaled->setDrawsContent(true);
+    videoLayerScaled->setLayerTreeHostImpl(m_hostImpl.get());
+    rootLayer->addChild(videoLayerScaled.PassAs<LayerImpl>());
+
     FakeVideoFrame hwVideoFrame;
     FakeVideoFrameProvider hwProvider;
     hwProvider.setFrame(&hwVideoFrame);
     scoped_ptr<VideoLayerImpl> hwVideoLayer = VideoLayerImpl::create(layerId++, &hwProvider);
     hwVideoLayer->setBounds(IntSize(10, 10));
     hwVideoLayer->setAnchorPoint(FloatPoint(0, 0));
     hwVideoLayer->setContentBounds(IntSize(10, 10));
     hwVideoLayer->setDrawsContent(true);
     hwVideoLayer->setLayerTreeHostImpl(m_hostImpl.get());
     rootLayer->addChild(hwVideoLayer.PassAs<LayerImpl>());
@@ skipping 30 matching lines @@
     delegatedRendererLayer->setLayerTreeHostImpl(m_hostImpl.get());
     ScopedPtrVector<RenderPass> passList;
     passList.append(createRenderPassWithResource(m_hostImpl->resourceProvider()));
     delegatedRendererLayer->setRenderPasses(passList);
     EXPECT_TRUE(passList.isEmpty());
     rootLayer->addChild(delegatedRendererLayer.PassAs<LayerImpl>());
 
     // Use a context that supports IOSurfaces
     m_hostImpl->initializeRenderer(FakeWebCompositorOutputSurface::create(scoped_ptr<WebKit::WebGraphicsContext3D>(new FakeWebGraphicsContext3DWithIOSurface)).PassAs<GraphicsContext>());
 
+    videoFrameScaled.setVisibleRect(WebKit::WebRect(0, 0, 3, 2));
     hwVideoFrame.setTextureId(m_hostImpl->resourceProvider()->graphicsContext3D()->createTexture());
 
     m_hostImpl->setRootLayer(rootLayer.Pass());
 
     LayerTreeHostImpl::FrameData frame;
     EXPECT_TRUE(m_hostImpl->prepareToDraw(frame));
     m_hostImpl->drawLayers(frame);
     m_hostImpl->didDrawAllLayers(frame);
     m_hostImpl->swapBuffers();
 
@@ skipping 1606 matching lines @@
         verifyRenderPassTestData(removeRenderPassesCases[testCaseIndex], testData);
         testCaseIndex++;
     }
 }
 
 INSTANTIATE_TEST_CASE_P(LayerTreeHostImplTests,
                         LayerTreeHostImplTest,
                         ::testing::Values(false, true));
 
 } // namespace