Index: content/browser/compositor/delegated_frame_host.cc |
diff --git a/content/browser/compositor/delegated_frame_host.cc b/content/browser/compositor/delegated_frame_host.cc |
index eddedf486602379b40528cf586908b9a4f5ec354..083041c38fcc8837dd5049a12a7289de1858b268 100644 |
--- a/content/browser/compositor/delegated_frame_host.cc |
+++ b/content/browser/compositor/delegated_frame_host.cc |
@@ -46,11 +46,9 @@ DelegatedFrameHost::DelegatedFrameHost(DelegatedFrameHostClient* client) |
} |
void DelegatedFrameHost::WasShown() { |
- RenderWidgetHostImpl* host = client_->GetHost(); |
delegated_frame_evictor_->SetVisible(true); |
- if (host->is_accelerated_compositing_active() && |
- !released_front_lock_.get()) { |
+ if (!released_front_lock_.get()) { |
ui::Compositor* compositor = client_->GetCompositor(); |
if (compositor) |
released_front_lock_ = compositor->GetCompositorLock(); |
@@ -100,8 +98,6 @@ bool DelegatedFrameHost::ShouldCreateResizeLock() { |
if (host->should_auto_resize()) |
return false; |
- if (!host->is_accelerated_compositing_active()) |
danakj
2014/05/12 17:37:58
Does this mean if you tried to resize during a slo
piman
2014/05/13 20:25:40
It is actually a desirable outcome. The resize loc
|
- return false; |
gfx::Size desired_size = client_->DesiredFrameSize(); |
if (desired_size == current_frame_size_in_dip_) |
@@ -209,10 +205,8 @@ bool DelegatedFrameHost::CanCopyToBitmap() const { |
} |
bool DelegatedFrameHost::CanCopyToVideoFrame() const { |
- RenderWidgetHostImpl* host = client_->GetHost(); |
return client_->GetCompositor() && |
- client_->GetLayer()->has_external_content() && |
- host->is_accelerated_compositing_active(); |
+ client_->GetLayer()->has_external_content(); |
} |
bool DelegatedFrameHost::CanSubscribeFrame() const { |