Fix bug removing temporary surface references.

services/ui/surfaces/display_compositor.cc

 // Copyright 2015 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 "services/ui/surfaces/display_compositor.h"
 
 #include <utility>
 
 #include "base/memory/ptr_util.h"
 #include "base/threading/thread_task_runner_handle.h"
@@ skipping 151 matching lines @@
   // Remove temporary references for surfaces with the same FrameSinkId that
   // were created before |child_id|. The earlier surfaces were never embedded in
   // the parent and the parent is embedding a later surface, so we know the
   // parent doesn't need them anymore.
   for (auto iter = refs.begin(); iter != temp_ref_iter; ++iter) {
     cc::SurfaceId id = cc::SurfaceId(child_id.frame_sink_id(), *iter);
     reference_manager_->RemoveSurfaceReference(GetRootSurfaceId(), id);
   }
 
   // Remove markers for temporary references up to |child_id|, as the temporary
-  // references they correspond to were removed above. If |ref_iter| is the last
-  // element in |refs| then we are removing all temporary references for the
-  // FrameSinkId and can remove the map entry entirely.
+  // references they correspond to were removed above. If |temp_ref_iter| points
+  // at the last element in |refs| then we are removing all temporary references
+  // for the FrameSinkId and can remove the map entry entirely.
   if (++temp_ref_iter == refs.end())
     temp_references_.erase(child_id.frame_sink_id());
   else
-    refs.erase(refs.begin(), ++temp_ref_iter);
+    refs.erase(refs.begin(), temp_ref_iter);
 }
 
 void DisplayCompositor::RemoveSurfaceReference(
     const cc::SurfaceReference& ref) {
   reference_manager_->RemoveSurfaceReference(ref.parent_id(), ref.child_id());
 }
 
 std::unique_ptr<cc::Display> DisplayCompositor::CreateDisplay(
     const cc::FrameSinkId& frame_sink_id,
     gpu::SurfaceHandle surface_handle,
@@ skipping 77 matching lines @@
       surface_info.id().local_frame_id());
 
   if (client_)
     client_->OnSurfaceCreated(surface_info);
 }
 
 void DisplayCompositor::OnSurfaceDamaged(const cc::SurfaceId& surface_id,
                                          bool* changed) {}
 
 }  // namespace ui