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

Unified Diff: content/common/gpu/gpu_memory_manager_unittest.cc

Issue 12226082: Distribute extra memory evenly among visible tabs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Switch branches Created 7 years, 10 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 side-by-side diff with in-line comments
Download patch
Index: content/common/gpu/gpu_memory_manager_unittest.cc
diff --git a/content/common/gpu/gpu_memory_manager_unittest.cc b/content/common/gpu/gpu_memory_manager_unittest.cc
index b9c3727f39eaa5489359e3ab4170bfc7e351c22a..be9a974bd00d54aaff02a57257766ee33da57d7d 100644
--- a/content/common/gpu/gpu_memory_manager_unittest.cc
+++ b/content/common/gpu/gpu_memory_manager_unittest.cc
@@ -924,7 +924,6 @@ TEST_F(GpuMemoryManagerTestNonuniform, BackgroundMru) {
EXPECT_GE(stub3.BytesWhenVisible(), 23u);
EXPECT_LT(stub1.BytesWhenVisible(), 32u);
EXPECT_LT(stub2.BytesWhenVisible(), 32u);
- EXPECT_LT(stub3.BytesWhenVisible(), 32u);
EXPECT_GE(stub1.BytesWhenNotVisible(), 6u);
EXPECT_GE(stub2.BytesWhenNotVisible(), 6u);
EXPECT_GE(stub3.BytesWhenNotVisible(), 6u);
@@ -1041,10 +1040,10 @@ TEST_F(GpuMemoryManagerTestNonuniform, DefaultAllocation) {
FakeClient stub1(&memmgr_, GenerateUniqueSurfaceId(), true);
- // Expect that a client which has not sent stats receive the
- // default allocation.
+ // Expect that a client which has not sent stats receive at
+ // least the default allocation.
Manage();
- EXPECT_EQ(stub1.BytesWhenVisible(),
+ EXPECT_GE(stub1.BytesWhenVisible(),
memmgr_.GetDefaultClientAllocation());
EXPECT_EQ(stub1.BytesWhenNotVisible(), 0u);
}
« content/common/gpu/gpu_memory_manager.cc ('K') | « content/common/gpu/gpu_memory_manager.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698