cc: Add ‘chromium_code’: 1 to cc.gyp and cc_tests.gyp

And fix compile errors that it causes.

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=191364

Review URL: https://codereview.chromium.org/13206004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191400 0039d316-1c4b-4281-b951-d872f2087c98

12 files changed, 53 insertions, 64 deletions

diff --git a/cc/trees/layer_sorter.cc b/cc/trees/layer_sorter.cc
index 232f29f..51fa4b6 100644
--- a/cc/trees/layer_sorter.cc
+++ b/cc/trees/layer_sorter.cc
@@ -70,7 +70,7 @@ LayerSorter::LayerSorter()
 
 LayerSorter::~LayerSorter() {}
 
-static float const CheckFloatingPointNumericAccuracy(float a, float b) {
+static float CheckFloatingPointNumericAccuracy(float a, float b) {
   float abs_dif = std::abs(b - a);
   float abs_max = std::max(std::abs(b), std::abs(a));
   // Check to see if we've got a result with a reasonable amount of error.
diff --git a/cc/trees/layer_tree_host.cc b/cc/trees/layer_tree_host.cc
index 4e5542d..3dd7b4c 100644
--- a/cc/trees/layer_tree_host.cc
+++ b/cc/trees/layer_tree_host.cc
@@ -86,12 +86,12 @@ LayerTreeHost::LayerTreeHost(LayerTreeHostClient* client,
       num_failed_recreate_attempts_(0),
       settings_(settings),
       debug_state_(settings.initial_debug_state),
+      overdraw_bottom_height_(0.f),
       device_scale_factor_(1.f),
       visible_(true),
       page_scale_factor_(1.f),
       min_page_scale_factor_(1.f),
       max_page_scale_factor_(1.f),
-      overdraw_bottom_height_(0.f),
       trigger_idle_updates_(true),
       background_color_(SK_ColorWHITE),
       has_transparent_background_(false),
diff --git a/cc/trees/layer_tree_host_common.cc b/cc/trees/layer_tree_host_common.cc
index d4ff04e..e5976ce 100644
--- a/cc/trees/layer_tree_host_common.cc
+++ b/cc/trees/layer_tree_host_common.cc
@@ -1332,7 +1332,7 @@ void LayerTreeHostCommon::CalculateDrawProperties(
                                                  update_tile_priorities);
 
   // The dummy layer list should not have been used.
-  DCHECK_EQ(dummy_layer_list.size(), 0);
+  DCHECK_EQ(0u, dummy_layer_list.size());
   // A root layer render_surface should always exist after
   // CalculateDrawProperties.
   DCHECK(root_layer->render_surface());
@@ -1385,7 +1385,7 @@ void LayerTreeHostCommon::CalculateDrawProperties(
       update_tile_priorities);
 
   // The dummy layer list should not have been used.
-  DCHECK_EQ(dummy_layer_list.size(), 0);
+  DCHECK_EQ(0u, dummy_layer_list.size());
   // A root layer render_surface should always exist after
   // CalculateDrawProperties.
   DCHECK(root_layer->render_surface());
diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
index 76095de..3d975ee 100644
--- a/cc/trees/layer_tree_host_impl.cc
+++ b/cc/trees/layer_tree_host_impl.cc
@@ -1108,7 +1108,7 @@ void LayerTreeHostImpl::Readback(void* pixels,
 }
 
 bool LayerTreeHostImpl::haveRootScrollLayer() const {
-  return RootScrollLayer();
+  return !!RootScrollLayer();
 }
 
 LayerImpl* LayerTreeHostImpl::RootLayer() const {
@@ -1395,7 +1395,7 @@ void LayerTreeHostImpl::setNeedsRedraw() {
 
 bool LayerTreeHostImpl::EnsureRenderSurfaceLayerList() {
   active_tree_->UpdateDrawProperties(LayerTreeImpl::UPDATE_ACTIVE_TREE);
-  return active_tree_->RenderSurfaceLayerList().size();
+  return !active_tree_->RenderSurfaceLayerList().empty();
 }
 
 InputHandlerClient::ScrollStatus LayerTreeHostImpl::ScrollBegin(
diff --git a/cc/trees/layer_tree_host_impl_unittest.cc b/cc/trees/layer_tree_host_impl_unittest.cc
index 1e62999..737ef2a 100644
--- a/cc/trees/layer_tree_host_impl_unittest.cc
+++ b/cc/trees/layer_tree_host_impl_unittest.cc
@@ -1579,6 +1579,7 @@ TEST_F(LayerTreeHostImplTest, PageScaleDeltaAppliedToRootScrollLayerOnly) {
   gfx::Size surface_size(10, 10);
   float default_page_scale = 1.f;
   gfx::Transform default_page_scale_matrix;
+  default_page_scale_matrix.Scale(default_page_scale, default_page_scale);
 
   float new_page_scale = 2.f;
   gfx::Transform new_page_scale_matrix;
@@ -2977,18 +2978,6 @@ class TrackingWebGraphicsContext3D : public TestWebGraphicsContext3D {
   unsigned num_textures_;
 };
 
-static unsigned CreateResourceId(ResourceProvider* resource_provider) {
-  return resource_provider->CreateResource(
-      gfx::Size(20, 12),
-      resource_provider->best_texture_format(),
-      ResourceProvider::TextureUsageAny);
-}
-
-static unsigned CreateTextureId(ResourceProvider* resource_provider) {
-  return ResourceProvider::ScopedReadLockGL(
-      resource_provider, CreateResourceId(resource_provider)).texture_id();
-}
-
 TEST_F(LayerTreeHostImplTest, LayersFreeTextures) {
   scoped_ptr<TestWebGraphicsContext3D> context =
       TestWebGraphicsContext3D::Create();
diff --git a/cc/trees/layer_tree_host_unittest.cc b/cc/trees/layer_tree_host_unittest.cc
index 8a403c4..767c00d 100644
--- a/cc/trees/layer_tree_host_unittest.cc
+++ b/cc/trees/layer_tree_host_unittest.cc
@@ -787,9 +787,9 @@ class LayerTreeHostTestAtomicCommit : public LayerTreeHostTest {
     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)));
@@ -800,10 +800,10 @@ class LayerTreeHostTestAtomicCommit : public LayerTreeHostTest {
       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)));
@@ -828,7 +828,7 @@ class LayerTreeHostTestAtomicCommit : public LayerTreeHostTest {
         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();
   }
 
@@ -916,9 +916,9 @@ class LayerTreeHostTestAtomicCommitWithPartialUpdate
     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)));
@@ -931,10 +931,10 @@ class LayerTreeHostTestAtomicCommitWithPartialUpdate
       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)));
