cc: Remove LayerTextureUpdater::Texture::updateRect() callback.

cc/texture_update_controller_unittest.cc

 // 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 45 matching lines @@
 class TextureUploaderForUploadTest : public FakeTextureUploader {
 public:
     TextureUploaderForUploadTest(CCTextureUpdateControllerTest *test) : m_test(test) { }
 
     virtual void uploadTexture(cc::CCResourceProvider*, Parameters) OVERRIDE;
 
 private:
     CCTextureUpdateControllerTest* m_test;
 };
 
-class TextureForUploadTest : public LayerTextureUpdater::Texture {
-public:
-    TextureForUploadTest()
-        : LayerTextureUpdater::Texture(scoped_ptr<CCPrioritizedTexture>())
-        , m_evicted(false)
-    {
-    }
-    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)
         , m_partialCountExpected(0)
         , m_totalUploadCountExpected(0)
         , m_maxUploadCountPerUpdate(0)
@@ skipping 27 matching lines @@
         m_numDanglingUploads++;
         m_numTotalUploads++;
     }
 
 protected:
     virtual void SetUp()
     {
         m_context = FakeWebCompositorOutputSurface::create(adoptPtr(new WebGraphicsContext3DForUploadTest(this)));
         DebugScopedSetImplThread implThread;
         m_resourceProvider = CCResourceProvider::create(m_context.get());
+        for (int i = 0; i < 4; i++)
+          m_textures[i] = CCPrioritizedTexture::create(
+              NULL, IntSize(256, 256), GL_RGBA);
     }
 
 
     void appendFullUploadsOfIndexedTextureToUpdateQueue(int count, int textureIndex)
     {
         m_fullUploadCountExpected += count;
         m_totalUploadCountExpected += count;
 
         const IntRect rect(0, 0, 300, 150);
-        const TextureUploader::Parameters upload = { &m_textures[textureIndex], rect, IntSize() };
+        const TextureUploader::Parameters upload = { m_textures[textureIndex].get(), NULL, NULL, { rect, rect, IntSize() } };
         for (int i = 0; i < count; i++)
             m_queue->appendFullUpload(upload);
     }
 
     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_textures[textureIndex], rect, IntSize() };
+        const TextureUploader::Parameters upload = { m_textures[textureIndex].get(), NULL, NULL, { rect, rect, IntSize() } };
         for (int i = 0; i < count; i++)
             m_queue->appendPartialUpload(upload);
     }
 
     void appendPartialUploadsToUpdateQueue(int count)
     {
         appendPartialUploadsOfIndexedTextureToUpdateQueue(count, 0);
     }
 
     void setMaxUploadCountPerUpdate(int count)
@@ skipping 11 matching lines @@
                 m_resourceProvider.get(),
                 &m_uploader);
         updateController->finalize();
     }
 
 protected:
     // Classes required to interact and test the CCTextureUpdateController
     scoped_ptr<CCGraphicsContext> m_context;
     OwnPtr<CCResourceProvider> m_resourceProvider;
     OwnPtr<CCTextureUpdateQueue> m_queue;
-    TextureForUploadTest m_textures[4];
+    scoped_ptr<CCPrioritizedTexture> 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 269 matching lines @@
 
         if (thread.hasPendingTask())
             runPendingTask(&thread, controller.get());
     }
 
     EXPECT_FALSE(thread.hasPendingTask());
     EXPECT_TRUE(client.readyToFinalizeCalled());
     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