Move frame eviction into components

content/browser/renderer_host/delegated_frame_host.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 "content/browser/renderer_host/delegated_frame_host.h"
 
 #include <algorithm>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 32 matching lines @@
 
 DelegatedFrameHost::DelegatedFrameHost(const cc::FrameSinkId& frame_sink_id,
                                        DelegatedFrameHostClient* client)
     : frame_sink_id_(frame_sink_id),
       client_(client),
       compositor_(nullptr),
       tick_clock_(new base::DefaultTickClock()),
       skipped_frames_(false),
       background_color_(SK_ColorRED),
       current_scale_factor_(1.f),
-      delegated_frame_evictor_(new DelegatedFrameEvictor(this)) {
+      frame_evictor_(new viz::FrameEvictor(this)) {
   ImageTransportFactory* factory = ImageTransportFactory::GetInstance();
   factory->GetContextFactory()->AddObserver(this);
   factory->GetContextFactoryPrivate()->GetSurfaceManager()->RegisterFrameSinkId(
       frame_sink_id_);
   CreateCompositorFrameSinkSupport();
 }
 
 void DelegatedFrameHost::WasShown(const ui::LatencyInfo& latency_info) {
-  delegated_frame_evictor_->SetVisible(true);
+  frame_evictor_->SetVisible(true);
 
   if (!has_frame_ && !released_front_lock_.get()) {
     if (compositor_)
       released_front_lock_ = compositor_->GetCompositorLock(nullptr);
   }
 
   if (compositor_) {
     compositor_->SetLatencyInfo(latency_info);
   }
 }
 
 bool DelegatedFrameHost::HasSavedFrame() {
-  return delegated_frame_evictor_->HasFrame();
+  return frame_evictor_->HasFrame();
 }
 
 void DelegatedFrameHost::WasHidden() {
-  delegated_frame_evictor_->SetVisible(false);
+  frame_evictor_->SetVisible(false);
   released_front_lock_ = NULL;
 }
 
 void DelegatedFrameHost::MaybeCreateResizeLock() {
   DCHECK(!resize_lock_);
 
   if (!compositor_)
     return;
 
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
@@ skipping 385 matching lines @@
   CheckResizeLock();
 
   UpdateGutters();
 
   if (!damage_rect_in_dip.IsEmpty()) {
     client_->DelegatedFrameHostGetLayer()->OnDelegatedFrameDamage(
         damage_rect_in_dip);
   }
 
   if (has_frame_) {
-    delegated_frame_evictor_->SwappedFrame(
-        client_->DelegatedFrameHostIsVisible());
+    frame_evictor_->SwappedFrame(client_->DelegatedFrameHostIsVisible());
   }
   // Note: the frame may have been evicted immediately.
 
   DidFinishFrame(ack);
 }
 
 void DelegatedFrameHost::ClearDelegatedFrame() {
   EvictDelegatedFrame();
 }
 
@@ skipping 21 matching lines @@
 void DelegatedFrameHost::OnBeginFrame(const cc::BeginFrameArgs& args) {
   client_->OnBeginFrame(args);
 }
 
 void DelegatedFrameHost::EvictDelegatedFrame() {
   if (!has_frame_)
     return;
   client_->DelegatedFrameHostGetLayer()->SetShowSolidColorContent();
   support_->EvictFrame();
   has_frame_ = false;
-  delegated_frame_evictor_->DiscardedFrame();
+  frame_evictor_->DiscardedFrame();
   UpdateGutters();
 }
 
 // static
 void DelegatedFrameHost::ReturnSubscriberTexture(
     base::WeakPtr<DelegatedFrameHost> dfh,
     scoped_refptr<OwnedMailbox> subscriber_texture,
     const gpu::SyncToken& sync_token) {
   if (!subscriber_texture.get())
     return;
@@ skipping 265 matching lines @@
     vsync_manager_->RemoveObserver(this);
     vsync_manager_ = nullptr;
   }
 
   compositor_->RemoveFrameSink(frame_sink_id_);
   compositor_ = nullptr;
 }
 
 void DelegatedFrameHost::LockResources() {
   DCHECK(local_surface_id_.is_valid());
-  delegated_frame_evictor_->LockFrame();
+  frame_evictor_->LockFrame();
 }
 
 void DelegatedFrameHost::RequestCopyOfOutput(
     std::unique_ptr<cc::CopyOutputRequest> request) {
   // If a specific area has not been requested, set one to ensure correct
   // clipping occurs.
   if (!request->has_area())
     request->set_area(gfx::Rect(current_frame_size_in_dip_));
 
   if (request_copy_of_output_callback_for_testing_.is_null()) {
     client_->DelegatedFrameHostGetLayer()->RequestCopyOfOutput(
         std::move(request));
   } else {
     request_copy_of_output_callback_for_testing_.Run(std::move(request));
   }
 }
 
 void DelegatedFrameHost::UnlockResources() {
   DCHECK(local_surface_id_.is_valid());
-  delegated_frame_evictor_->UnlockFrame();
+  frame_evictor_->UnlockFrame();
 }
 
 void DelegatedFrameHost::CreateCompositorFrameSinkSupport() {
   DCHECK(!support_);
   constexpr bool is_root = false;
   constexpr bool handles_frame_sink_id_invalidation = false;
   constexpr bool needs_sync_points = true;
   ImageTransportFactory* factory = ImageTransportFactory::GetInstance();
   support_ = cc::CompositorFrameSinkSupport::Create(
       this, factory->GetContextFactoryPrivate()->GetSurfaceManager(),
@@ skipping 21 matching lines @@
   }
 
   if (!skipped_frames_) {
     latest_confirmed_begin_frame_source_id_ = ack.source_id;
     latest_confirmed_begin_frame_sequence_number_ =
         ack.latest_confirmed_sequence_number;
   }
 }
 
 }  // namespace content