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

cc/layers/delegated_renderer_layer_impl.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 <algorithm>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 162 matching lines @@
 }
 
 void DelegatedRendererLayerImpl::SetRenderPasses(
     RenderPassList* render_passes_in_draw_order) {
   ClearRenderPasses();
 
   for (size_t i = 0; i < render_passes_in_draw_order->size(); ++i) {
     RenderPassList::iterator to_take =
         render_passes_in_draw_order->begin() + i;
     render_passes_index_by_id_.insert(
-        std::pair<RenderPassId, int>((*to_take)->id, i));
+        RenderPassToIndexMap::value_type((*to_take)->id, i));
     scoped_ptr<RenderPass> taken_render_pass =
         render_passes_in_draw_order->take(to_take);
     render_passes_in_draw_order_.push_back(taken_render_pass.Pass());
   }
 
   // Give back an empty array instead of nulls.
   render_passes_in_draw_order->clear();
 
   // The render passes given here become part of the RenderSurfaceLayerList, so
   // changing them requires recomputing the RenderSurfaceLayerList.
   layer_tree_impl()->set_needs_update_draw_properties();
 }
 
 void DelegatedRendererLayerImpl::ClearRenderPasses() {
   render_passes_index_by_id_.clear();
   render_passes_in_draw_order_.clear();
 }
 
 scoped_ptr<LayerImpl> DelegatedRendererLayerImpl::CreateLayerImpl(
     LayerTreeImpl* tree_impl) {
   return DelegatedRendererLayerImpl::Create(tree_impl, id());
 }
 
 void DelegatedRendererLayerImpl::ReleaseResources() {
   ClearRenderPasses();
   ClearChildId();
   have_render_passes_to_push_ = false;
 }
 
-static inline int IndexToId(int index) { return index + 1; }
-static inline int IdToIndex(int id) { return id - 1; }
+static inline size_t IndexToId(size_t index) {
+  return index + 1;
+}
+static inline size_t IdToIndex(size_t id) {
+  DCHECK_GT(id, 0u);
+  return id - 1;
+}
 
 RenderPassId DelegatedRendererLayerImpl::FirstContributingRenderPassId() const {
   return RenderPassId(id(), IndexToId(0));
 }
 
 RenderPassId DelegatedRendererLayerImpl::NextContributingRenderPassId(
     RenderPassId previous) const {
   return RenderPassId(previous.layer_id, previous.index + 1);
 }
 
 bool DelegatedRendererLayerImpl::ConvertDelegatedRenderPassId(
     RenderPassId delegated_render_pass_id,
     RenderPassId* output_render_pass_id) const {
-  base::hash_map<RenderPassId, int>::const_iterator found =
+  RenderPassToIndexMap::const_iterator found =
       render_passes_index_by_id_.find(delegated_render_pass_id);
   if (found == render_passes_index_by_id_.end()) {
     // Be robust against a RenderPass id that isn't part of the frame.
     return false;
   }
-  unsigned delegated_render_pass_index = found->second;
+  size_t delegated_render_pass_index = found->second;
   *output_render_pass_id =
       RenderPassId(id(), IndexToId(delegated_render_pass_index));
   return true;
 }
 
 void DelegatedRendererLayerImpl::AppendContributingRenderPasses(
     RenderPassSink* render_pass_sink) {
   DCHECK(HasContributingDelegatedRenderPasses());
 
   const RenderPass* root_delegated_render_pass =
       render_passes_in_draw_order_.back();
   gfx::Size frame_size = root_delegated_render_pass->output_rect.size();
   gfx::Transform delegated_frame_to_root_transform = screen_space_transform();
   delegated_frame_to_root_transform.Scale(inverse_device_scale_factor_,
                                           inverse_device_scale_factor_);
 
   for (size_t i = 0; i < render_passes_in_draw_order_.size() - 1; ++i) {
-    RenderPassId output_render_pass_id(-1, -1);
+    RenderPassId output_render_pass_id;
     bool present =
         ConvertDelegatedRenderPassId(render_passes_in_draw_order_[i]->id,
                                      &output_render_pass_id);
 
     // Don't clash with the RenderPass we generate if we own a RenderSurface.
     DCHECK(present) << render_passes_in_draw_order_[i]->id.layer_id << ", "
                     << render_passes_in_draw_order_[i]->id.index;
-    DCHECK_GT(output_render_pass_id.index, 0);
+    DCHECK_GT(output_render_pass_id.index, 0u);
 
     scoped_ptr<RenderPass> copy_pass =
         render_passes_in_draw_order_[i]->Copy(output_render_pass_id);
     copy_pass->transform_to_root_target.ConcatTransform(
         delegated_frame_to_root_transform);
     render_pass_sink->AppendRenderPass(copy_pass.Pass());
   }
 }
 
 bool DelegatedRendererLayerImpl::WillDraw(DrawMode draw_mode,
@@ skipping 30 matching lines @@
     // render_target.
     DCHECK(target_render_pass_id.layer_id == render_target()->id());
 
     AppendRenderPassQuads(render_pass,
                           root_delegated_render_pass,
                           frame_size);
   } else {
     // Verify that the RenderPass we are appending to was created by us.
     DCHECK(target_render_pass_id.layer_id == id());
 
-    int render_pass_index = IdToIndex(target_render_pass_id.index);
+    size_t render_pass_index = IdToIndex(target_render_pass_id.index);
     const RenderPass* delegated_render_pass =
         render_passes_in_draw_order_[render_pass_index];
     AppendRenderPassQuads(render_pass,
                           delegated_render_pass,
                           frame_size);
   }
 }
 
 void DelegatedRendererLayerImpl::AppendRainbowDebugBorder(
     RenderPass* render_pass) {
@@ skipping 157 matching lines @@
       continue;
 
     if (delegated_quad->material != DrawQuad::RENDER_PASS) {
       DrawQuad* output_quad = render_pass->CopyFromAndAppendDrawQuad(
           delegated_quad, output_shared_quad_state);
       output_quad->visible_rect = quad_visible_rect;
       ValidateQuadResources(output_quad);
     } else {
       RenderPassId delegated_contributing_render_pass_id =
           RenderPassDrawQuad::MaterialCast(delegated_quad)->render_pass_id;
-      RenderPassId output_contributing_render_pass_id(-1, -1);
+      RenderPassId output_contributing_render_pass_id;
 
       bool present =
           ConvertDelegatedRenderPassId(delegated_contributing_render_pass_id,
                                        &output_contributing_render_pass_id);
       // |present| being false means the child compositor sent an invalid frame.
       DCHECK(present);
       DCHECK(output_contributing_render_pass_id != render_pass->id);
 
       RenderPassDrawQuad* output_quad =
           render_pass->CopyFromAndAppendRenderPassDrawQuad(
@@ skipping 16 matching lines @@
   if (own_child_id_) {
     ResourceProvider* provider = layer_tree_impl()->resource_provider();
     provider->DestroyChild(child_id_);
   }
 
   resources_.clear();
   child_id_ = 0;
 }
 
 }  // namespace cc