cc: Remove CCTextureUpdateController::updateTextures().

cc/CCSingleThreadProxy.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 "CCSingleThreadProxy.h"
 
 #include "CCDrawQuad.h"
 #include "CCGraphicsContext.h"
@@ skipping 157 matching lines @@
     m_layerTreeHost->didLoseContext();
     m_contextLost = true;
 }
 
 void CCSingleThreadProxy::setNeedsAnimate()
 {
     // CCThread-only feature
     ASSERT_NOT_REACHED();
 }
 
-void CCSingleThreadProxy::doCommit(CCTextureUpdateQueue& queue)
+void CCSingleThreadProxy::doCommit(PassOwnPtr<CCTextureUpdateQueue> queue)
 {
     ASSERT(CCProxy::isMainThread());
     // Commit immediately
     {
         DebugScopedSetMainThreadBlocked mainThreadBlocked;
         DebugScopedSetImplThread impl;
 
         m_layerTreeHostImpl->beginCommit();
 
         m_layerTreeHost->beginCommitOnImplThread(m_layerTreeHostImpl.get());
 
-        CCTextureUpdateController::updateTextures(m_layerTreeHostImpl->resourceProvider(), m_layerTreeHostImpl->resourceProvider()->textureUploader(), &queue);
+        OwnPtr<CCTextureUpdateController> updateController =
+            CCTextureUpdateController::create(
+                NULL,
+                CCProxy::mainThread(),
+                queue,
+                m_layerTreeHostImpl->resourceProvider(),
+                m_layerTreeHostImpl->resourceProvider()->textureUploader());
+        updateController->finalize();
 
         m_layerTreeHost->finishCommitOnImplThread(m_layerTreeHostImpl.get());
 
         m_layerTreeHostImpl->commitComplete();
 
 #if !ASSERT_DISABLED
         // In the single-threaded case, the scroll deltas should never be
         // touched on the impl layer tree.
         OwnPtr<CCScrollAndScaleSet> scrollInfo = m_layerTreeHostImpl->processScrollDeltas();
         ASSERT(!scrollInfo->scrolls.size());
@@ skipping 104 matching lines @@
     {
         DebugScopedSetImplThread implThread;
         m_layerTreeHost->getEvictedContentTexturesBackings(evictedContentsTexturesBackings);
     }
     m_layerTreeHost->unlinkEvictedContentTexturesBackings(evictedContentsTexturesBackings);
     {
         DebugScopedSetImplThreadAndMainThreadBlocked implAndMainBlocked;
         m_layerTreeHost->deleteEvictedContentTexturesBackings();
     }
 
-    CCTextureUpdateQueue queue;
-    m_layerTreeHost->updateLayers(queue, m_layerTreeHostImpl->memoryAllocationLimitBytes());
+    OwnPtr<CCTextureUpdateQueue> queue = adoptPtr(new CCTextureUpdateQueue);
+    m_layerTreeHost->updateLayers(*(queue.get()), m_layerTreeHostImpl->memoryAllocationLimitBytes());
 
     if (m_layerTreeHostImpl->contentsTexturesPurged())
         m_layerTreeHostImpl->resetContentsTexturesPurged();
 
     m_layerTreeHost->willCommit();
-    doCommit(queue);
+    doCommit(queue.release());
     bool result = doComposite();
     m_layerTreeHost->didBeginFrame();
     return result;
 }
 
 bool CCSingleThreadProxy::doComposite()
 {
     ASSERT(!m_contextLost);
     {
         DebugScopedSetImplThread impl;
@@ skipping 28 matching lines @@
 
 void CCSingleThreadProxy::didSwapFrame()
 {
     if (m_nextFrameIsNewlyCommittedFrame) {
         m_nextFrameIsNewlyCommittedFrame = false;
         m_layerTreeHost->didCommitAndDrawFrame();
     }
 }
 
 }