Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(621)

Unified Diff: webkit/compositor_bindings/TiledLayerChromiumTest.cpp

Issue 10917251: Move TextureCopier and TextureUploader from CCRenderer to CCResourceProvider (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix rebase merge issues Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/test/CCTiledLayerTestCommon.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/compositor_bindings/TiledLayerChromiumTest.cpp
diff --git a/webkit/compositor_bindings/TiledLayerChromiumTest.cpp b/webkit/compositor_bindings/TiledLayerChromiumTest.cpp
index 3c7b9647648817d522f84dd3ffdebfaa435b7973..553044252b7e4bbb816a890d56b50521adb3b04b 100644
--- a/webkit/compositor_bindings/TiledLayerChromiumTest.cpp
+++ b/webkit/compositor_bindings/TiledLayerChromiumTest.cpp
@@ -56,7 +56,7 @@ public:
, m_occlusion(0)
{
DebugScopedSetImplThreadAndMainThreadBlocked implThreadAndMainThreadBlocked;
- m_resourceProvider = CCResourceProvider::create(m_context.get());
+ m_resourceProvider = CCResourceProvider::create(m_context.get(), UnthrottledUploader);
}
virtual ~TiledLayerChromiumTest()
@@ -99,7 +99,7 @@ public:
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)
{
@@ -153,7 +153,6 @@ public:
OwnPtr<CCResourceProvider> m_resourceProvider;
CCTextureUpdateQueue m_queue;
CCRenderingStats m_stats;
- FakeTextureCopier m_copier;
FakeTextureUploader m_uploader;
CCPriorityCalculator m_priorityCalculator;
OwnPtr<CCPrioritizedTextureManager> m_textureManager;
« no previous file with comments | « cc/test/CCTiledLayerTestCommon.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698