Revert of cc: Fix size_t to int truncations in layers/ output/ playback/ quads/

cc/layers/delegated_renderer_layer_impl_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/layers/delegated_renderer_layer_impl.h"
 
 #include "cc/base/scoped_ptr_vector.h"
 #include "cc/layers/solid_color_layer_impl.h"
 #include "cc/quads/render_pass_draw_quad.h"
 #include "cc/quads/solid_color_draw_quad.h"
@@ skipping 289 matching lines @@
   LayerTreeHostImpl::FrameData frame;
   EXPECT_EQ(DRAW_SUCCESS, host_impl_->PrepareToDraw(&frame));
 
   // Each non-DelegatedRendererLayer added one RenderPass. The
   // DelegatedRendererLayer added two contributing passes.
   ASSERT_EQ(5u, frame.render_passes.size());
 
   // The DelegatedRendererLayer should have added its contributing RenderPasses
   // to the frame.
   EXPECT_EQ(4, frame.render_passes[1]->id.layer_id);
-  EXPECT_EQ(1u, frame.render_passes[1]->id.index);
+  EXPECT_EQ(1, frame.render_passes[1]->id.index);
   EXPECT_EQ(4, frame.render_passes[2]->id.layer_id);
-  EXPECT_EQ(2u, frame.render_passes[2]->id.index);
+  EXPECT_EQ(2, frame.render_passes[2]->id.index);
   // And all other RenderPasses should be non-delegated.
   EXPECT_NE(4, frame.render_passes[0]->id.layer_id);
-  EXPECT_EQ(0u, frame.render_passes[0]->id.index);
+  EXPECT_EQ(0, frame.render_passes[0]->id.index);
   EXPECT_NE(4, frame.render_passes[3]->id.layer_id);
-  EXPECT_EQ(0u, frame.render_passes[3]->id.index);
+  EXPECT_EQ(0, frame.render_passes[3]->id.index);
   EXPECT_NE(4, frame.render_passes[4]->id.layer_id);
