| Index: ui/compositor/layer.cc
|
| diff --git a/ui/compositor/layer.cc b/ui/compositor/layer.cc
|
| index 7a2caf41302ef533a4c9f4c82a41f844dac51e48..115b947dfb815e8eb420d8f39c6c566c697acded 100644
|
| --- a/ui/compositor/layer.cc
|
| +++ b/ui/compositor/layer.cc
|
| @@ -569,11 +569,12 @@ void Layer::SetShowDelegatedContent(cc::DelegatedFrameProvider* frame_provider,
|
| RecomputeDrawsContentAndUVRect();
|
| }
|
|
|
| -void Layer::SetShowSurface(cc::SurfaceId id, gfx::Size frame_size_in_dip) {
|
| +void Layer::SetShowSurface(scoped_refptr<cc::SurfaceHolder> surface_holder,
|
| + gfx::Size frame_size_in_dip) {
|
| DCHECK(type_ == LAYER_TEXTURED || type_ == LAYER_SOLID_COLOR);
|
|
|
| scoped_refptr<cc::SurfaceLayer> new_layer = cc::SurfaceLayer::Create();
|
| - new_layer->SetSurfaceId(id);
|
| + new_layer->SetSurfaceId(surface_holder);
|
| SwitchToLayer(new_layer);
|
| surface_layer_ = new_layer;
|
|
|
|
|