diff options
Diffstat (limited to 'cc/surfaces/surface_aggregator.cc')
| -rw-r--r-- | cc/surfaces/surface_aggregator.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cc/surfaces/surface_aggregator.cc b/cc/surfaces/surface_aggregator.cc index 679d751..35107e8 100644 --- a/cc/surfaces/surface_aggregator.cc +++ b/cc/surfaces/surface_aggregator.cc @@ -355,7 +355,7 @@ scoped_ptr<CompositorFrame> SurfaceAggregator::Aggregate(SurfaceId surface_id) { contained_surfaces_[surface_id] = surface->frame_index(); const CompositorFrame* root_surface_frame = surface->GetEligibleFrame(); if (!root_surface_frame) - return scoped_ptr<CompositorFrame>(); + return nullptr; TRACE_EVENT0("cc", "SurfaceAggregator::Aggregate"); scoped_ptr<CompositorFrame> frame(new CompositorFrame); |