-  EXPECT_EQ(0u, frame.render_passes[4]->id.index);
+  EXPECT_EQ(0, frame.render_passes[4]->id.index);
 
   // The DelegatedRendererLayer should have added its RenderPasses to the frame
   // in order.
   EXPECT_EQ(gfx::Rect(6, 6, 6, 6).ToString(),
             frame.render_passes[1]->output_rect.ToString());
   EXPECT_EQ(gfx::Rect(7, 7, 7, 7).ToString(),
             frame.render_passes[2]->output_rect.ToString());
 
   host_impl_->DrawLayers(&frame);
   host_impl_->DidDrawAllLayers(frame);
 }
 
 TEST_F(DelegatedRendererLayerImplTestSimple,
        AddsQuadsToContributingRenderPasses) {
   LayerTreeHostImpl::FrameData frame;
   EXPECT_EQ(DRAW_SUCCESS, host_impl_->PrepareToDraw(&frame));
 
   // Each non-DelegatedRendererLayer added one RenderPass. The
   // DelegatedRendererLayer added two contributing passes.
   ASSERT_EQ(5u, frame.render_passes.size());
 
   // The DelegatedRendererLayer should have added its contributing RenderPasses
   // to the frame.
   EXPECT_EQ(4, frame.render_passes[1]->id.layer_id);
-  EXPECT_EQ(1u, frame.render_passes[1]->id.index);
+  EXPECT_EQ(1, frame.render_passes[1]->id.index);
   EXPECT_EQ(4, frame.render_passes[2]->id.layer_id);
-  EXPECT_EQ(2u, frame.render_passes[2]->id.index);
+  EXPECT_EQ(2, frame.render_passes[2]->id.index);
 
   // The DelegatedRendererLayer should have added copies of its quads to
   // contributing RenderPasses.
   ASSERT_EQ(1u, frame.render_passes[1]->quad_list.size());
   EXPECT_EQ(gfx::Rect(0, 0, 6, 6).ToString(),
             frame.render_passes[1]->quad_list.front()->rect.ToString());
 
   // Verify it added the right quads.
   ASSERT_EQ(2u, frame.render_passes[2]->quad_list.size());
   EXPECT_EQ(gfx::Rect(0, 0, 7, 7).ToString(),
@@ skipping 121 matching lines @@
   EXPECT_EQ(DRAW_SUCCESS, host_impl_->PrepareToDraw(&frame));
 
   // Each non-DelegatedRendererLayer added one RenderPass. The
   // DelegatedRendererLayer added two contributing passes and its owned surface
   // added one pass.
   ASSERT_EQ(6u, frame.render_passes.size());
 
   // The DelegatedRendererLayer should have added its contributing RenderPasses
   // to the frame.
   EXPECT_EQ(4, frame.render_passes[1]->id.layer_id);
-  EXPECT_EQ(1u, frame.render_passes[1]->id.index);
+  EXPECT_EQ(1, frame.render_passes[1]->id.index);
   EXPECT_EQ(4, frame.render_passes[2]->id.layer_id);
-  EXPECT_EQ(2u, frame.render_passes[2]->id.index);
+  EXPECT_EQ(2, frame.render_passes[2]->id.index);
   // The DelegatedRendererLayer should have added a RenderPass for its surface
   // to the frame.
   EXPECT_EQ(4, frame.render_passes[1]->id.layer_id);
-  EXPECT_EQ(0u, frame.render_passes[3]->id.index);
+  EXPECT_EQ(0, frame.render_passes[3]->id.index);
   // And all other RenderPasses should be non-delegated.
   EXPECT_NE(4, frame.render_passes[0]->id.layer_id);
-  EXPECT_EQ(0u, frame.render_passes[0]->id.index);
+  EXPECT_EQ(0, frame.render_passes[0]->id.index);
   EXPECT_NE(4, frame.render_passes[4]->id.layer_id);
-  EXPECT_EQ(0u, frame.render_passes[4]->id.index);
+  EXPECT_EQ(0, frame.render_passes[4]->id.index);
   EXPECT_NE(4, frame.render_passes[5]->id.layer_id);
-  EXPECT_EQ(0u, frame.render_passes[5]->id.index);
+  EXPECT_EQ(0, frame.render_passes[5]->id.index);
 
   // The DelegatedRendererLayer should have added its RenderPasses to the frame
   // in order.
   EXPECT_EQ(gfx::Rect(6, 6, 6, 6).ToString(),
             frame.render_passes[1]->output_rect.ToString());
   EXPECT_EQ(gfx::Rect(7, 7, 7, 7).ToString(),
             frame.render_passes[2]->output_rect.ToString());
 
   host_impl_->DrawLayers(&frame);
   host_impl_->DidDrawAllLayers(frame);
 }
 
 TEST_F(DelegatedRendererLayerImplTestOwnSurface,
        AddsQuadsToContributingRenderPasses) {
   LayerTreeHostImpl::FrameData frame;
   EXPECT_EQ(DRAW_SUCCESS, host_impl_->PrepareToDraw(&frame));
 
   // Each non-DelegatedRendererLayer added one RenderPass. The
   // DelegatedRendererLayer added two contributing passes and its owned surface
   // added one pass.
   ASSERT_EQ(6u, frame.render_passes.size());
 
   // The DelegatedRendererLayer should have added its contributing RenderPasses
   // to the frame.
   EXPECT_EQ(4, frame.render_passes[1]->id.layer_id);
-  EXPECT_EQ(1u, frame.render_passes[1]->id.index);
+  EXPECT_EQ(1, frame.render_passes[1]->id.index);
   EXPECT_EQ(4, frame.render_passes[2]->id.layer_id);
-  EXPECT_EQ(2u, frame.render_passes[2]->id.index);
+  EXPECT_EQ(2, frame.render_passes[2]->id.index);
 
   // The DelegatedRendererLayer should have added copies of its quads to
   // contributing RenderPasses.
   ASSERT_EQ(1u, frame.render_passes[1]->quad_list.size());
   EXPECT_EQ(gfx::Rect(0, 0, 6, 6).ToString(),
             frame.render_passes[1]->quad_list.front()->rect.ToString());
 
   // Verify it added the right quads.
   ASSERT_EQ(2u, frame.render_passes[2]->quad_list.size());
 
@@ skipping 217 matching lines @@
   }
 
   void VerifyRenderPasses(
       const LayerTreeHostImpl::FrameData& frame,
       size_t num_render_passes,
       const SharedQuadState** root_delegated_shared_quad_state,
       const SharedQuadState** contrib_delegated_shared_quad_state) {
     ASSERT_EQ(num_render_passes, frame.render_passes.size());
     // The contributing render pass in the DelegatedRendererLayer.
     EXPECT_EQ(2, frame.render_passes[0]->id.layer_id);
-    EXPECT_EQ(1u, frame.render_passes[0]->id.index);
+    EXPECT_EQ(1, frame.render_passes[0]->id.index);
     // The root render pass.
     EXPECT_EQ(1, frame.render_passes.back()->id.layer_id);
-    EXPECT_EQ(0u, frame.render_passes.back()->id.index);
+    EXPECT_EQ(0, frame.render_passes.back()->id.index);
 
     const QuadList& contrib_delegated_quad_list =
         frame.render_passes[0]->quad_list;
     ASSERT_EQ(2u, contrib_delegated_quad_list.size());
 
     const QuadList& root_delegated_quad_list =
         frame.render_passes[1]->quad_list;
     ASSERT_EQ(5u, root_delegated_quad_list.size());
 
     // All quads in a render pass should share the same state.
@@ skipping 921 matching lines @@
   scoped_ptr<DelegatedRendererLayerImpl> other_layer =
       DelegatedRendererLayerImpl::Create(host_impl_->active_tree(), 6);
 
   delegated_renderer_layer_impl->PushPropertiesTo(other_layer.get());
 
   EXPECT_EQ(0.5f, other_layer->inverse_device_scale_factor());
 }
 
 }  // namespace
 }  // namespace cc