Merge 170403 - Use a lock to deal with concurrent access to the m_evictedBackings

cc/prioritized_texture_unittest.cc

 // Copyright 2012 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 "cc/prioritized_texture.h"
 
 #include "cc/prioritized_texture_manager.h"
 #include "cc/single_thread_proxy.h" // For DebugScopedSetImplThread
@@ skipping 72 matching lines @@
         DebugScopedSetImplThreadAndMainThreadBlocked implThreadAndMainThreadBlocked;
         textureManager->assertInvariants();
 #endif
     }
 
     bool textureBackingIsAbovePriorityCutoff(PrioritizedTexture* texture)
     {
         return texture->m_backing->wasAbovePriorityCutoffAtLastPriorityUpdate();
     }
 
+    size_t evictedBackingCount(PrioritizedTextureManager* resourceManager)
+    {
+        return resourceManager->m_evictedBackings.size();
+    }
+
 protected:
     const IntSize m_textureSize;
     const GLenum m_textureFormat;
     WebCompositorInitializer m_compositorInitializer;
     scoped_ptr<GraphicsContext> m_context;
     scoped_ptr<ResourceProvider> m_resourceProvider;
 };
 
 }
 
@@ skipping 124 matching lines @@
     prioritizeTexturesAndBackings(textureManager.get());
     for (size_t i = 0; i < maxTextures; ++i)
         EXPECT_EQ(validateTexture(textures[i], false), i < 4);
     {
         DebugScopedSetImplThreadAndMainThreadBlocked implThreadAndMainThreadBlocked;
         textureManager->reduceMemory(resourceProvider());
     }
     EXPECT_EQ(texturesMemorySize(4), textureManager->memoryAboveCutoffBytes());
 
     // Do a one-time eviction for one more texture based on priority cutoff
-    PrioritizedTextureManager::BackingList evictedBackings;
+    textureManager->unlinkAndClearEvictedBackings();
     {
         DebugScopedSetImplThreadAndMainThreadBlocked implThreadAndMainThreadBlocked;
         textureManager->reduceMemoryOnImplThread(texturesMemorySize(8), 104, resourceProvider());
-        textureManager->getEvictedBackings(evictedBackings);
-        EXPECT_EQ(0, evictedBackings.size());
+        EXPECT_EQ(0, evictedBackingCount(textureManager.get()));
         textureManager->reduceMemoryOnImplThread(texturesMemorySize(8), 103, resourceProvider());
-        textureManager->getEvictedBackings(evictedBackings);
-        EXPECT_EQ(1, evictedBackings.size());
+        EXPECT_EQ(1, evictedBackingCount(textureManager.get()));
     }
-    textureManager->unlinkEvictedBackings(evictedBackings);
+    textureManager->unlinkAndClearEvictedBackings();
     EXPECT_EQ(texturesMemorySize(3), textureManager->memoryUseBytes());
 
     // Re-allocate the the texture after the one-time drop.
     prioritizeTexturesAndBackings(textureManager.get());
     for (size_t i = 0; i < maxTextures; ++i)
         EXPECT_EQ(validateTexture(textures[i], false), i < 4);
     {
         DebugScopedSetImplThreadAndMainThreadBlocked implThreadAndMainThreadBlocked;
         textureManager->reduceMemory(resourceProvider());
     }
@@ skipping 441 matching lines @@
         EXPECT_EQ(texturesMemorySize(3), textureManager->memoryVisibleBytes());
         EXPECT_EQ(texturesMemorySize(4), textureManager->memoryVisibleAndNearbyBytes());
     }
 
     DebugScopedSetImplThreadAndMainThreadBlocked implThreadAndMainThreadBlocked;
     textureManager->clearAllMemory(resourceProvider());
 }
 
 
 } // namespace