cc: Fix build issues for adding ‘chromium_code’: 1 to cc.gyp and cc_tests.gyp

cc/trees/layer_tree_host_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/trees/layer_tree_host.h"
 
 #include <algorithm>
 
 #include "base/synchronization/lock.h"
 #include "cc/animation/timing_function.h"
@@ skipping 769 matching lines @@
 
   virtual void CommitCompleteOnThread(LayerTreeHostImpl* impl) OVERRIDE {
     ASSERT_EQ(0u, layer_tree_host()->settings().max_partial_texture_updates);
 
     TestWebGraphicsContext3D* context = static_cast<TestWebGraphicsContext3D*>(
         impl->output_surface()->context3d());
 
     switch (impl->active_tree()->source_frame_number()) {
       case 0:
         // Number of textures should be one for each layer
-        ASSERT_EQ(2, context->NumTextures());
+        ASSERT_EQ(2u, context->NumTextures());
         // Number of textures used for commit should be one for each layer.
-        EXPECT_EQ(2, context->NumUsedTextures());
+        EXPECT_EQ(2u, context->NumUsedTextures());
         // Verify that used texture is correct.
         EXPECT_TRUE(context->UsedTexture(context->TextureAt(0)));
         EXPECT_TRUE(context->UsedTexture(context->TextureAt(1)));
 
         context->ResetUsedTextures();
         PostSetNeedsCommitToMainThread();
         break;
       case 1:
         // Number of textures should be doubled as the first textures
         // are used by impl thread and cannot by used for update.
-        ASSERT_EQ(4, context->NumTextures());
+        ASSERT_EQ(4u, context->NumTextures());
         // Number of textures used for commit should still be
         // one for each layer.
-        EXPECT_EQ(2, context->NumUsedTextures());
+        EXPECT_EQ(2u, context->NumUsedTextures());
         // First textures should not have been used.
         EXPECT_FALSE(context->UsedTexture(context->TextureAt(0)));
         EXPECT_FALSE(context->UsedTexture(context->TextureAt(1)));
         // New textures should have been used.
         EXPECT_TRUE(context->UsedTexture(context->TextureAt(2)));
         EXPECT_TRUE(context->UsedTexture(context->TextureAt(3)));
 
         context->ResetUsedTextures();
         PostSetNeedsCommitToMainThread();
         break;
       case 2:
         EndTest();
         break;
       default:
         NOTREACHED();
         break;
     }
   }
 
   virtual void DrawLayersOnThread(LayerTreeHostImpl* impl) OVERRIDE {
     TestWebGraphicsContext3D* context = static_cast<TestWebGraphicsContext3D*>(
         impl->output_surface()->context3d());
 
     // Number of textures used for draw should always be one for each layer.
-    EXPECT_EQ(2, context->NumUsedTextures());
+    EXPECT_EQ(2u, context->NumUsedTextures());
     context->ResetUsedTextures();
   }
 
   virtual void Layout() OVERRIDE {
     layer_->SetNeedsDisplay();
     scrollbar_->SetNeedsDisplay();
   }
 
   virtual void AfterTest() OVERRIDE {}
 
