Index: cc/CCThreadProxy.cpp |
diff --git a/cc/CCThreadProxy.cpp b/cc/CCThreadProxy.cpp |
index 57ea3d3d5a27de3d5f3a06ffecddf58cb9f473ef..8c64542a55c94ab35f46ed66b72057abbc5f1948 100644 |
--- a/cc/CCThreadProxy.cpp |
+++ b/cc/CCThreadProxy.cpp |
@@ -31,13 +31,6 @@ static const double contextRecreationTickRate = 0.03; |
namespace cc { |
-namespace { |
- |
-// Type of texture uploader to use for texture updates. |
-static TextureUploaderOption textureUploader = ThrottledUploader; |
- |
-} // anonymous namespace |
- |
PassOwnPtr<CCProxy> CCThreadProxy::create(CCLayerTreeHost* layerTreeHost) |
{ |
return adoptPtr(new CCThreadProxy(layerTreeHost)); |
@@ -884,7 +877,7 @@ void CCThreadProxy::initializeRendererOnImplThread(CCCompletionEvent* completion |
TRACE_EVENT0("cc", "CCThreadProxy::initializeRendererOnImplThread"); |
ASSERT(isImplThread()); |
ASSERT(m_contextBeforeInitializationOnImplThread); |
- *initializeSucceeded = m_layerTreeHostImpl->initializeRenderer(m_contextBeforeInitializationOnImplThread.release(), textureUploader); |
+ *initializeSucceeded = m_layerTreeHostImpl->initializeRenderer(m_contextBeforeInitializationOnImplThread.release()); |
if (*initializeSucceeded) { |
*capabilities = m_layerTreeHostImpl->rendererCapabilities(); |
m_schedulerOnImplThread->setSwapBuffersCompleteSupported( |
@@ -921,7 +914,7 @@ void CCThreadProxy::recreateContextOnImplThread(CCCompletionEvent* completion, C |
TRACE_EVENT0("cc", "CCThreadProxy::recreateContextOnImplThread"); |
ASSERT(isImplThread()); |
m_layerTreeHost->deleteContentsTexturesOnImplThread(m_layerTreeHostImpl->resourceProvider()); |
- *recreateSucceeded = m_layerTreeHostImpl->initializeRenderer(adoptPtr(contextPtr), textureUploader); |
+ *recreateSucceeded = m_layerTreeHostImpl->initializeRenderer(adoptPtr(contextPtr)); |
if (*recreateSucceeded) { |
*capabilities = m_layerTreeHostImpl->rendererCapabilities(); |
m_schedulerOnImplThread->didRecreateContext(); |