| 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 c5fd59a096d1964de7504a36e32a95bd28ef8db1..229d190e0667bead5a6194cc38d93a46af38844e 100644
|
| --- a/content/browser/compositor/delegated_frame_host.cc
|
| +++ b/content/browser/compositor/delegated_frame_host.cc
|
| @@ -47,11 +47,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())
|
| - return false;
|
|
|
| gfx::Size desired_size = client_->DesiredFrameSize();
|
| if (desired_size == current_frame_size_in_dip_)
|
| @@ -201,10 +197,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 {
|
|
|