Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(187)

Side by Side Diff: cc/CCPrioritizedTextureTest.cpp

Issue 11079007: Fix issue incremental upload can evict textures being drawn (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Incorporate review feedback Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "config.h" 5 #include "config.h"
6 6
7 #include "CCPrioritizedTexture.h" 7 #include "CCPrioritizedTexture.h"
8 8
9 #include "CCPrioritizedTextureManager.h" 9 #include "CCPrioritizedTextureManager.h"
10 #include "CCSingleThreadProxy.h" // For DebugScopedSetImplThread 10 #include "CCSingleThreadProxy.h" // For DebugScopedSetImplThread
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 63
64 void prioritizeTexturesAndBackings(CCPrioritizedTextureManager* textureManag er) 64 void prioritizeTexturesAndBackings(CCPrioritizedTextureManager* textureManag er)
65 { 65 {
66 textureManager->prioritizeTextures(); 66 textureManager->prioritizeTextures();
67 textureManagerUpdateBackingsPriorities(textureManager); 67 textureManagerUpdateBackingsPriorities(textureManager);
68 } 68 }
69 69
70 void textureManagerUpdateBackingsPriorities(CCPrioritizedTextureManager* tex tureManager) 70 void textureManagerUpdateBackingsPriorities(CCPrioritizedTextureManager* tex tureManager)
71 { 71 {
72 DebugScopedSetImplThreadAndMainThreadBlocked implThreadAndMainThreadBloc ked; 72 DebugScopedSetImplThreadAndMainThreadBlocked implThreadAndMainThreadBloc ked;
73 textureManager->updateBackingsPriorities(); 73 textureManager->pushTexturePrioritiesToBackings();
74 } 74 }
75 75
76 CCResourceProvider* resourceProvider() 76 CCResourceProvider* resourceProvider()
77 { 77 {
78 return m_resourceProvider.get(); 78 return m_resourceProvider.get();
79 } 79 }
80 80
81 void textureManagerAssertInvariants(CCPrioritizedTextureManager* textureMana ger) 81 void textureManagerAssertInvariants(CCPrioritizedTextureManager* textureMana ger)
82 { 82 {
83 #if !ASSERT_DISABLED 83 #if !ASSERT_DISABLED
(...skipping 443 matching lines...) Expand 10 before | Expand all | Expand 10 after
527 EXPECT_TRUE(textureBackingIsAbovePriorityCutoff(textures[i].get())); 527 EXPECT_TRUE(textureBackingIsAbovePriorityCutoff(textures[i].get()));
528 for (size_t i = 1; i < maxTextures; i += 2) 528 for (size_t i = 1; i < maxTextures; i += 2)
529 EXPECT_FALSE(textureBackingIsAbovePriorityCutoff(textures[i].get())); 529 EXPECT_FALSE(textureBackingIsAbovePriorityCutoff(textures[i].get()));
530 530
531 DebugScopedSetImplThreadAndMainThreadBlocked implThreadAndMainThreadBlocked; 531 DebugScopedSetImplThreadAndMainThreadBlocked implThreadAndMainThreadBlocked;
532 textureManager->clearAllMemory(resourceProvider()); 532 textureManager->clearAllMemory(resourceProvider());
533 } 533 }
534 534
535 535
536 } // namespace 536 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698