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

cc/throttled_texture_uploader_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 "ThrottledTextureUploader.h"
 
+#include "CCPrioritizedTexture.h"
 #include "Extensions3DChromium.h"
 #include "FakeWebGraphicsContext3D.h"
 #include "GraphicsContext3D.h"
 
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include <wtf/RefPtr.h>
 
 using namespace cc;
 using namespace WebKit;
@@ skipping 17 matching lines @@
             break;
         }
     }
 
     void setResultAvailable(unsigned resultAvailable) { m_resultAvailable = resultAvailable; }
 
 private:
     unsigned m_resultAvailable;
 };
 
-class FakeTexture : public cc::LayerTextureUpdater::Texture {
-public:
-  FakeTexture() : LayerTextureUpdater::Texture(
-      CCPrioritizedTexture::create(NULL, IntSize(256,256), GL_RGBA)) {
-  }
-
-  virtual void updateRect(cc::CCResourceProvider* , const cc::IntRect&, const cc::IntSize&) OVERRIDE { }
-
-};
-
 
 TEST(ThrottledTextureUploaderTest, NumBlockingUploads)
 {
     OwnPtr<FakeWebGraphicsContext3DWithQueryTesting> fakeContext(adoptPtr(new FakeWebGraphicsContext3DWithQueryTesting));
     OwnPtr<ThrottledTextureUploader> uploader = ThrottledTextureUploader::create(fakeContext.get());
-    OwnPtr<FakeTexture> texture = adoptPtr(new FakeTexture);
+    scoped_ptr<CCPrioritizedTexture> texture =
+        CCPrioritizedTexture::create(NULL, IntSize(256, 256), GL_RGBA);
     TextureUploader::Parameters upload;
     upload.texture = texture.get();
-    upload.sourceRect = IntRect(IntPoint(0,0), texture->texture()->size());
-    upload.destOffset = IntSize();
+    upload.bitmap = NULL;
+    upload.picture = NULL;
+    upload.geometry.contentRect = IntRect(IntPoint(0,0), texture->size());
+    upload.geometry.sourceRect = IntRect(IntPoint(0,0), texture->size());
+    upload.geometry.destOffset = IntSize();
 
     fakeContext->setResultAvailable(0);
     EXPECT_EQ(0, uploader->numBlockingUploads());
     uploader->uploadTexture(NULL, upload);
     EXPECT_EQ(1, uploader->numBlockingUploads());
     uploader->uploadTexture(NULL, upload);
     EXPECT_EQ(2, uploader->numBlockingUploads());
 
     fakeContext->setResultAvailable(1);
     EXPECT_EQ(0, uploader->numBlockingUploads());
     uploader->uploadTexture(NULL, upload);
     EXPECT_EQ(0, uploader->numBlockingUploads());
     uploader->uploadTexture(NULL, upload);
     uploader->uploadTexture(NULL, upload);
     EXPECT_EQ(0, uploader->numBlockingUploads());
 }
 
 TEST(ThrottledTextureUploaderTest, MarkPendingUploadsAsNonBlocking)
 {
     OwnPtr<FakeWebGraphicsContext3DWithQueryTesting> fakeContext(adoptPtr(new FakeWebGraphicsContext3DWithQueryTesting));
     OwnPtr<ThrottledTextureUploader> uploader = ThrottledTextureUploader::create(fakeContext.get());
-    OwnPtr<FakeTexture> texture = adoptPtr(new FakeTexture);
+    scoped_ptr<CCPrioritizedTexture> texture =
+        CCPrioritizedTexture::create(NULL, IntSize(256, 256), GL_RGBA);
     TextureUploader::Parameters upload;
     upload.texture = texture.get();
-    upload.sourceRect = IntRect(IntPoint(0,0), texture->texture()->size());
-    upload.destOffset = IntSize();
+    upload.bitmap = NULL;
+    upload.picture = NULL;
+    upload.geometry.contentRect = IntRect(IntPoint(0,0), texture->size());
+    upload.geometry.sourceRect = IntRect(IntPoint(0,0), texture->size());
+    upload.geometry.destOffset = IntSize();
 
     fakeContext->setResultAvailable(0);
     EXPECT_EQ(0, uploader->numBlockingUploads());
     uploader->uploadTexture(NULL, upload);
     uploader->uploadTexture(NULL, upload);
     EXPECT_EQ(2, uploader->numBlockingUploads());
 
     uploader->markPendingUploadsAsNonBlocking();
     EXPECT_EQ(0, uploader->numBlockingUploads());
     uploader->uploadTexture(NULL, upload);
     EXPECT_EQ(1, uploader->numBlockingUploads());
 
     fakeContext->setResultAvailable(1);
     EXPECT_EQ(0, uploader->numBlockingUploads());
     uploader->uploadTexture(NULL, upload);
     uploader->markPendingUploadsAsNonBlocking();
     EXPECT_EQ(0, uploader->numBlockingUploads());
 }
 
 } // namespace