cc: Rework tiling set eviction iterator.

cc/resources/picture_layer_tiling_set_unittest.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/resources/picture_layer_tiling_set.h"
 
 #include <map>
 #include <vector>
 
 #include "cc/resources/resource_provider.h"
@@ skipping 68 matching lines @@
   set->AddTiling(2.0, pile);
   high_res_tiling = set->AddTiling(1.0, pile);
   high_res_tiling->set_resolution(HIGH_RESOLUTION);
   set->AddTiling(0.5, pile);
   low_res_tiling = set->AddTiling(0.25, pile);
   low_res_tiling->set_resolution(LOW_RESOLUTION);
   set->AddTiling(0.125, pile);
 
   higher_than_high_res_range =
       set->GetTilingRange(PictureLayerTilingSet::HIGHER_THAN_HIGH_RES);
-  EXPECT_EQ(0u, higher_than_high_res_range.start);
-  EXPECT_EQ(1u, higher_than_high_res_range.end);
+  EXPECT_EQ(0, higher_than_high_res_range.start);
+  EXPECT_EQ(1, higher_than_high_res_range.end);
 
   high_res_range = set->GetTilingRange(PictureLayerTilingSet::HIGH_RES);
-  EXPECT_EQ(1u, high_res_range.start);
-  EXPECT_EQ(2u, high_res_range.end);
+  EXPECT_EQ(1, high_res_range.start);
+  EXPECT_EQ(2, high_res_range.end);
 
   between_high_and_low_res_range =
       set->GetTilingRange(PictureLayerTilingSet::BETWEEN_HIGH_AND_LOW_RES);
-  EXPECT_EQ(2u, between_high_and_low_res_range.start);
-  EXPECT_EQ(3u, between_high_and_low_res_range.end);
+  EXPECT_EQ(2, between_high_and_low_res_range.start);
+  EXPECT_EQ(3, between_high_and_low_res_range.end);
 
   low_res_range = set->GetTilingRange(PictureLayerTilingSet::LOW_RES);
-  EXPECT_EQ(3u, low_res_range.start);
-  EXPECT_EQ(4u, low_res_range.end);
+  EXPECT_EQ(3, low_res_range.start);
+  EXPECT_EQ(4, low_res_range.end);
 
   lower_than_low_res_range =
       set->GetTilingRange(PictureLayerTilingSet::LOWER_THAN_LOW_RES);
-  EXPECT_EQ(4u, lower_than_low_res_range.start);
-  EXPECT_EQ(5u, lower_than_low_res_range.end);
+  EXPECT_EQ(4, lower_than_low_res_range.start);
+  EXPECT_EQ(5, lower_than_low_res_range.end);
 
   scoped_ptr<PictureLayerTilingSet> set_without_low_res =
       CreateTilingSet(&client);
   set_without_low_res->AddTiling(2.0, pile);
   high_res_tiling = set_without_low_res->AddTiling(1.0, pile);
   high_res_tiling->set_resolution(HIGH_RESOLUTION);
   set_without_low_res->AddTiling(0.5, pile);
   set_without_low_res->AddTiling(0.25, pile);
 
   higher_than_high_res_range = set_without_low_res->GetTilingRange(
       PictureLayerTilingSet::HIGHER_THAN_HIGH_RES);
-  EXPECT_EQ(0u, higher_than_high_res_range.start);
-  EXPECT_EQ(1u, higher_than_high_res_range.end);
+  EXPECT_EQ(0, higher_than_high_res_range.start);
+  EXPECT_EQ(1, higher_than_high_res_range.end);
 
   high_res_range =
       set_without_low_res->GetTilingRange(PictureLayerTilingSet::HIGH_RES);
-  EXPECT_EQ(1u, high_res_range.start);
-  EXPECT_EQ(2u, high_res_range.end);
+  EXPECT_EQ(1, high_res_range.start);
+  EXPECT_EQ(2, high_res_range.end);
 
   between_high_and_low_res_range = set_without_low_res->GetTilingRange(
       PictureLayerTilingSet::BETWEEN_HIGH_AND_LOW_RES);
-  EXPECT_EQ(2u, between_high_and_low_res_range.start);
-  EXPECT_EQ(4u, between_high_and_low_res_range.end);
+  EXPECT_EQ(2, between_high_and_low_res_range.start);
+  EXPECT_EQ(4, between_high_and_low_res_range.end);
 
   low_res_range =
       set_without_low_res->GetTilingRange(PictureLayerTilingSet::LOW_RES);
-  EXPECT_EQ(0u, low_res_range.end - low_res_range.start);
+  EXPECT_EQ(0, low_res_range.end - low_res_range.start);
 
   lower_than_low_res_range = set_without_low_res->GetTilingRange(
       PictureLayerTilingSet::LOWER_THAN_LOW_RES);
