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

Unified Diff: cc/layers/nine_patch_layer_unittest.cc

Issue 12426024: cc: Switch RenderingStats collection in Layer::Update() to RenderingStatsInstrumentation (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: 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
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 9e8cfad03a815decdcb8022add877a3141c21662..cdc0c46785768d54f8a2bf01da289991fdd9f698 100644
--- a/cc/layers/nine_patch_layer_unittest.cc
+++ b/cc/layers/nine_patch_layer_unittest.cc
@@ -83,7 +83,7 @@ TEST_F(NinePatchLayerTest, triggerFullUploadOnceWhenChangingBitmap)
// No bitmap set should not trigger any uploads.
testLayer->SetTexturePriorities(calculator);
- testLayer->Update(&queue, &occlusionTracker, NULL);
+ testLayer->Update(&queue, &occlusionTracker);
EXPECT_EQ(queue.FullUploadSize(), 0);
EXPECT_EQ(queue.PartialUploadSize(), 0);
@@ -93,7 +93,7 @@ TEST_F(NinePatchLayerTest, triggerFullUploadOnceWhenChangingBitmap)
bitmap.allocPixels();
testLayer->SetBitmap(bitmap, gfx::Rect(5, 5, 1, 1));
testLayer->SetTexturePriorities(calculator);
- testLayer->Update(&queue, &occlusionTracker, NULL);
+ testLayer->Update(&queue, &occlusionTracker);
EXPECT_EQ(queue.FullUploadSize(), 1);
EXPECT_EQ(queue.PartialUploadSize(), 0);
ResourceUpdate params = queue.TakeFirstFullUpload();
@@ -116,7 +116,7 @@ TEST_F(NinePatchLayerTest, triggerFullUploadOnceWhenChangingBitmap)
// Nothing changed, so no repeated upload.
testLayer->SetTexturePriorities(calculator);
- testLayer->Update(&queue, &occlusionTracker, NULL);
+ testLayer->Update(&queue, &occlusionTracker);
EXPECT_EQ(queue.FullUploadSize(), 0);
EXPECT_EQ(queue.PartialUploadSize(), 0);
@@ -128,7 +128,7 @@ TEST_F(NinePatchLayerTest, triggerFullUploadOnceWhenChangingBitmap)
// Reupload after eviction
testLayer->SetTexturePriorities(calculator);
- testLayer->Update(&queue, &occlusionTracker, NULL);
+ testLayer->Update(&queue, &occlusionTracker);
EXPECT_EQ(queue.FullUploadSize(), 1);
EXPECT_EQ(queue.PartialUploadSize(), 0);
@@ -137,7 +137,7 @@ TEST_F(NinePatchLayerTest, triggerFullUploadOnceWhenChangingBitmap)
EXPECT_EQ(NULL, params.texture->resource_manager());
testLayer->SetTexturePriorities(calculator);
ResourceUpdateQueue queue2;
- testLayer->Update(&queue2, &occlusionTracker, NULL);
+ testLayer->Update(&queue2, &occlusionTracker);
EXPECT_EQ(queue2.FullUploadSize(), 1);
EXPECT_EQ(queue2.PartialUploadSize(), 0);
params = queue2.TakeFirstFullUpload();

Powered by Google App Engine
This is Rietveld 408576698