Index: cc/surfaces/display.cc |
diff --git a/cc/surfaces/display.cc b/cc/surfaces/display.cc |
index 72c31b5248c100b7216e746dcae353bbfc4b820a..09ab643295ed79df2a10c4f4bcd19c38d31c7815 100644 |
--- a/cc/surfaces/display.cc |
+++ b/cc/surfaces/display.cc |
@@ -198,9 +198,11 @@ SurfaceId Display::CurrentSurfaceId() { |
} |
int Display::GetMaxFramesPending() { |
- if (!output_surface_) |
- return OutputSurface::DEFAULT_MAX_FRAMES_PENDING; |
- return output_surface_->capabilities().max_frames_pending; |
+ int max_frames_pending = |
+ output_surface_ ? output_surface_->capabilities().max_frames_pending : 0; |
+ if (max_frames_pending <= 0) |
+ max_frames_pending = OutputSurface::DEFAULT_MAX_FRAMES_PENDING; |
+ return max_frames_pending; |
} |
} // namespace cc |