-  EXPECT_EQ(0u, lower_than_low_res_range.end - lower_than_low_res_range.start);
+  EXPECT_EQ(0, lower_than_low_res_range.end - lower_than_low_res_range.start);
 
   scoped_ptr<PictureLayerTilingSet> set_with_only_high_and_low_res =
       CreateTilingSet(&client);
   high_res_tiling = set_with_only_high_and_low_res->AddTiling(1.0, pile);
   high_res_tiling->set_resolution(HIGH_RESOLUTION);
   low_res_tiling = set_with_only_high_and_low_res->AddTiling(0.5, pile);
   low_res_tiling->set_resolution(LOW_RESOLUTION);
 
   higher_than_high_res_range = set_with_only_high_and_low_res->GetTilingRange(
       PictureLayerTilingSet::HIGHER_THAN_HIGH_RES);
-  EXPECT_EQ(0u,
+  EXPECT_EQ(0,
             higher_than_high_res_range.end - higher_than_high_res_range.start);
 
   high_res_range = set_with_only_high_and_low_res->GetTilingRange(
       PictureLayerTilingSet::HIGH_RES);
-  EXPECT_EQ(0u, high_res_range.start);
-  EXPECT_EQ(1u, high_res_range.end);
+  EXPECT_EQ(0, high_res_range.start);
+  EXPECT_EQ(1, high_res_range.end);
 
   between_high_and_low_res_range =
       set_with_only_high_and_low_res->GetTilingRange(
           PictureLayerTilingSet::BETWEEN_HIGH_AND_LOW_RES);
-  EXPECT_EQ(0u, between_high_and_low_res_range.end -
-                    between_high_and_low_res_range.start);
+  EXPECT_EQ(0, between_high_and_low_res_range.end -
+                   between_high_and_low_res_range.start);
 
   low_res_range = set_with_only_high_and_low_res->GetTilingRange(
       PictureLayerTilingSet::LOW_RES);
-  EXPECT_EQ(1u, low_res_range.start);
-  EXPECT_EQ(2u, low_res_range.end);
+  EXPECT_EQ(1, low_res_range.start);
+  EXPECT_EQ(2, low_res_range.end);
 
   lower_than_low_res_range = set_with_only_high_and_low_res->GetTilingRange(
       PictureLayerTilingSet::LOWER_THAN_LOW_RES);
-  EXPECT_EQ(0u, lower_than_low_res_range.end - lower_than_low_res_range.start);
+  EXPECT_EQ(0, lower_than_low_res_range.end - lower_than_low_res_range.start);
 
   scoped_ptr<PictureLayerTilingSet> set_with_only_high_res =
       CreateTilingSet(&client);
   high_res_tiling = set_with_only_high_res->AddTiling(1.0, pile);
   high_res_tiling->set_resolution(HIGH_RESOLUTION);
 
   higher_than_high_res_range = set_with_only_high_res->GetTilingRange(
       PictureLayerTilingSet::HIGHER_THAN_HIGH_RES);
-  EXPECT_EQ(0u,
+  EXPECT_EQ(0,
             higher_than_high_res_range.end - higher_than_high_res_range.start);
 
   high_res_range =
       set_with_only_high_res->GetTilingRange(PictureLayerTilingSet::HIGH_RES);
-  EXPECT_EQ(0u, high_res_range.start);
-  EXPECT_EQ(1u, high_res_range.end);
+  EXPECT_EQ(0, high_res_range.start);
+  EXPECT_EQ(1, high_res_range.end);
 
   between_high_and_low_res_range = set_with_only_high_res->GetTilingRange(
       PictureLayerTilingSet::BETWEEN_HIGH_AND_LOW_RES);
-  EXPECT_EQ(0u, between_high_and_low_res_range.end -
-                    between_high_and_low_res_range.start);
+  EXPECT_EQ(0, between_high_and_low_res_range.end -
+                   between_high_and_low_res_range.start);
 
   low_res_range =
       set_with_only_high_res->GetTilingRange(PictureLayerTilingSet::LOW_RES);
-  EXPECT_EQ(0u, low_res_range.end - low_res_range.start);
+  EXPECT_EQ(0, low_res_range.end - low_res_range.start);
 
   lower_than_low_res_range = set_with_only_high_res->GetTilingRange(
       PictureLayerTilingSet::LOWER_THAN_LOW_RES);
-  EXPECT_EQ(0u, lower_than_low_res_range.end - lower_than_low_res_range.start);
+  EXPECT_EQ(0, lower_than_low_res_range.end - lower_than_low_res_range.start);
 }
 
 class PictureLayerTilingSetTestWithResources : public testing::Test {
  public:
   void runTest(
       int num_tilings,
       float min_scale,
       float scale_increment,
       float ideal_contents_scale,
       float expected_scale) {
@@ skipping 236 matching lines @@
 
   // Clone from the pending to the active tree with the same max content size.
   active_set->UpdateTilingsToCurrentRasterSource(
       pile.get(), pending_set.get(), Region(), 1.f, max_content_scale);
   // All the tilings are on the active tree.
   EXPECT_EQ(2u, active_set->num_tilings());
 }
 
 }  // namespace
 }  // namespace cc