| Index: cc/layers/surface_layer_impl.cc
|
| diff --git a/cc/layers/surface_layer_impl.cc b/cc/layers/surface_layer_impl.cc
|
| index ed5b443ab0ad81cc75c7ca5918c1d9a155af3c33..5acd21efa66f0e62a00122c4d1610d23edf30da7 100644
|
| --- a/cc/layers/surface_layer_impl.cc
|
| +++ b/cc/layers/surface_layer_impl.cc
|
| @@ -73,7 +73,7 @@ void SurfaceLayerImpl::AppendQuads(RenderPass* render_pass,
|
| if (primary && fallback_surface_info_.id() != primary_surface_info_.id()) {
|
| primary->fallback_quad = CreateSurfaceDrawQuad(
|
| render_pass, SurfaceDrawQuadType::FALLBACK, fallback_surface_info_,
|
| - &append_quads_data->embedded_surfaces);
|
| + nullptr /* embedded_surfaces */);
|
| }
|
| }
|
|
|
| @@ -121,7 +121,8 @@ SurfaceDrawQuad* SurfaceLayerImpl::CreateSurfaceDrawQuad(
|
| render_pass->CreateAndAppendDrawQuad<SurfaceDrawQuad>();
|
| surface_draw_quad->SetNew(shared_quad_state, quad_rect, visible_quad_rect,
|
| surface_info.id(), surface_draw_quad_type, nullptr);
|
| - embedded_surfaces->push_back(surface_info.id());
|
| + if (embedded_surfaces)
|
| + embedded_surfaces->push_back(surface_info.id());
|
|
|
| return surface_draw_quad;
|
| }
|
|
|