Index: content/browser/renderer_host/render_widget_host_view_mac.mm |
diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm |
index bfe907195afd725e1876c000b6261e3bdbe5b466..a7f5b0b50e66393f337fa0517e0d1c46a36017fc 100644 |
--- a/content/browser/renderer_host/render_widget_host_view_mac.mm |
+++ b/content/browser/renderer_host/render_widget_host_view_mac.mm |
@@ -1295,6 +1295,8 @@ void RenderWidgetHostViewMac::CopyFromCompositingSurface( |
ignore_result(scoped_callback_runner.Release()); |
callback.Run(true, target_bitmap); |
+ } else { |
+ callback.Run(false, SkBitmap()); |
} |
} |
@@ -1309,9 +1311,7 @@ void RenderWidgetHostViewMac::CopyFromCompositingSurfaceToVideoFrame( |
} |
base::ScopedClosureRunner scoped_callback_runner(base::Bind(callback, false)); |
- if (!render_widget_host_->is_accelerated_compositing_active() || |
- !compositing_iosurface_ || |
- !compositing_iosurface_->HasIOSurface()) |
+ if (!compositing_iosurface_ || !compositing_iosurface_->HasIOSurface()) |
return; |
if (!target.get()) { |
@@ -1340,7 +1340,6 @@ bool RenderWidgetHostViewMac::CanCopyToVideoFrame() const { |
return delegated_frame_host_->CanCopyToVideoFrame(); |
return (!software_frame_manager_->HasCurrentFrame() && |
- render_widget_host_->is_accelerated_compositing_active() && |
compositing_iosurface_ && |
compositing_iosurface_->HasIOSurface()); |
} |
@@ -1960,9 +1959,6 @@ void RenderWidgetHostViewMac::OnSwapCompositorFrame( |
} |
} |
-void RenderWidgetHostViewMac::OnAcceleratedCompositingStateChange() { |
-} |
- |
void RenderWidgetHostViewMac::AcceleratedSurfaceInitialized(int host_id, |
int route_id) { |
} |