| Index: cc/surfaces/surface_aggregator.cc
 | 
| diff --git a/cc/surfaces/surface_aggregator.cc b/cc/surfaces/surface_aggregator.cc
 | 
| index e7a955a8b5bd2f94a9b1551feb22a30b920bf671..cf175ffff64419ca412b214445e6fcb57d680a6e 100644
 | 
| --- a/cc/surfaces/surface_aggregator.cc
 | 
| +++ b/cc/surfaces/surface_aggregator.cc
 | 
| @@ -685,8 +685,10 @@ gfx::Rect SurfaceAggregator::PrewalkTree(const SurfaceId& surface_id,
 | 
|    }
 | 
|  
 | 
|    CHECK(debug_weak_this.get());
 | 
| -  if (surface->factory())
 | 
| -    surface->factory()->WillDrawSurface(surface->surface_id(), damage_rect);
 | 
| +  if (surface->factory()) {
 | 
| +    surface->factory()->WillDrawSurface(surface->surface_id().local_frame_id(),
 | 
| +                                        damage_rect);
 | 
| +  }
 | 
|  
 | 
|    CHECK(debug_weak_this.get());
 | 
|    for (const auto& render_pass : frame_data->render_pass_list) {
 | 
| 
 |