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

Unified Diff: cc/layers/nine_patch_layer_unittest.cc

Issue 12962007: cc: Chromify resource_update_queue (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebase Created 7 years, 9 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
« no previous file with comments | « cc/layers/nine_patch_layer.cc ('k') | cc/layers/scrollbar_layer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/nine_patch_layer_unittest.cc
diff --git a/cc/layers/nine_patch_layer_unittest.cc b/cc/layers/nine_patch_layer_unittest.cc
index 927d0cc410af5a006680882ed22ee0f66c680f92..5758f642b820519e8b99a1ea2a2f080379d43a53 100644
--- a/cc/layers/nine_patch_layer_unittest.cc
+++ b/cc/layers/nine_patch_layer_unittest.cc
@@ -84,8 +84,8 @@ TEST_F(NinePatchLayerTest, triggerFullUploadOnceWhenChangingBitmap)
// No bitmap set should not trigger any uploads.
testLayer->SetTexturePriorities(calculator);
testLayer->Update(&queue, &occlusionTracker, NULL);
- EXPECT_EQ(queue.fullUploadSize(), 0);
- EXPECT_EQ(queue.partialUploadSize(), 0);
+ EXPECT_EQ(queue.FullUploadSize(), 0);
+ EXPECT_EQ(queue.PartialUploadSize(), 0);
// Setting a bitmap set should trigger a single full upload.
SkBitmap bitmap;
@@ -94,9 +94,9 @@ TEST_F(NinePatchLayerTest, triggerFullUploadOnceWhenChangingBitmap)
testLayer->SetBitmap(bitmap, gfx::Rect(5, 5, 1, 1));
testLayer->SetTexturePriorities(calculator);
testLayer->Update(&queue, &occlusionTracker, NULL);
- EXPECT_EQ(queue.fullUploadSize(), 1);
- EXPECT_EQ(queue.partialUploadSize(), 0);
- ResourceUpdate params = queue.takeFirstFullUpload();
+ EXPECT_EQ(queue.FullUploadSize(), 1);
+ EXPECT_EQ(queue.PartialUploadSize(), 0);
+ ResourceUpdate params = queue.TakeFirstFullUpload();
EXPECT_TRUE(params.texture != NULL);
// Upload the texture.
@@ -117,8 +117,8 @@ TEST_F(NinePatchLayerTest, triggerFullUploadOnceWhenChangingBitmap)
// Nothing changed, so no repeated upload.
testLayer->SetTexturePriorities(calculator);
testLayer->Update(&queue, &occlusionTracker, NULL);
- EXPECT_EQ(queue.fullUploadSize(), 0);
- EXPECT_EQ(queue.partialUploadSize(), 0);
+ EXPECT_EQ(queue.FullUploadSize(), 0);
+ EXPECT_EQ(queue.PartialUploadSize(), 0);
{
DebugScopedSetImplThread implThread(proxy());
@@ -129,8 +129,8 @@ TEST_F(NinePatchLayerTest, triggerFullUploadOnceWhenChangingBitmap)
// Reupload after eviction
testLayer->SetTexturePriorities(calculator);
testLayer->Update(&queue, &occlusionTracker, NULL);
- EXPECT_EQ(queue.fullUploadSize(), 1);
- EXPECT_EQ(queue.partialUploadSize(), 0);
+ EXPECT_EQ(queue.FullUploadSize(), 1);
+ EXPECT_EQ(queue.PartialUploadSize(), 0);
// PrioritizedResourceManager clearing
layer_tree_host_->contents_texture_manager()->UnregisterTexture(params.texture);
@@ -138,9 +138,9 @@ TEST_F(NinePatchLayerTest, triggerFullUploadOnceWhenChangingBitmap)
testLayer->SetTexturePriorities(calculator);
ResourceUpdateQueue queue2;
testLayer->Update(&queue2, &occlusionTracker, NULL);
- EXPECT_EQ(queue2.fullUploadSize(), 1);
- EXPECT_EQ(queue2.partialUploadSize(), 0);
- params = queue2.takeFirstFullUpload();
+ EXPECT_EQ(queue2.FullUploadSize(), 1);
+ EXPECT_EQ(queue2.PartialUploadSize(), 0);
+ params = queue2.TakeFirstFullUpload();
EXPECT_TRUE(params.texture != NULL);
EXPECT_EQ(params.texture->resource_manager(), layer_tree_host_->contents_texture_manager());
}
« no previous file with comments | « cc/layers/nine_patch_layer.cc ('k') | cc/layers/scrollbar_layer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698