Improving flat containers interface.

components/viz/service/display/surface_aggregator.cc

 // Copyright 2014 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 "components/viz/service/display/surface_aggregator.h"
 
 #include <stddef.h>
 
 #include <map>
 
@@ skipping 804 matching lines @@
       // CopyPasses may have mutated container, need to re-query to erase.
       referenced_surfaces_.erase(referenced_surfaces_.find(surface_id));
     }
   }
 }
 
 void SurfaceAggregator::PropagateCopyRequestPasses() {
   std::vector<cc::RenderPassId> copy_requests_to_iterate(
       copy_request_passes_.begin(), copy_request_passes_.end());
   while (!copy_requests_to_iterate.empty()) {
-    int first = copy_requests_to_iterate.back();
+    cc::RenderPassId first = copy_requests_to_iterate.back();
     copy_requests_to_iterate.pop_back();
     auto it = render_pass_dependencies_.find(first);
     if (it == render_pass_dependencies_.end())
       continue;
     for (auto pass : it->second) {
       if (copy_request_passes_.insert(pass).second) {
         copy_requests_to_iterate.push_back(pass);
       }
     }
   }
@@ skipping 97 matching lines @@
     const gfx::ColorSpace& output_color_space) {
   blending_color_space_ = blending_color_space.IsValid()
                               ? blending_color_space
                               : gfx::ColorSpace::CreateSRGB();
   output_color_space_ = output_color_space.IsValid()
                             ? output_color_space
                             : gfx::ColorSpace::CreateSRGB();
 }
 
 }  // namespace viz