Index: cc/resources/picture_layer_tiling_perftest.cc |
diff --git a/cc/resources/picture_layer_tiling_perftest.cc b/cc/resources/picture_layer_tiling_perftest.cc |
index 69bb01e9adbbbeebda5dc4285dc575fe8c259168..628e0c29ddd9dcd294bbf763e64598ab564254d6 100644 |
--- a/cc/resources/picture_layer_tiling_perftest.cc |
+++ b/cc/resources/picture_layer_tiling_perftest.cc |
@@ -73,13 +73,12 @@ class PictureLayerTilingPerfTest : public testing::Test { |
timer_.Reset(); |
do { |
- picture_layer_tiling_->UpdateTilePriorities(PENDING_TREE, |
- viewport_rect, |
- 1.f, |
- timer_.NumLaps() + 1, |
- NULL, |
- NULL, |
- gfx::Transform()); |
+ picture_layer_tiling_->UpdateTilePriorities( |
+ PENDING_TREE, |
+ viewport_rect, |
+ 1.f, |
+ timer_.NumLaps() + 1, |
+ OcclusionChecker<LayerImpl>()); |
timer_.NextLap(); |
} while (!timer_.HasTimeLimitExpired()); |
@@ -103,13 +102,12 @@ class PictureLayerTilingPerfTest : public testing::Test { |
timer_.Reset(); |
do { |
- picture_layer_tiling_->UpdateTilePriorities(PENDING_TREE, |
- viewport_rect, |
- 1.f, |
- timer_.NumLaps() + 1, |
- NULL, |
- NULL, |
- gfx::Transform()); |
+ picture_layer_tiling_->UpdateTilePriorities( |
+ PENDING_TREE, |
+ viewport_rect, |
+ 1.f, |
+ timer_.NumLaps() + 1, |
+ OcclusionChecker<LayerImpl>()); |
viewport_rect = gfx::Rect(viewport_rect.x() + xoffsets[offsetIndex], |
viewport_rect.y() + yoffsets[offsetIndex], |
@@ -138,7 +136,7 @@ class PictureLayerTilingPerfTest : public testing::Test { |
PictureLayerTiling::Create(1, bounds, &picture_layer_tiling_client_); |
picture_layer_tiling_client_.set_tree(ACTIVE_TREE); |
picture_layer_tiling_->UpdateTilePriorities( |
- ACTIVE_TREE, viewport, 1.0f, 1.0, NULL, NULL, gfx::Transform()); |
+ ACTIVE_TREE, viewport, 1.0f, 1.0, OcclusionChecker<LayerImpl>()); |
timer_.Reset(); |
do { |
@@ -163,7 +161,7 @@ class PictureLayerTilingPerfTest : public testing::Test { |
PictureLayerTiling::Create(1, bounds, &picture_layer_tiling_client_); |
picture_layer_tiling_client_.set_tree(ACTIVE_TREE); |
picture_layer_tiling_->UpdateTilePriorities( |
- ACTIVE_TREE, viewport, 1.0f, 1.0, NULL, NULL, gfx::Transform()); |
+ ACTIVE_TREE, viewport, 1.0f, 1.0, OcclusionChecker<LayerImpl>()); |
timer_.Reset(); |
do { |
@@ -193,7 +191,7 @@ class PictureLayerTilingPerfTest : public testing::Test { |
PictureLayerTiling::Create(1, bounds, &picture_layer_tiling_client_); |
picture_layer_tiling_client_.set_tree(ACTIVE_TREE); |
picture_layer_tiling_->UpdateTilePriorities( |
- ACTIVE_TREE, viewport, 1.0f, 1.0, NULL, NULL, gfx::Transform()); |
+ ACTIVE_TREE, viewport, 1.0f, 1.0, OcclusionChecker<LayerImpl>()); |
timer_.Reset(); |
TreePriority priorities[] = {SAME_PRIORITY_FOR_BOTH_TREES, |
@@ -225,7 +223,7 @@ class PictureLayerTilingPerfTest : public testing::Test { |
PictureLayerTiling::Create(1, bounds, &picture_layer_tiling_client_); |
picture_layer_tiling_client_.set_tree(ACTIVE_TREE); |
picture_layer_tiling_->UpdateTilePriorities( |
- ACTIVE_TREE, viewport, 1.0f, 1.0, NULL, NULL, gfx::Transform()); |
+ ACTIVE_TREE, viewport, 1.0f, 1.0, OcclusionChecker<LayerImpl>()); |
TreePriority priorities[] = {SAME_PRIORITY_FOR_BOTH_TREES, |
SMOOTHNESS_TAKES_PRIORITY, |