Revert 191364 "cc: Add ‘chromium_code’: 1 to cc.gyp and cc_t..."

trunk/src/cc/layers/tiled_layer_unittest.cc

 // Copyright 2011 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/layers/tiled_layer.h"
 
 #include <limits>
 #include <vector>
 
 #include "cc/debug/overdraw_metrics.h"
@@ skipping 560 matching lines @@
   // Create a LayerTreeHost that has the right viewportsize,
   // so the layer is considered small enough.
   bool run_out_of_memory[2] = { false, true };
   for (int i = 0; i < 2; i++) {
     // Create a layer with 5x5 tiles, with 4x4 size viewport.
     int viewport_width = 4 * FakeTiledLayer::tile_size().width();
     int viewport_height = 4 * FakeTiledLayer::tile_size().width();
     int layer_width = 5 * FakeTiledLayer::tile_size().width();
     int layer_height = 5 * FakeTiledLayer::tile_size().height();
     int memory_for_layer = layer_width * layer_height * 4;
-    layer_tree_host_->SetViewportSize(
-        gfx::Size(viewport_width, viewport_height),
-        gfx::Size(viewport_width, viewport_height));
+    layer_tree_host_->SetViewportSize(gfx::Size(layer_width, layer_height),
+                                      gfx::Size(layer_width, layer_height));
 
     // Use 10x5 tiles to run out of memory.
     if (run_out_of_memory[i])
       layer_width *= 2;
 
     resource_manager_->SetMaxMemoryLimitBytes(memory_for_layer);
 
     scoped_refptr<FakeTiledLayer> layer =
         make_scoped_refptr(new FakeTiledLayer(resource_manager_.get()));
     scoped_ptr<FakeTiledLayerImpl> layer_impl =
@@ skipping 358 matching lines @@
 
   layer_tree_host_->SetRootLayer(layer);
   layer_tree_host_->SetViewportSize(gfx::Size(300, 200), gfx::Size(300, 200));
 
   // Full update of all 6 tiles.
   layer_tree_host_->UpdateLayers(queue_.get(),
                                  std::numeric_limits<size_t>::max());
   {
     scoped_ptr<FakeTiledLayerImpl> layer_impl =
         make_scoped_ptr(new FakeTiledLayerImpl(host_impl_->active_tree(), 1));
-    EXPECT_EQ(6u, queue_->FullUploadSize());
-    EXPECT_EQ(0u, queue_->PartialUploadSize());
+    EXPECT_EQ(6, queue_->FullUploadSize());
+    EXPECT_EQ(0, queue_->PartialUploadSize());
     UpdateTextures();
     EXPECT_EQ(6, layer->fake_layer_updater()->update_count());
     EXPECT_FALSE(queue_->HasMoreUpdates());
     layer->fake_layer_updater()->ClearUpdateCount();
     LayerPushPropertiesTo(layer.get(), layer_impl.get());
   }
   layer_tree_host_->CommitComplete();
 
   // Full update of 3 tiles and partial update of 3 tiles.
   layer->InvalidateContentRect(gfx::Rect(0, 0, 300, 150));
   layer_tree_host_->UpdateLayers(queue_.get(),
                                  std::numeric_limits<size_t>::max());
   {
     scoped_ptr<FakeTiledLayerImpl> layer_impl =
         make_scoped_ptr(new FakeTiledLayerImpl(host_impl_->active_tree(), 1));
-    EXPECT_EQ(3u, queue_->FullUploadSize());
-    EXPECT_EQ(3u, queue_->PartialUploadSize());
+    EXPECT_EQ(3, queue_->FullUploadSize());
+    EXPECT_EQ(3, queue_->PartialUploadSize());
     UpdateTextures();
     EXPECT_EQ(6, layer->fake_layer_updater()->update_count());
     EXPECT_FALSE(queue_->HasMoreUpdates());
     layer->fake_layer_updater()->ClearUpdateCount();
     LayerPushPropertiesTo(layer.get(), layer_impl.get());
   }
   layer_tree_host_->CommitComplete();
 
   // Partial update of 6 tiles.
   layer->InvalidateContentRect(gfx::Rect(50, 50, 200, 100));
   {
     scoped_ptr<FakeTiledLayerImpl> layer_impl =
         make_scoped_ptr(new FakeTiledLayerImpl(host_impl_->active_tree(), 1));
     layer_tree_host_->UpdateLayers(queue_.get(),
                                    std::numeric_limits<size_t>::max());
-    EXPECT_EQ(2u, queue_->FullUploadSize());
-    EXPECT_EQ(4u, queue_->PartialUploadSize());
+    EXPECT_EQ(2, queue_->FullUploadSize());
+    EXPECT_EQ(4, queue_->PartialUploadSize());
     UpdateTextures();
     EXPECT_EQ(6, layer->fake_layer_updater()->update_count());
     EXPECT_FALSE(queue_->HasMoreUpdates());
     layer->fake_layer_updater()->ClearUpdateCount();
     LayerPushPropertiesTo(layer.get(), layer_impl.get());
   }
   layer_tree_host_->CommitComplete();
 
   // Checkerboard all tiles.
   layer->InvalidateContentRect(gfx::Rect(0, 0, 300, 200));
   {
     scoped_ptr<FakeTiledLayerImpl> layer_impl =
         make_scoped_ptr(new FakeTiledLayerImpl(host_impl_->active_tree(), 1));
     LayerPushPropertiesTo(layer.get(), layer_impl.get());
   }
   layer_tree_host_->CommitComplete();
 
   // Partial update of 6 checkerboard tiles.
   layer->InvalidateContentRect(gfx::Rect(50, 50, 200, 100));
   {
     scoped_ptr<FakeTiledLayerImpl> layer_impl =
         make_scoped_ptr(new FakeTiledLayerImpl(host_impl_->active_tree(), 1));
     layer_tree_host_->UpdateLayers(queue_.get(),
                                    std::numeric_limits<size_t>::max());
-    EXPECT_EQ(6u, queue_->FullUploadSize());
-    EXPECT_EQ(0u, queue_->PartialUploadSize());
+    EXPECT_EQ(6, queue_->FullUploadSize());
+    EXPECT_EQ(0, queue_->PartialUploadSize());
     UpdateTextures();
     EXPECT_EQ(6, layer->fake_layer_updater()->update_count());
     EXPECT_FALSE(queue_->HasMoreUpdates());
     layer->fake_layer_updater()->ClearUpdateCount();
     LayerPushPropertiesTo(layer.get(), layer_impl.get());
   }
   layer_tree_host_->CommitComplete();
 
   // Partial update of 4 tiles.
   layer->InvalidateContentRect(gfx::Rect(50, 50, 100, 100));
   {
     scoped_ptr<FakeTiledLayerImpl> layer_impl =
         make_scoped_ptr(new FakeTiledLayerImpl(host_impl_->active_tree(), 1));
     layer_tree_host_->UpdateLayers(queue_.get(),
                                    std::numeric_limits<size_t>::max());
-    EXPECT_EQ(0u, queue_->FullUploadSize());
-    EXPECT_EQ(4u, queue_->PartialUploadSize());
+    EXPECT_EQ(0, queue_->FullUploadSize());
+    EXPECT_EQ(4, queue_->PartialUploadSize());
     UpdateTextures();
     EXPECT_EQ(4, layer->fake_layer_updater()->update_count());
     EXPECT_FALSE(queue_->HasMoreUpdates());
     layer->fake_layer_updater()->ClearUpdateCount();
     LayerPushPropertiesTo(layer.get(), layer_impl.get());
   }
   layer_tree_host_->CommitComplete();
 
   ResourceManagerClearAllMemory(layer_tree_host_->contents_texture_manager(),
                                 resource_provider_.get());
@@ skipping 748 matching lines @@
   // Invalidate the entire layer in layer space. When painting, the rect given
   // to webkit should match the layer's bounds.
   layer->SetNeedsDisplayRect(layer_rect);
   layer->Update(queue_.get(), 0, NULL);
 
   EXPECT_RECT_EQ(layer_rect, layer->tracking_layer_painter()->PaintedRect());
 }
 
 }  // namespace
 }  // namespace cc