| Index: content/browser/renderer_host/delegated_frame_host.cc
|
| diff --git a/content/browser/renderer_host/delegated_frame_host.cc b/content/browser/renderer_host/delegated_frame_host.cc
|
| index a4dbbc734ee2a9a444abf7ec9aefe4a19f99d85d..881587376c6a9bad9d99b0a47fac7f65a0704c4b 100644
|
| --- a/content/browser/renderer_host/delegated_frame_host.cc
|
| +++ b/content/browser/renderer_host/delegated_frame_host.cc
|
| @@ -50,7 +50,7 @@ DelegatedFrameHost::DelegatedFrameHost(const cc::FrameSinkId& frame_sink_id,
|
| 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(
|
| @@ -59,7 +59,7 @@ DelegatedFrameHost::DelegatedFrameHost(const cc::FrameSinkId& frame_sink_id,
|
| }
|
|
|
| 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_)
|
| @@ -72,11 +72,11 @@ void DelegatedFrameHost::WasShown(const ui::LatencyInfo& 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;
|
| }
|
|
|
| @@ -480,8 +480,7 @@ void DelegatedFrameHost::SubmitCompositorFrame(
|
| }
|
|
|
| if (has_frame_) {
|
| - delegated_frame_evictor_->SwappedFrame(
|
| - client_->DelegatedFrameHostIsVisible());
|
| + frame_evictor_->SwappedFrame(client_->DelegatedFrameHostIsVisible());
|
| }
|
| // Note: the frame may have been evicted immediately.
|
|
|
| @@ -524,7 +523,7 @@ void DelegatedFrameHost::EvictDelegatedFrame() {
|
| client_->DelegatedFrameHostGetLayer()->SetShowSolidColorContent();
|
| support_->EvictFrame();
|
| has_frame_ = false;
|
| - delegated_frame_evictor_->DiscardedFrame();
|
| + frame_evictor_->DiscardedFrame();
|
| UpdateGutters();
|
| }
|
|
|
| @@ -808,7 +807,7 @@ void DelegatedFrameHost::ResetCompositor() {
|
|
|
| void DelegatedFrameHost::LockResources() {
|
| DCHECK(local_surface_id_.is_valid());
|
| - delegated_frame_evictor_->LockFrame();
|
| + frame_evictor_->LockFrame();
|
| }
|
|
|
| void DelegatedFrameHost::RequestCopyOfOutput(
|
| @@ -828,7 +827,7 @@ void DelegatedFrameHost::RequestCopyOfOutput(
|
|
|
| void DelegatedFrameHost::UnlockResources() {
|
| DCHECK(local_surface_id_.is_valid());
|
| - delegated_frame_evictor_->UnlockFrame();
|
| + frame_evictor_->UnlockFrame();
|
| }
|
|
|
| void DelegatedFrameHost::CreateCompositorFrameSinkSupport() {
|
|
|