ui: Prevent DelegatedFrameHost from taking CompositorResizeLock forever

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 72 matching lines @@
 void DelegatedFrameHost::MaybeCreateResizeLock() {
   DCHECK(!resize_lock_);
 
   if (!compositor_)
     return;
 
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDisableResizeLock))
     return;
 
+  if (!has_frame_)
+    return;
+
   if (!client_->DelegatedFrameCanCreateResizeLock())
     return;
 
   gfx::Size desired_size = client_->DelegatedFrameHostDesiredSizeInDIP();
   if (desired_size.IsEmpty())
     return;
   if (desired_size == current_frame_size_in_dip_)
     return;
 
   resize_lock_ = client_->DelegatedFrameHostCreateResizeLock();
@@ skipping 415 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;
+  resize_lock_.reset();
   delegated_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())
@@ skipping 328 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