cc: Remove resource updates from scheduler.

cc/CCThreadProxy.cpp

Index: cc/CCThreadProxy.cpp
diff --git a/cc/CCThreadProxy.cpp b/cc/CCThreadProxy.cpp
index 009ac1cd17dbcc1ac1748eb8fe1287da4c0bc232..085aecdbceb57daff5524cbe6e292ad5f9e26787 100644
--- a/cc/CCThreadProxy.cpp
+++ b/cc/CCThreadProxy.cpp
@@ -593,12 +593,10 @@ void CCThreadProxy::beginFrameCompleteOnImplThread(CCCompletionEvent* completion
         setNeedsCommitOnImplThread();
     }
 
-    bool hasResourceUpdates = queue->hasMoreUpdates();
-    if (hasResourceUpdates)
-        m_currentTextureUpdateControllerOnImplThread = CCTextureUpdateController::create(this, CCProxy::implThread(), queue, m_layerTreeHostImpl->resourceProvider(), m_layerTreeHostImpl->renderer()->textureCopier(), m_layerTreeHostImpl->renderer()->textureUploader());
-    m_commitCompletionEventOnImplThread = completion;
+    m_currentTextureUpdateControllerOnImplThread = CCTextureUpdateController::create(this, CCProxy::implThread(), queue, m_layerTreeHostImpl->resourceProvider(), m_layerTreeHostImpl->renderer()->textureCopier(), m_layerTreeHostImpl->renderer()->textureUploader());
+    m_currentTextureUpdateControllerOnImplThread->start();
 
-    m_schedulerOnImplThread->beginFrameComplete(hasResourceUpdates);
+    m_commitCompletionEventOnImplThread = completion;
 }
 
 void CCThreadProxy::beginFrameAbortedOnImplThread()
@@ -611,11 +609,9 @@ void CCThreadProxy::beginFrameAbortedOnImplThread()
     m_schedulerOnImplThread->beginFrameAborted();
 }
 
-void CCThreadProxy::scheduledActionUpdateMoreResources(double monotonicTimeLimit)
+void CCThreadProxy::scheduledActionUpdateMoreResources(double)

[jamesr, 2012/09/17 06:57:38]

why is this function still here? what's it do?

[reveman, 2012/09/17 15:32:52]

Nothing. As I mentioned in my initial comment, the current patch doesn't remove
the old resource update state from the scheduler but I'll do that before
landing. The reason for that was to make it easier to maintain and review this
patch. 

Btw, I think we should land this https://codereview.chromium.org/10917265/
first. It just moves partial uploads to the commit step without moving all
resource updates out of the scheduler.

 {
     TRACE_EVENT0("cc", "CCThreadProxy::scheduledActionUpdateMoreResources");
-    ASSERT(m_currentTextureUpdateControllerOnImplThread);
-    m_currentTextureUpdateControllerOnImplThread->updateMoreTextures(monotonicTimeLimit);
 }
 
 void CCThreadProxy::scheduledActionCommit()
@@ -623,7 +619,10 @@ void CCThreadProxy::scheduledActionCommit()
     TRACE_EVENT0("cc", "CCThreadProxy::scheduledActionCommit");
     ASSERT(isImplThread());
     ASSERT(m_commitCompletionEventOnImplThread);
+    ASSERT(m_currentTextureUpdateControllerOnImplThread);
 
+    // Complete remaining updates.
+    m_currentTextureUpdateControllerOnImplThread->updateAllTexturesNow();
     m_currentTextureUpdateControllerOnImplThread.clear();
 
     m_layerTreeHostImpl->beginCommit();
@@ -764,7 +763,7 @@ CCScheduledActionDrawAndSwapResult CCThreadProxy::scheduledActionDrawAndSwapForc
 void CCThreadProxy::updateTexturesCompleted()
 {
     ASSERT(isImplThread());
-    m_schedulerOnImplThread->updateResourcesComplete();
+    m_schedulerOnImplThread->beginFrameComplete(false);
 }
 
 void CCThreadProxy::didCommitAndDrawFrame()