Move TextureCopier and TextureUploader from CCRenderer to CCResourceProvider

webkit/compositor_bindings/TiledLayerChromiumTest.cpp

 // 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 "TiledLayerChromium.h"
 
 #include "BitmapCanvasLayerTextureUpdater.h"
 #include "CCAnimationTestCommon.h"
@@ skipping 38 matching lines @@
 
 class TiledLayerChromiumTest : public testing::Test {
 public:
     TiledLayerChromiumTest()
         : m_compositorInitializer(0)
         , m_context(WebKit::createFakeCCGraphicsContext())
         , m_textureManager(CCPrioritizedTextureManager::create(60*1024*1024, 1024, CCRenderer::ContentPool))
         , m_occlusion(0)
     {
         DebugScopedSetImplThreadAndMainThreadBlocked implThreadAndMainThreadBlocked;
-        m_resourceProvider = CCResourceProvider::create(m_context.get());
+        m_resourceProvider = CCResourceProvider::create(m_context.get(), UnthrottledUploader);
     }
 
     virtual ~TiledLayerChromiumTest()
     {
         textureManagerClearAllMemory(m_textureManager.get(), m_resourceProvider.get());
         DebugScopedSetImplThreadAndMainThreadBlocked implThreadAndMainThreadBlocked;
         m_resourceProvider.clear();
     }
 
     // Helper classes and functions that set the current thread to be the impl thread
@@ skipping 22 matching lines @@
         FakeCCTiledLayerImpl* m_layerImpl;
     };
     void textureManagerClearAllMemory(CCPrioritizedTextureManager* textureManager, CCResourceProvider* resourceProvider)
     {
         DebugScopedSetImplThreadAndMainThreadBlocked implThreadAndMainThreadBlocked;
         textureManager->clearAllMemory(resourceProvider);
     }
     void updateTextures(int count = 500)
     {
         DebugScopedSetImplThreadAndMainThreadBlocked implThreadAndMainThreadBlocked;
-        CCTextureUpdateController::updateTextures(m_resourceProvider.get(), &m_copier, &m_uploader, &m_queue, count);
+        CCTextureUpdateController::updateTextures(m_resourceProvider.get(), &m_uploader, &m_queue, count);
     }
     void layerPushPropertiesTo(FakeTiledLayerChromium* layer, FakeCCTiledLayerImpl* layerImpl)
     {
         DebugScopedSetImplThreadAndMainThreadBlocked implThreadAndMainThreadBlocked;
         layer->pushPropertiesTo(layerImpl);
     }
     void layerUpdate(FakeTiledLayerChromium* layer, TestCCOcclusionTracker* occluded)
     {
         DebugScopedSetMainThread mainThread;
         layer->update(m_queue, occluded, m_stats);
@@ skipping 33 matching lines @@
 
         return needsUpdate;
     }
 
 public:
     WebKitTests::WebCompositorInitializer m_compositorInitializer;
     OwnPtr<CCGraphicsContext> m_context;
     OwnPtr<CCResourceProvider> m_resourceProvider;
     CCTextureUpdateQueue m_queue;
     CCRenderingStats m_stats;
-    FakeTextureCopier m_copier;
     FakeTextureUploader m_uploader;
     CCPriorityCalculator m_priorityCalculator;
     OwnPtr<CCPrioritizedTextureManager> m_textureManager;
     TestCCOcclusionTracker* m_occlusion;
 };
 
 TEST_F(TiledLayerChromiumTest, pushDirtyTiles)
 {
     RefPtr<FakeTiledLayerChromium> layer = adoptRef(new FakeTiledLayerChromium(m_textureManager.get()));
     ScopedFakeCCTiledLayerImpl layerImpl(1);
@@ skipping 1378 matching lines @@
     updateTextures();
 
     // Invalidate the entire layer in layer space. When painting, the rect given to webkit should match the layer's bounds.
     layer->setNeedsDisplayRect(layerRect);
     layer->update(m_queue, 0, m_stats);
 
     EXPECT_RECT_EQ(layerRect, layer->trackingLayerPainter()->paintedRect());
 }
 
 } // namespace