Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1636)

Unified Diff: content/browser/renderer_host/delegated_frame_host.cc

Issue 2832043002: ui: Prevent DelegatedFrameHost from taking CompositorResizeLock forever (Closed)
Patch Set: resizelocknoframe: submitcomment Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | content/browser/renderer_host/render_widget_host_view_aura.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 95c2da75540df055f617b4546a69b75740f76c52..925e8bfa6d2632aa38bd156a27c51c4a6b2017c2 100644
--- a/content/browser/renderer_host/delegated_frame_host.cc
+++ b/content/browser/renderer_host/delegated_frame_host.cc
@@ -90,6 +90,9 @@ void DelegatedFrameHost::MaybeCreateResizeLock() {
switches::kDisableResizeLock))
return;
+ if (!has_frame_)
+ return;
+
if (!client_->DelegatedFrameCanCreateResizeLock())
return;
@@ -524,6 +527,7 @@ void DelegatedFrameHost::EvictDelegatedFrame() {
client_->DelegatedFrameHostGetLayer()->SetShowSolidColorContent();
support_->EvictFrame();
has_frame_ = false;
+ resize_lock_.reset();
frame_evictor_->DiscardedFrame();
UpdateGutters();
}
« no previous file with comments | « no previous file | content/browser/renderer_host/render_widget_host_view_aura.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698