@@ skipping 67 matching lines @@
 
   virtual void CommitCompleteOnThread(LayerTreeHostImpl* impl) OVERRIDE {
     ASSERT_EQ(1u, layer_tree_host()->settings().max_partial_texture_updates);
 
     TestWebGraphicsContext3D* context = static_cast<TestWebGraphicsContext3D*>(
         impl->output_surface()->context3d());
 
     switch (impl->active_tree()->source_frame_number()) {
       case 0:
         // Number of textures should be one for each layer.
-        ASSERT_EQ(4, context->NumTextures());
+        ASSERT_EQ(4u, context->NumTextures());
         // Number of textures used for commit should be one for each layer.
-        EXPECT_EQ(4, context->NumUsedTextures());
+        EXPECT_EQ(4u, context->NumUsedTextures());
         // Verify that used textures are correct.
         EXPECT_TRUE(context->UsedTexture(context->TextureAt(0)));
         EXPECT_TRUE(context->UsedTexture(context->TextureAt(1)));
         EXPECT_TRUE(context->UsedTexture(context->TextureAt(2)));
         EXPECT_TRUE(context->UsedTexture(context->TextureAt(3)));
 
         context->ResetUsedTextures();
         PostSetNeedsCommitToMainThread();
         break;
       case 1:
         // Number of textures should be two for each content layer and one
         // for each scrollbar, since they always do a partial update.
-        ASSERT_EQ(6, context->NumTextures());
+        ASSERT_EQ(6u, context->NumTextures());
         // Number of textures used for commit should be one for each content
         // layer, and one for the scrollbar layer that paints.
-        EXPECT_EQ(3, context->NumUsedTextures());
+        EXPECT_EQ(3u, context->NumUsedTextures());
 
         // First content textures should not have been used.
         EXPECT_FALSE(context->UsedTexture(context->TextureAt(0)));
         EXPECT_FALSE(context->UsedTexture(context->TextureAt(1)));
         // The non-painting scrollbar's texture wasn't updated.
         EXPECT_FALSE(context->UsedTexture(context->TextureAt(2)));
         // The painting scrollbar's partial update texture was used.
         EXPECT_TRUE(context->UsedTexture(context->TextureAt(3)));
         // New textures should have been used.
         EXPECT_TRUE(context->UsedTexture(context->TextureAt(4)));
         EXPECT_TRUE(context->UsedTexture(context->TextureAt(5)));
 
         context->ResetUsedTextures();
         PostSetNeedsCommitToMainThread();
         break;
       case 2:
         // Number of textures should be two for each content layer and one
         // for each scrollbar, since they always do a partial update.
-        ASSERT_EQ(6, context->NumTextures());
+        ASSERT_EQ(6u, context->NumTextures());
         // Number of textures used for commit should be one for each content
         // layer, and one for the scrollbar layer that paints.
-        EXPECT_EQ(3, context->NumUsedTextures());
+        EXPECT_EQ(3u, context->NumUsedTextures());
 
         // The non-painting scrollbar's texture wasn't updated.
         EXPECT_FALSE(context->UsedTexture(context->TextureAt(2)));
         // The painting scrollbar does a partial update.
         EXPECT_TRUE(context->UsedTexture(context->TextureAt(3)));
         // One content layer does a partial update also.
         EXPECT_TRUE(context->UsedTexture(context->TextureAt(4)));
         EXPECT_FALSE(context->UsedTexture(context->TextureAt(5)));
 
         context->ResetUsedTextures();
         PostSetNeedsCommitToMainThread();
         break;
       case 3:
         // No textures should be used for commit.
-        EXPECT_EQ(0, context->NumUsedTextures());
+        EXPECT_EQ(0u, context->NumUsedTextures());
 
         context->ResetUsedTextures();
         PostSetNeedsCommitToMainThread();
         break;
       case 4:
         // Number of textures used for commit should be two. One for the
         // content layer, and one for the painting scrollbar. The
         // non-painting scrollbar doesn't update its texture.
-        EXPECT_EQ(2, context->NumUsedTextures());
+        EXPECT_EQ(2u, context->NumUsedTextures());
 
         context->ResetUsedTextures();
         PostSetNeedsCommitToMainThread();
         break;
       case 5:
         EndTest();
         break;
       default:
         NOTREACHED();
         break;
     }
   }
 
   virtual void DrawLayersOnThread(LayerTreeHostImpl* impl) OVERRIDE {
     TestWebGraphicsContext3D* context = static_cast<TestWebGraphicsContext3D*>(
         impl->output_surface()->context3d());
 
     // Number of textures used for drawing should one per layer except for
     // frame 3 where the viewport only contains one layer.
     if (impl->active_tree()->source_frame_number() == 3)
-      EXPECT_EQ(1, context->NumUsedTextures());
+      EXPECT_EQ(1u, context->NumUsedTextures());
     else
-      EXPECT_EQ(4, context->NumUsedTextures());
+      EXPECT_EQ(4u, context->NumUsedTextures());
 
     context->ResetUsedTextures();
   }
 
   virtual void Layout() OVERRIDE {
     switch (num_commits_++) {
       case 0:
       case 1:
         parent_->SetNeedsDisplay();
         child_->SetNeedsDisplay();
@@ skipping 792 matching lines @@
     child_layer2_->SetBounds(gfx::Size(100, 100));
     root_layer_->AddChild(child_layer1_);
     root_layer_->AddChild(child_layer2_);
     layer_tree_host()->SetRootLayer(root_layer_);
     PostSetNeedsCommitToMainThread();
   }
 
   virtual void DidSetVisibleOnImplTree(LayerTreeHostImpl* host_impl,
                                        bool visible) OVERRIDE {
     // One backing should remain unevicted.
-    EXPECT_EQ(100 * 100 * 4 * 1,
+    EXPECT_EQ(100u * 100u * 4u * 1u,
               layer_tree_host()->contents_texture_manager()->MemoryUseBytes());
     // Make sure that contents textures are marked as having been
     // purged.
     EXPECT_TRUE(host_impl->active_tree()->ContentsTexturesPurged());
     // End the test in this state.
     EndTest();
   }
 
   virtual void CommitCompleteOnThread(LayerTreeHostImpl* host_impl) OVERRIDE {
     ++num_commits_;
     switch (num_commits_) {
       case 1:
         // All three backings should have memory.
         EXPECT_EQ(
-            100 * 100 * 4 * 3,
+            100u * 100u * 4u * 3u,
             layer_tree_host()->contents_texture_manager()->MemoryUseBytes());
         // Set a new policy that will kick out 1 of the 3 resources.
         // Because a resource was evicted, a commit will be kicked off.
         host_impl->SetManagedMemoryPolicy(
             ManagedMemoryPolicy(100 * 100 * 4 * 2,
                                 ManagedMemoryPolicy::CUTOFF_ALLOW_EVERYTHING,
                                 100 * 100 * 4 * 1,
                                 ManagedMemoryPolicy::CUTOFF_ALLOW_EVERYTHING));
         break;
       case 2:
         // Only two backings should have memory.
         EXPECT_EQ(
-            100 * 100 * 4 * 2,
+            100u * 100u * 4u * 2u,
             layer_tree_host()->contents_texture_manager()->MemoryUseBytes());
         // Become backgrounded, which will cause 1 more resource to be
         // evicted.
         PostSetVisibleToMainThread(false);
         break;
       default:
         // No further commits should happen because this is not visible
         // anymore.
         NOTREACHED();
         break;
@@ skipping 24 matching lines @@
 
   virtual void BeginTest() OVERRIDE {
     root_layer_->SetIsDrawable(true);
     root_layer_->SetBounds(gfx::Size(100, 100));
     layer_tree_host()->SetRootLayer(root_layer_);
     PostSetNeedsCommitToMainThread();
   }
 
   virtual void DidCommit() OVERRIDE {
     // We always expect two pinch-zoom scrollbar layers.
-    ASSERT_EQ(2, root_layer_->children().size());
+    ASSERT_EQ(2u, root_layer_->children().size());
 
     // Pinch-zoom scrollbar layers always have invalid scrollLayerIds.
     ScrollbarLayer* layer1 = root_layer_->children()[0]->ToScrollbarLayer();
     ASSERT_TRUE(layer1);
     EXPECT_EQ(Layer::PINCH_ZOOM_ROOT_SCROLL_LAYER_ID,
               layer1->scroll_layer_id());
     EXPECT_EQ(0.f, layer1->opacity());
     EXPECT_TRUE(layer1->OpacityCanAnimateOnImplThread());
     EXPECT_TRUE(layer1->DrawsContent());
 
@@ skipping 88 matching lines @@
     root_layer_->SetIsDrawable(true);
     root_layer_->SetBounds(gfx::Size(100, 100));
     layer_tree_host()->SetRootLayer(root_layer_);
     PostSetNeedsCommitToMainThread();
   }
 
   virtual void DidCommit() OVERRIDE {
     num_commits_++;
 
     // We always expect two pinch-zoom scrollbar layers.
-    ASSERT_EQ(2, root_layer_->children().size());
+    ASSERT_EQ(2u, root_layer_->children().size());
 
     // Pinch-zoom scrollbar layers always have invalid scrollLayerIds.
     ScrollbarLayer* layer1 = root_layer_->children()[0]->ToScrollbarLayer();
     ASSERT_TRUE(layer1);
     EXPECT_EQ(Layer::PINCH_ZOOM_ROOT_SCROLL_LAYER_ID,
               layer1->scroll_layer_id());
     EXPECT_EQ(0.f, layer1->opacity());
     EXPECT_TRUE(layer1->DrawsContent());
 
     ScrollbarLayer* layer2 = root_layer_->children()[1]->ToScrollbarLayer();
@@ skipping 160 matching lines @@
   }
 
  private:
   base::TimeTicks frame_time_;
 };
 
 MULTI_THREAD_TEST_F(LayerTreeHostTestVSyncNotification);
 
 }  // namespace
 }  // namespace cc