Enable removing uploads to evicted textures from texture upload queues.

cc/CCTextureUpdateControllerTest.cpp

 // Copyright 2012 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 "CCTextureUpdateController.h"
 
 #include "CCSchedulerTestCommon.h"
 #include "CCSingleThreadProxy.h" // For DebugScopedSetImplThread
@@ skipping 49 matching lines @@
     virtual void beginUploads() OVERRIDE;
     virtual void endUploads() OVERRIDE;
     virtual void uploadTexture(cc::CCResourceProvider*, Parameters) OVERRIDE;
 
 private:
     CCTextureUpdateControllerTest* m_test;
 };
 
 class TextureForUploadTest : public LayerTextureUpdater::Texture {
 public:
-    TextureForUploadTest() : LayerTextureUpdater::Texture(adoptPtr<CCPrioritizedTexture>(0)) { }
+    TextureForUploadTest() : LayerTextureUpdater::Texture(adoptPtr<CCPrioritizedTexture>(0)), m_evicted(false) { }

[jamesr, 2012/09/19 18:56:37]

one initialization per line, please. I think this should go:

TextureForUploadTest()
    : LayerTexture...()
    , m_evicted(..)
{
}

[ccameron, 2012/09/19 20:52:02]

Fixed.

     virtual void updateRect(CCResourceProvider*, const IntRect& sourceRect, const IntSize& destOffset) { }
+    virtual bool backingResourceWasEvicted() const { return m_evicted; }
+    void evictBackingResource() { m_evicted = true; }
+private:
+    bool m_evicted;
 };
 
 
 class CCTextureUpdateControllerTest : public Test {
 public:
     CCTextureUpdateControllerTest()
         : m_queue(adoptPtr(new CCTextureUpdateQueue))
         , m_uploader(this)
         , m_compositorInitializer(m_thread.get())
         , m_fullUploadCountExpected(0)
@@ skipping 68 matching lines @@
     }
 
 protected:
     virtual void SetUp()
     {
         m_context = FakeWebCompositorOutputSurface::create(adoptPtr(new WebGraphicsContext3DForUploadTest(this)));
         DebugScopedSetImplThread implThread;
         m_resourceProvider = CCResourceProvider::create(m_context.get(), UnthrottledUploader);
     }
 
-    void appendFullUploadsToUpdateQueue(int count)
+
+    void appendFullUploadsOfIndexedTextureToUpdateQueue(int count, int textureIndex)
     {
         m_fullUploadCountExpected += count;
         m_totalUploadCountExpected += count;
 
         const IntRect rect(0, 0, 300, 150);
-        const TextureUploader::Parameters upload = { &m_texture, rect, IntSize() };
+        const TextureUploader::Parameters upload = { &m_textures[textureIndex], rect, IntSize() };
         for (int i = 0; i < count; i++)
             m_queue->appendFullUpload(upload);
     }
 
-    void appendPartialUploadsToUpdateQueue(int count)
+    void appendFullUploadsToUpdateQueue(int count)
+    {
+        appendFullUploadsOfIndexedTextureToUpdateQueue(count, 0);
+    }
+
+    void appendPartialUploadsOfIndexedTextureToUpdateQueue(int count, int textureIndex)
     {
         m_partialCountExpected += count;
         m_totalUploadCountExpected += count;
 
         const IntRect rect(0, 0, 100, 100);
-        const TextureUploader::Parameters upload = { &m_texture, rect, IntSize() };
+        const TextureUploader::Parameters upload = { &m_textures[textureIndex], rect, IntSize() };
         for (int i = 0; i < count; i++)
             m_queue->appendPartialUpload(upload);
     }
 
+    void appendPartialUploadsToUpdateQueue(int count)
+    {
+        appendPartialUploadsOfIndexedTextureToUpdateQueue(count, 0);
+    }
+
     void setMaxUploadCountPerUpdate(int count)
     {
         m_maxUploadCountPerUpdate = count;
     }
 
 protected:
     // Classes required to interact and test the CCTextureUpdateController
     OwnPtr<CCGraphicsContext> m_context;
     OwnPtr<CCResourceProvider> m_resourceProvider;
     OwnPtr<CCTextureUpdateQueue> m_queue;
-    TextureForUploadTest m_texture;
+    TextureForUploadTest m_textures[4];
     TextureUploaderForUploadTest m_uploader;
     OwnPtr<WebThread> m_thread;
     WebCompositorInitializer m_compositorInitializer;
 
 
     // Properties / expectations of this test
     int m_fullUploadCountExpected;
     int m_partialCountExpected;
     int m_totalUploadCountExpected;
     int m_maxUploadCountPerUpdate;
@@ skipping 280 matching lines @@
             runPendingTask(&thread, controller.get());
     }
 
     EXPECT_FALSE(thread.hasPendingTask());
     EXPECT_TRUE(client.readyToFinalizeCalled());
     EXPECT_EQ(2, m_numBeginUploads);
     EXPECT_EQ(2, m_numEndUploads);
     EXPECT_EQ(2, m_numTotalUploads);
 }
 
+TEST_F(CCTextureUpdateControllerTest, ClearUploadsToEvictedResources)
+{
+    appendFullUploadsOfIndexedTextureToUpdateQueue(1, 0);
+    appendPartialUploadsOfIndexedTextureToUpdateQueue(1, 1);
+    appendFullUploadsOfIndexedTextureToUpdateQueue(1, 2);
+    appendPartialUploadsOfIndexedTextureToUpdateQueue(1, 3);
+    DebugScopedSetImplThread implThread;
+
+    m_queue->clearUploadsToEvictedResources();
+    EXPECT_EQ(2u, m_queue->fullUploadSize());
+    EXPECT_EQ(2u, m_queue->partialUploadSize());
+
+    m_textures[0].evictBackingResource();
+    m_queue->clearUploadsToEvictedResources();
+    EXPECT_EQ(1u, m_queue->fullUploadSize());
+    EXPECT_EQ(2u, m_queue->partialUploadSize());
+
+    m_textures[3].evictBackingResource();
+    m_queue->clearUploadsToEvictedResources();
+    EXPECT_EQ(1u, m_queue->fullUploadSize());
+    EXPECT_EQ(1u, m_queue->partialUploadSize());
+
+    m_textures[2].evictBackingResource();
+    m_queue->clearUploadsToEvictedResources();
+    EXPECT_EQ(0u, m_queue->fullUploadSize());
+    EXPECT_EQ(1u, m_queue->partialUploadSize());
+
+    m_textures[1].evictBackingResource();
+    m_queue->clearUploadsToEvictedResources();
+    EXPECT_EQ(0u, m_queue->fullUploadSize());
+    EXPECT_EQ(0u, m_queue->partialUploadSize());
+}
+
 } // namespace