@@ -953,10 +953,10 @@ class LayerTreeHostTestAtomicCommitWithPartialUpdate
       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)));
@@ -971,7 +971,7 @@ class LayerTreeHostTestAtomicCommitWithPartialUpdate
         break;
       case 3:
         // No textures should be used for commit.
-        EXPECT_EQ(0, context->NumUsedTextures());
+        EXPECT_EQ(0u, context->NumUsedTextures());
 
         context->ResetUsedTextures();
         PostSetNeedsCommitToMainThread();
@@ -980,7 +980,7 @@ class LayerTreeHostTestAtomicCommitWithPartialUpdate
         // 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();
@@ -1001,9 +1001,9 @@ class LayerTreeHostTestAtomicCommitWithPartialUpdate
     // 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();
   }
@@ -1816,7 +1816,7 @@ class LayerTreeHostTestShutdownWithOnlySomeResourcesEvicted
   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.
@@ -1831,7 +1831,7 @@ class LayerTreeHostTestShutdownWithOnlySomeResourcesEvicted
       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.
@@ -1844,7 +1844,7 @@ class LayerTreeHostTestShutdownWithOnlySomeResourcesEvicted
       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.
@@ -1889,7 +1889,7 @@ class LayerTreeHostTestPinchZoomScrollbarCreation : public LayerTreeHostTest {
 
   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();
@@ -1998,7 +1998,7 @@ class LayerTreeHostTestPinchZoomScrollbarNewRootLayer
     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();
diff --git a/cc/trees/layer_tree_host_unittest_animation.cc b/cc/trees/layer_tree_host_unittest_animation.cc
index ed41746..795ded5 100644
--- a/cc/trees/layer_tree_host_unittest_animation.cc
+++ b/cc/trees/layer_tree_host_unittest_animation.cc
@@ -388,7 +388,7 @@ class LayerTreeHostAnimationTestDoNotSkipLayersWithAnimatedOpacity
   virtual void AfterTest() OVERRIDE {
     // Update() should have been called once, proving that the layer was not
     // skipped.
-    EXPECT_EQ(1, update_check_layer_->update_count());
+    EXPECT_EQ(1u, update_check_layer_->update_count());
 
     // clear update_check_layer_ so LayerTreeHost dies.
     update_check_layer_ = NULL;
diff --git a/cc/trees/layer_tree_host_unittest_context.cc b/cc/trees/layer_tree_host_unittest_context.cc
index b1e3205..6b95121 100644
--- a/cc/trees/layer_tree_host_unittest_context.cc
+++ b/cc/trees/layer_tree_host_unittest_context.cc
@@ -213,8 +213,8 @@ class LayerTreeHostContextTest : public LayerTreeTest {
   int times_to_lose_on_create_;
   int times_to_lose_during_commit_;
   int times_to_lose_during_draw_;
-  int times_to_fail_reinitialize_;
   int times_to_fail_recreate_;
+  int times_to_fail_reinitialize_;
   int times_to_lose_on_recreate_;
   int times_to_fail_create_offscreen_;
   int times_to_fail_recreate_offscreen_;
@@ -247,7 +247,7 @@ class LayerTreeHostContextTestLostContextSucceeds
   }
 
   virtual void AfterTest() OVERRIDE {
-    EXPECT_EQ(10, test_case_);
+    EXPECT_EQ(10u, test_case_);
     EXPECT_EQ(8 + 10 + 10, num_losses_);
   }
 
@@ -1203,14 +1203,14 @@ class ScrollbarLayerLostContext : public LayerTreeHostContextTest {
         // First (regular) update, we should upload 2 resources (thumb, and
         // backtrack).
         EXPECT_EQ(1, scrollbar_layer_->update_count());
-        EXPECT_EQ(2, upload_count);
+        EXPECT_EQ(2u, upload_count);
         LoseContext();
         break;
       case 2:
         // Second update, after the lost context, we should still upload 2
         // resources even if the contents haven't changed.
         EXPECT_EQ(2, scrollbar_layer_->update_count());
-        EXPECT_EQ(2, upload_count);
+        EXPECT_EQ(2u, upload_count);
         EndTest();
         break;
       default:
diff --git a/cc/trees/layer_tree_host_unittest_delegated.cc b/cc/trees/layer_tree_host_unittest_delegated.cc
index c120884..cc81707 100644
--- a/cc/trees/layer_tree_host_unittest_delegated.cc
+++ b/cc/trees/layer_tree_host_unittest_delegated.cc
@@ -410,9 +410,9 @@ class LayerTreeHostDelegatedTestRemapResourcesInQuads
     EXPECT_EQ(1u, map.count(555));
 
     ResourceProvider::ResourceId parent_resource_id1 = map.find(999)->second;
-    EXPECT_NE(parent_resource_id1, 999);
+    EXPECT_NE(parent_resource_id1, 999u);
     ResourceProvider::ResourceId parent_resource_id2 = map.find(555)->second;
-    EXPECT_NE(parent_resource_id2, 555);
+    EXPECT_NE(parent_resource_id2, 555u);
 
     // The resources in the quads should be remapped to the parent's namespace.
     const TextureDrawQuad* quad1 = TextureDrawQuad::MaterialCast(
@@ -468,7 +468,7 @@ class LayerTreeHostDelegatedTestReturnUnusedResources
         // 555 is no longer in use.
         delegated_->TakeUnusedResourcesForChildCompositor(&resources);
         EXPECT_EQ(1u, resources.size());
-        EXPECT_EQ(555, resources[0].id);
+        EXPECT_EQ(555u, resources[0].id);
 
         // Stop using any resources.
         frame = CreateFrameData(gfx::Rect(0, 0, 1, 1), gfx::Rect(0, 0, 1, 1));
@@ -479,11 +479,11 @@ class LayerTreeHostDelegatedTestReturnUnusedResources
         delegated_->TakeUnusedResourcesForChildCompositor(&resources);
         EXPECT_EQ(2u, resources.size());
         if (resources[0].id == 999) {
-          EXPECT_EQ(999, resources[0].id);
-          EXPECT_EQ(444, resources[1].id);
+          EXPECT_EQ(999u, resources[0].id);
+          EXPECT_EQ(444u, resources[1].id);
         } else {
-          EXPECT_EQ(444, resources[0].id);
-          EXPECT_EQ(999, resources[1].id);
+          EXPECT_EQ(444u, resources[0].id);
+          EXPECT_EQ(999u, resources[1].id);
         }
         EndTest();
         break;
@@ -548,7 +548,7 @@ class LayerTreeHostDelegatedTestReusedResources
         // The 999 resource is the only unused one.
         delegated_->TakeUnusedResourcesForChildCompositor(&resources);
         EXPECT_EQ(1u, resources.size());
-        EXPECT_EQ(999, resources[0].id);
+        EXPECT_EQ(999u, resources[0].id);
         EndTest();
         break;
     }
@@ -603,11 +603,11 @@ class LayerTreeHostDelegatedTestFrameBeforeAck
         delegated_->TakeUnusedResourcesForChildCompositor(&resources);
         EXPECT_EQ(2u, resources.size());
         if (resources[0].id == 555) {
-          EXPECT_EQ(555, resources[0].id);
-          EXPECT_EQ(444, resources[1].id);
+          EXPECT_EQ(555u, resources[0].id);
+          EXPECT_EQ(444u, resources[1].id);
         } else {
-          EXPECT_EQ(444, resources[0].id);
-          EXPECT_EQ(555, resources[1].id);
+          EXPECT_EQ(444u, resources[0].id);
+          EXPECT_EQ(555u, resources[1].id);
         }
 
         // The child compositor sends a frame before receiving an for the
@@ -806,7 +806,7 @@ class LayerTreeHostDelegatedTestBadFrame
         // The bad frame's resource is given back to the child compositor.
         delegated_->TakeUnusedResourcesForChildCompositor(&resources);
         EXPECT_EQ(1u, resources.size());
-        EXPECT_EQ(444, resources[0].id);
+        EXPECT_EQ(444u, resources[0].id);
 
         // Now send a good frame with 999 again.
         frame = CreateFrameData(gfx::Rect(0, 0, 1, 1), gfx::Rect(0, 0, 1, 1));
@@ -817,7 +817,7 @@ class LayerTreeHostDelegatedTestBadFrame
         // The unused 555 from the last good frame is now released.
         delegated_->TakeUnusedResourcesForChildCompositor(&resources);
         EXPECT_EQ(1u, resources.size());
-        EXPECT_EQ(555, resources[0].id);
+        EXPECT_EQ(555u, resources[0].id);
 
         EndTest();
         break;
@@ -928,7 +928,7 @@ class LayerTreeHostDelegatedTestUnnamedResource
         // The unused resource should be returned.
         delegated_->TakeUnusedResourcesForChildCompositor(&resources);
         EXPECT_EQ(1u, resources.size());
-        EXPECT_EQ(999, resources[0].id);
+        EXPECT_EQ(999u, resources[0].id);
 
         EndTest();
         break;
@@ -991,7 +991,7 @@ class LayerTreeHostDelegatedTestDontLeakResource
         // The unused resource should be returned.
         delegated_->TakeUnusedResourcesForChildCompositor(&resources);
         EXPECT_EQ(1u, resources.size());
-        EXPECT_EQ(999, resources[0].id);
+        EXPECT_EQ(999u, resources[0].id);
 
         EndTest();
         break;
@@ -1068,7 +1068,7 @@ class LayerTreeHostDelegatedTestResourceSentToParent
         // 999 was returned from the grandparent and could be released.
         delegated_->TakeUnusedResourcesForChildCompositor(&resources);
         EXPECT_EQ(1u, resources.size());
-        EXPECT_EQ(999, resources[0].id);
+        EXPECT_EQ(999u, resources[0].id);
 
         EndTest();
         break;
@@ -1183,7 +1183,7 @@ class LayerTreeHostDelegatedTestCommitWithoutTake
         // 999 and 555 are in use, but 444 should be returned now.
         delegated_->TakeUnusedResourcesForChildCompositor(&resources);
         EXPECT_EQ(1u, resources.size());
-        EXPECT_EQ(444, resources[0].id);
+        EXPECT_EQ(444u, resources[0].id);
 
         EndTest();
         break;
diff --git a/cc/trees/quad_culler.cc b/cc/trees/quad_culler.cc
index b6fa5bc..1609d18 100644
--- a/cc/trees/quad_culler.cc
+++ b/cc/trees/quad_culler.cc
@@ -24,9 +24,9 @@ QuadCuller::QuadCuller(QuadList* quad_list,
                        bool for_surface)
     : quad_list_(quad_list),
       shared_quad_state_list_(shared_quad_state_list),
-      current_shared_quad_state_(NULL),
       layer_(layer),
       occlusion_tracker_(occlusion_tracker),
+      current_shared_quad_state_(NULL),
       show_culling_with_debug_border_quads_(
           show_culling_with_debug_border_quads),
       for_surface_(for_surface) {}
diff --git a/cc/trees/single_thread_proxy.cc b/cc/trees/single_thread_proxy.cc
index e63a8fc..c5f9e94 100644
--- a/cc/trees/single_thread_proxy.cc
+++ b/cc/trees/single_thread_proxy.cc
@@ -82,7 +82,7 @@ void SingleThreadProxy::FinishAllRendering() {
 
 bool SingleThreadProxy::IsStarted() const {
   DCHECK(Proxy::IsMainThread());
-  return layer_tree_host_impl_.get();
+  return layer_tree_host_impl_;
 }
 
 bool SingleThreadProxy::InitializeOutputSurface() {
diff --git a/cc/trees/thread_proxy.cc b/cc/trees/thread_proxy.cc
index 8629701..a09850a 100644
--- a/cc/trees/thread_proxy.cc
+++ b/cc/trees/thread_proxy.cc
@@ -340,7 +340,7 @@ void ThreadProxy::RequestVSyncNotification(VSyncClient* client) {
   TRACE_EVENT1(
       "cc", "ThreadProxy::RequestVSyncNotification", "enable", !!client);
   vsync_client_ = client;
-  layer_tree_host_impl_->EnableVSyncNotification(client);
+  layer_tree_host_impl_->EnableVSyncNotification(!!client);
 }
 
 void ThreadProxy::OnCanDrawStateChanged(bool can_draw) {