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

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: Rebase to 190965 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/picture_layer.h » ('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 a2741002f0e87b53a096bfd00b1a83d9ece86c78..84c534810b27a18b3bda1046b53bdf2e59b83eae 100644
--- a/cc/layers/nine_patch_layer_unittest.cc
+++ b/cc/layers/nine_patch_layer_unittest.cc
@@ -73,7 +73,7 @@ TEST_F(NinePatchLayerTest, TriggerFullUploadOnceWhenChangingBitmap) {
// No bitmap set should not trigger any uploads.
test_layer->SetTexturePriorities(calculator);
- test_layer->Update(&queue, &occlusion_tracker, NULL);
+ test_layer->Update(&queue, &occlusion_tracker);
EXPECT_EQ(queue.FullUploadSize(), 0);
EXPECT_EQ(queue.PartialUploadSize(), 0);
@@ -83,7 +83,7 @@ TEST_F(NinePatchLayerTest, TriggerFullUploadOnceWhenChangingBitmap) {
bitmap.allocPixels();
test_layer->SetBitmap(bitmap, gfx::Rect(5, 5, 1, 1));
test_layer->SetTexturePriorities(calculator);
- test_layer->Update(&queue, &occlusion_tracker, NULL);
+ test_layer->Update(&queue, &occlusion_tracker);
EXPECT_EQ(queue.FullUploadSize(), 1);
EXPECT_EQ(queue.PartialUploadSize(), 0);
ResourceUpdate params = queue.TakeFirstFullUpload();
@@ -107,7 +107,7 @@ TEST_F(NinePatchLayerTest, TriggerFullUploadOnceWhenChangingBitmap) {
// Nothing changed, so no repeated upload.
test_layer->SetTexturePriorities(calculator);
- test_layer->Update(&queue, &occlusion_tracker, NULL);
+ test_layer->Update(&queue, &occlusion_tracker);
EXPECT_EQ(queue.FullUploadSize(), 0);
EXPECT_EQ(queue.PartialUploadSize(), 0);
{
@@ -119,7 +119,7 @@ TEST_F(NinePatchLayerTest, TriggerFullUploadOnceWhenChangingBitmap) {
// Reupload after eviction
test_layer->SetTexturePriorities(calculator);
- test_layer->Update(&queue, &occlusion_tracker, NULL);
+ test_layer->Update(&queue, &occlusion_tracker);
EXPECT_EQ(queue.FullUploadSize(), 1);
EXPECT_EQ(queue.PartialUploadSize(), 0);
@@ -129,7 +129,7 @@ TEST_F(NinePatchLayerTest, TriggerFullUploadOnceWhenChangingBitmap) {
EXPECT_EQ(NULL, params.texture->resource_manager());
test_layer->SetTexturePriorities(calculator);
ResourceUpdateQueue queue2;
- test_layer->Update(&queue2, &occlusion_tracker, NULL);
+ test_layer->Update(&queue2, &occlusion_tracker);
EXPECT_EQ(queue2.FullUploadSize(), 1);
EXPECT_EQ(queue2.PartialUploadSize(), 0);
params = queue2.TakeFirstFullUpload();
« no previous file with comments | « cc/layers/nine_patch_layer.cc ('k') | cc/layers/picture_layer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698