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

Unified Diff: gpu/ipc/service/image_transport_surface_overlay_mac.mm

Issue 2117103002: Fixed case with no GLImage. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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 | ui/accelerated_widget_mac/ca_renderer_layer_tree.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
« no previous file with comments | « no previous file | ui/accelerated_widget_mac/ca_renderer_layer_tree.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698