cc: Remove ScopedPtrVector and cc::remove_if.

cc/trees/layer_tree_impl.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_impl.h"
 
 #include <algorithm>
 #include <limits>
 #include <set>
 
@@ skipping 536 matching lines @@
   return gfx::ScaleSize(InnerViewportContainerLayer()->BoundsForScrolling(),
                         1.0f / current_page_scale_factor());
 }
 
 gfx::Rect LayerTreeImpl::RootScrollLayerDeviceViewportBounds() const {
   LayerImpl* root_scroll_layer = OuterViewportScrollLayer()
                                      ? OuterViewportScrollLayer()
                                      : InnerViewportScrollLayer();
   if (!root_scroll_layer || root_scroll_layer->children().empty())
     return gfx::Rect();
-  LayerImpl* layer = root_scroll_layer->children()[0];
+  LayerImpl* layer = root_scroll_layer->children()[0].get();
   return MathUtil::MapEnclosingClippedRect(layer->screen_space_transform(),
                                            gfx::Rect(layer->bounds()));
 }
 
 void LayerTreeImpl::ApplySentScrollAndScaleDeltasFromAbortedCommit() {
   DCHECK(IsActiveTree());
 
   page_scale_factor()->AbortCommit();
   top_controls_shown_ratio()->AbortCommit();
   elastic_overscroll()->AbortCommit();
@@ skipping 290 matching lines @@
 
   // Always reset this flag on activation, as we would only have activated
   // if we were in a good state.
   layer_tree_host_impl_->ResetRequiresHighResToDraw();
 
   if (root_layer()) {
     LayerTreeHostCommon::CallFunctionForSubtree(
         root_layer(), [](LayerImpl* layer) { layer->DidBecomeActive(); });
   }
 
-  for (auto* swap_promise : swap_promise_list_)
+  for (const scoped_ptr<SwapPromise>& swap_promise : swap_promise_list_)

[danakj, 2015/11/17 01:12:19]

auto

[vmpstr, 2015/11/17 23:26:25]

Done.

     swap_promise->DidActivate();
   devtools_instrumentation::DidActivateLayerTree(layer_tree_host_impl_->id(),
                                                  source_frame_number_);
 }
 
 bool LayerTreeImpl::RequiresHighResToDraw() const {
   return layer_tree_host_impl_->RequiresHighResToDraw();
 }
 
 bool LayerTreeImpl::ViewportSizeInvalid() const {
@@ skipping 192 matching lines @@
   LayerIterator end = LayerIterator::End(&render_surface_layer_list_);
   for (LayerIterator it = LayerIterator::Begin(&render_surface_layer_list_);
        it != end; ++it) {
     if (!it.represents_itself())
       continue;
     TracedValue::AppendIDRef(*it, state);
   }
   state->EndArray();
 
   state->BeginArray("swap_promise_trace_ids");
-  for (auto* swap_promise : swap_promise_list_)
+  for (const scoped_ptr<SwapPromise>& swap_promise : swap_promise_list_)

[danakj, 2015/11/17 01:12:19]

auto

[vmpstr, 2015/11/17 23:26:25]

Done.

     state->AppendDouble(swap_promise->TraceId());
   state->EndArray();
 
   state->BeginArray("pinned_swap_promise_trace_ids");
-  for (auto* swap_promise : pinned_swap_promise_list_)
+  for (const scoped_ptr<SwapPromise>& swap_promise : pinned_swap_promise_list_)

[danakj, 2015/11/17 01:12:19]

auto

[vmpstr, 2015/11/17 23:26:25]

Done.

     state->AppendDouble(swap_promise->TraceId());
   state->EndArray();
 }
 
 bool LayerTreeImpl::DistributeRootScrollOffset(
     const gfx::ScrollOffset& root_offset) {
   if (!InnerViewportScrollLayer())
     return false;
 
   DCHECK(OuterViewportScrollLayer());
@@ skipping 29 matching lines @@
 }
 
 void LayerTreeImpl::QueuePinnedSwapPromise(
     scoped_ptr<SwapPromise> swap_promise) {
   DCHECK(IsActiveTree());
   DCHECK(swap_promise);
   pinned_swap_promise_list_.push_back(swap_promise.Pass());
 }
 
 void LayerTreeImpl::PassSwapPromises(
-    ScopedPtrVector<SwapPromise>* new_swap_promise) {
-  for (auto* swap_promise : swap_promise_list_)
+    std::vector<scoped_ptr<SwapPromise>>* new_swap_promise) {
+  for (const scoped_ptr<SwapPromise>& swap_promise : swap_promise_list_)

[danakj, 2015/11/17 01:12:19]

auto

[vmpstr, 2015/11/17 23:26:25]

Done.

     swap_promise->DidNotSwap(SwapPromise::SWAP_FAILS);
   swap_promise_list_.clear();
   swap_promise_list_.swap(*new_swap_promise);
 }
 
 void LayerTreeImpl::FinishSwapPromises(CompositorFrameMetadata* metadata) {
-  for (auto* swap_promise : swap_promise_list_)
+  for (const scoped_ptr<SwapPromise>& swap_promise : swap_promise_list_)

[danakj, 2015/11/17 01:12:19]

auto

[vmpstr, 2015/11/17 23:26:25]

Done.

     swap_promise->DidSwap(metadata);
   swap_promise_list_.clear();
-  for (auto* swap_promise : pinned_swap_promise_list_)
+  for (const scoped_ptr<SwapPromise>& swap_promise : swap_promise_list_)

[ericrk, 2015/11/16 21:59:49]

did you mean to use a different list?

[danakj, 2015/11/17 01:12:19]

also, auto

[vmpstr, 2015/11/17 23:26:25]

Done.

[vmpstr, 2015/11/17 23:26:25]

Whoops. Thanks for catching this!

     swap_promise->DidSwap(metadata);
   pinned_swap_promise_list_.clear();
 }
 
 void LayerTreeImpl::BreakSwapPromises(SwapPromise::DidNotSwapReason reason) {
-  for (auto* swap_promise : swap_promise_list_)
+  for (const scoped_ptr<SwapPromise>& swap_promise : swap_promise_list_)

[danakj, 2015/11/17 01:12:19]

auto

[vmpstr, 2015/11/17 23:26:25]

Done.

     swap_promise->DidNotSwap(reason);
   swap_promise_list_.clear();
-  for (auto* swap_promise : pinned_swap_promise_list_)
+  for (const scoped_ptr<SwapPromise>& swap_promise : swap_promise_list_)

[ericrk, 2015/11/16 21:59:49]

same here?

[danakj, 2015/11/17 01:12:19]

also, auto

[vmpstr, 2015/11/17 23:26:25]

Done.

[vmpstr, 2015/11/17 23:26:25]

Done.

     swap_promise->DidNotSwap(reason);
   pinned_swap_promise_list_.clear();
 }
 
 void LayerTreeImpl::DidModifyTilePriorities() {
   layer_tree_host_impl_->DidModifyTilePriorities();
 }
 
 void LayerTreeImpl::set_ui_resource_request_queue(
     const UIResourceRequestQueue& queue) {
@@ skipping 318 matching lines @@
 static void FindClosestMatchingLayer(
     const gfx::PointF& screen_space_point,
     LayerImpl* layer,
     const Functor& func,
     const TransformTree& transform_tree,
     const bool use_property_trees,
     FindClosestMatchingLayerDataForRecursion* data_for_recursion) {
   size_t children_size = layer->children().size();
   for (size_t i = 0; i < children_size; ++i) {
     size_t index = children_size - 1 - i;
-    FindClosestMatchingLayer(screen_space_point, layer->children()[index], func,
-                             transform_tree, use_property_trees,
+    FindClosestMatchingLayer(screen_space_point, layer->children()[index].get(),
+                             func, transform_tree, use_property_trees,
                              data_for_recursion);
   }
 
   if (!func(layer))
     return;
 
   float distance_to_intersection = 0.f;
   bool hit = false;
   if (layer->Is3dSorted())
     hit = PointHitsLayer(layer, screen_space_point, &distance_to_intersection,
@@ skipping 420 matching lines @@
                                                    const gfx::BoxF& box,
                                                    gfx::BoxF* bounds) const {
   *bounds = gfx::BoxF();
   return layer_tree_host_impl_->animation_host()
              ? layer_tree_host_impl_->animation_host()
                    ->TransformAnimationBoundsForBox(layer->id(), box, bounds)
              : true;
 }
 
 }  // namespace cc