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

Unified Diff: cc/CCResourceProviderTest.cpp

Issue 11031060: Revert 160267 - Merge 158192 - cc: Remove TextureUploaderOption. (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1271/src/
Patch Set: Created 8 years, 2 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/CCResourceProvider.cpp ('k') | cc/CCScopedTextureTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/CCResourceProviderTest.cpp
===================================================================
--- cc/CCResourceProviderTest.cpp (revision 160268)
+++ cc/CCResourceProviderTest.cpp (working copy)
@@ -271,7 +271,7 @@
CCResourceProviderTest()
: m_sharedData(ContextSharedData::create())
, m_context(FakeWebCompositorOutputSurface::create(ResourceProviderContext::create(m_sharedData.get())))
- , m_resourceProvider(CCResourceProvider::create(m_context.get()))
+ , m_resourceProvider(CCResourceProvider::create(m_context.get(), UnthrottledUploader))
{
m_resourceProvider->setDefaultResourceType(GetParam());
}
@@ -417,7 +417,7 @@
return;
OwnPtr<CCGraphicsContext> childContext(FakeWebCompositorOutputSurface::create(ResourceProviderContext::create(m_sharedData.get())));
- OwnPtr<CCResourceProvider> childResourceProvider(CCResourceProvider::create(childContext.get()));
+ OwnPtr<CCResourceProvider> childResourceProvider(CCResourceProvider::create(childContext.get(), UnthrottledUploader));
IntSize size(1, 1);
WGC3Denum format = GraphicsContext3D::RGBA;
« no previous file with comments | « cc/CCResourceProvider.cpp ('k') | cc/CCScopedTextureTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698