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

cc/CCTextureUpdateControllerTest.cpp

Index: cc/CCTextureUpdateControllerTest.cpp
diff --git a/cc/CCTextureUpdateControllerTest.cpp b/cc/CCTextureUpdateControllerTest.cpp
index b57fad2a9e55cde2ee59d5a3daee4b0770409be9..7cf7dee03b4e58c334ace524576b054957b343d9 100644
--- a/cc/CCTextureUpdateControllerTest.cpp
+++ b/cc/CCTextureUpdateControllerTest.cpp
@@ -63,20 +63,6 @@ private:
     CCTextureUpdateControllerTest* m_test;
 };
 
-class TextureForUploadTest : public LayerTextureUpdater::Texture {
-public:
-    TextureForUploadTest() 
-        : LayerTextureUpdater::Texture(nullptr)
-        , 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:
@@ -125,6 +111,9 @@ protected:
         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);
     }
 
 
@@ -134,7 +123,7 @@ protected:
         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);
     }
@@ -150,7 +139,7 @@ protected:
         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);
     }
@@ -182,7 +171,7 @@ protected:
     OwnPtr<CCGraphicsContext> m_context;
     OwnPtr<CCResourceProvider> m_resourceProvider;
     OwnPtr<CCTextureUpdateQueue> m_queue;
-    TextureForUploadTest m_textures[4];
+    OwnPtr<CCPrioritizedTexture> m_textures[4];
     TextureUploaderForUploadTest m_uploader;
     OwnPtr<WebThread> m_thread;
     WebCompositorInitializer m_compositorInitializer;
@@ -484,6 +473,7 @@ TEST_F(CCTextureUpdateControllerTest, ClearUploadsToEvictedResources)
     EXPECT_EQ(2u, m_queue->fullUploadSize());
     EXPECT_EQ(2u, m_queue->partialUploadSize());
 
+#if 0
     m_textures[0].evictBackingResource();
     m_queue->clearUploadsToEvictedResources();
     EXPECT_EQ(1u, m_queue->fullUploadSize());
@@ -503,6 +493,8 @@ TEST_F(CCTextureUpdateControllerTest, ClearUploadsToEvictedResources)
     m_queue->clearUploadsToEvictedResources();
     EXPECT_EQ(0u, m_queue->fullUploadSize());
     EXPECT_EQ(0u, m_queue->partialUploadSize());
+#endif
+
 }
 
 } // namespace