| Index: cc/CCThreadProxy.cpp
|
| diff --git a/cc/CCThreadProxy.cpp b/cc/CCThreadProxy.cpp
|
| index 579870f5ee86b534b8f611dd7c0e53af9c7d9204..d4db06a1a514efeffca86a6e14e33e08fd766642 100644
|
| --- a/cc/CCThreadProxy.cpp
|
| +++ b/cc/CCThreadProxy.cpp
|
| @@ -602,11 +602,10 @@ void CCThreadProxy::beginFrameCompleteOnImplThread(CCCompletionEvent* completion
|
| m_resetContentsTexturesPurgedAfterCommitOnImplThread = true;
|
| }
|
|
|
| - bool hasResourceUpdates = !!queue->fullUploadSize();
|
| m_currentTextureUpdateControllerOnImplThread = CCTextureUpdateController::create(this, CCProxy::implThread(), queue, m_layerTreeHostImpl->resourceProvider(), m_layerTreeHostImpl->resourceProvider()->textureUploader());
|
| - m_commitCompletionEventOnImplThread = completion;
|
| + m_currentTextureUpdateControllerOnImplThread->start();
|
|
|
| - m_schedulerOnImplThread->beginFrameComplete(hasResourceUpdates);
|
| + m_commitCompletionEventOnImplThread = completion;
|
| }
|
|
|
| void CCThreadProxy::beginFrameAbortedOnImplThread()
|
| @@ -619,12 +618,9 @@ void CCThreadProxy::beginFrameAbortedOnImplThread()
|
| m_schedulerOnImplThread->beginFrameAborted();
|
| }
|
|
|
| -void CCThreadProxy::scheduledActionUpdateMoreResources(base::TimeTicks timeLimit)
|
| +void CCThreadProxy::scheduledActionUpdateMoreResources(base::TimeTicks)
|
| {
|
| TRACE_EVENT0("cc", "CCThreadProxy::scheduledActionUpdateMoreResources");
|
| - ASSERT(m_currentTextureUpdateControllerOnImplThread);
|
| - double monotonicTimeLimit = timeLimit.ToInternalValue() / static_cast<double>(base::Time::kMicrosecondsPerSecond);
|
| - m_currentTextureUpdateControllerOnImplThread->performMoreUpdates(monotonicTimeLimit);
|
| }
|
|
|
| void CCThreadProxy::scheduledActionCommit()
|
| @@ -776,7 +772,7 @@ CCScheduledActionDrawAndSwapResult CCThreadProxy::scheduledActionDrawAndSwapForc
|
| void CCThreadProxy::readyToFinalizeTextureUpdates()
|
| {
|
| ASSERT(isImplThread());
|
| - m_schedulerOnImplThread->updateResourcesComplete();
|
| + m_schedulerOnImplThread->beginFrameComplete(false);
|
| }
|
|
|
| void CCThreadProxy::didCommitAndDrawFrame()
|
|
|