| Index: gpu/ipc/service/image_transport_surface_overlay_mac.mm
|
| diff --git a/gpu/ipc/service/image_transport_surface_overlay_mac.mm b/gpu/ipc/service/image_transport_surface_overlay_mac.mm
|
| index af6c63211e11f95b6d89296d6d408d411eb2a6ef..0c38129c29c672b586d0c9913b931f4b0063224a 100644
|
| --- a/gpu/ipc/service/image_transport_surface_overlay_mac.mm
|
| +++ b/gpu/ipc/service/image_transport_surface_overlay_mac.mm
|
| @@ -332,11 +332,13 @@ bool ImageTransportSurfaceOverlayMac::ScheduleOverlayPlane(
|
|
|
| bool ImageTransportSurfaceOverlayMac::ScheduleCALayer(
|
| const ui::CARendererLayerParams& params) {
|
| - gl::GLImageIOSurface* io_surface_image =
|
| - gl::GLImageIOSurface::FromGLImage(params.image);
|
| - if (!io_surface_image) {
|
| - DLOG(ERROR) << "Cannot schedule CALayer with non-IOSurface GLImage";
|
| - return false;
|
| + if (params.image) {
|
| + gl::GLImageIOSurface* io_surface_image =
|
| + gl::GLImageIOSurface::FromGLImage(params.image);
|
| + if (!io_surface_image) {
|
| + DLOG(ERROR) << "Cannot schedule CALayer with non-IOSurface GLImage";
|
| + return false;
|
| + }
|
| }
|
| return ca_layer_tree_coordinator_->GetPendingCARendererLayerTree()
|
| ->ScheduleCALayer(params);
|
|
|