Enable removing uploads to evicted textures from texture upload queues.

cc/CCThreadProxy.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 "CCThreadProxy.h"
 
 #include "CCDelayBasedTimeSource.h"
 #include "CCDrawQuad.h"
@@ skipping 339 matching lines @@
     TRACE_EVENT0("cc", "CCThreadProxy::postAnimationEventsToMainThreadOnImplThread");
     m_mainThreadProxy->postTask(createCCThreadTask(this, &CCThreadProxy::setAnimationEvents, events, wallClockTime));
 }
 
 void CCThreadProxy::releaseContentsTexturesOnImplThread()
 {
     ASSERT(isImplThread());
     m_layerTreeHost->reduceContentsTexturesMemoryOnImplThread(0, m_layerTreeHostImpl->resourceProvider());
     // Make sure that we get a new commit before drawing again.
     m_resetContentsTexturesPurgedAfterCommitOnImplThread = false;
-    // The texture upload queue may reference textures that were just purged, so clear it.
-    m_currentTextureUpdateControllerOnImplThread.clear();
+    // The texture upload queue may reference textures that were just purged, clear
+    // them from the queue.
+    if (m_currentTextureUpdateControllerOnImplThread.get() && m_layerTreeHost->evictedContentsTexturesBackingsExist())
+        m_currentTextureUpdateControllerOnImplThread->discardUploadsToEvictedResources();
 }
 
 void CCThreadProxy::setNeedsRedraw()
 {
     ASSERT(isMainThread());
     TRACE_EVENT0("cc", "CCThreadProxy::setNeedsRedraw");
     CCProxy::implThread()->postTask(createCCThreadTask(this, &CCThreadProxy::setFullRootLayerDamageOnImplThread));
     CCProxy::implThread()->postTask(createCCThreadTask(this, &CCThreadProxy::setNeedsRedrawOnImplThread));
 }
 
@@ skipping 208 matching lines @@
     ASSERT(isImplThread() && isMainThreadBlocked());
     ASSERT(m_schedulerOnImplThread);
     ASSERT(m_schedulerOnImplThread->commitPending());
 
     if (!m_layerTreeHostImpl) {
         TRACE_EVENT0("cc", "EarlyOut_NoLayerTree");
         completion->signal();
         return;
     }
 
+    // Clear any uploads we were making to textures linked to evicted
+    // resources
+    if (m_layerTreeHost->evictedContentsTexturesBackingsExist())
+        queue->clearUploadsToEvictedResources();
+
     // If we unlinked evicted textures on the main thread, delete them now.
     if (m_layerTreeHost->deleteEvictedContentTexturesBackings()) {
-
         // Deleting the evicted textures' backings resulted in some textures in the
-        // layer tree being invalidated (unliked from their backings). The upload queue
-        // may contain references to these textures, so clear the queue and kick off
+        // layer tree being invalidated (unliked from their backings). Kick off
         // another commit to fill them again.
-        queue->clearUploads();
         setNeedsCommitOnImplThread();
     } else {
         // The layer tree does not reference evicted textures, so mark that we
         // can draw this tree once this commit is complete.
         if (m_layerTreeHostImpl->contentsTexturesPurged())
             m_resetContentsTexturesPurgedAfterCommitOnImplThread = true;
     }
 
     bool hasResourceUpdates = !!queue->fullUploadSize();
     m_currentTextureUpdateControllerOnImplThread = CCTextureUpdateController::create(this, CCProxy::implThread(), queue, m_layerTreeHostImpl->resourceProvider(), m_layerTreeHostImpl->resourceProvider()->textureUploader());
@@ skipping 316 matching lines @@
 }
 
 void CCThreadProxy::implSideRenderingStatsOnImplThread(CCCompletionEvent* completion, CCRenderingStats* stats)
 {
     ASSERT(isImplThread());
     m_layerTreeHostImpl->renderingStats(*stats);
     completion->signal();
 }
 
 } // namespace cc