Rename EvictFrame, EvictSurface to EvictCurrentSurface

cc/surfaces/compositor_frame_sink_support.cc

 // Copyright 2016 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/surfaces/compositor_frame_sink_support.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "cc/output/compositor_frame.h"
@@ skipping 27 matching lines @@
   // Unregister |this| as a BeginFrameObserver so that the BeginFrameSource does
   // not call into |this| after it's deleted.
   SetNeedsBeginFrame(false);
 
   // For display root surfaces, the surface is no longer going to be visible
   // so make it unreachable from the top-level root.
   if (surface_manager_->using_surface_references() && is_root_ &&
       reference_tracker_.current_surface_id().is_valid())
     RemoveTopLevelRootReference(reference_tracker_.current_surface_id());
 
-  EvictFrame();
+  EvictCurrentSurface();
   surface_manager_->UnregisterFrameSinkManagerClient(frame_sink_id_);
   if (handles_frame_sink_id_invalidation_)
     surface_manager_->InvalidateFrameSinkId(frame_sink_id_);
 }
 
 void CompositorFrameSinkSupport::ReturnResources(
     const ReturnedResourceArray& resources) {
   if (resources.empty())
     return;
   if (!ack_pending_count_ && client_) {
     client_->ReclaimResources(resources);
     return;
   }
 
   std::copy(resources.begin(), resources.end(),
             std::back_inserter(surface_returned_resources_));
 }
 
 void CompositorFrameSinkSupport::SetBeginFrameSource(
     BeginFrameSource* begin_frame_source) {
   if (begin_frame_source_ && added_frame_observer_) {
     begin_frame_source_->RemoveObserver(this);
     added_frame_observer_ = false;
   }
   begin_frame_source_ = begin_frame_source;
   UpdateNeedsBeginFramesInternal();
 }
 
-void CompositorFrameSinkSupport::EvictFrame() {
+void CompositorFrameSinkSupport::EvictCurrentSurface() {
   if (!current_surface_)
     return;
   DestroyCurrentSurface();
 }
 
 void CompositorFrameSinkSupport::SetNeedsBeginFrame(bool needs_begin_frame) {
   needs_begin_frame_ = needs_begin_frame;
   UpdateNeedsBeginFramesInternal();
 }
 
@@ skipping 259 matching lines @@
     std::unique_ptr<CopyOutputRequest> copy_request) {
   if (!current_surface_)
     return;
 
   DCHECK(current_surface_->compositor_frame_sink_support().get() == this);
   current_surface_->RequestCopyOfOutput(std::move(copy_request));
   surface_manager_->SurfaceModified(current_surface_->surface_id());
 }
 
 }  // namespace cc