| Index: blimp/client/core/compositor/blimp_compositor.cc
|
| diff --git a/blimp/client/core/compositor/blimp_compositor.cc b/blimp/client/core/compositor/blimp_compositor.cc
|
| index 1d01a04d24092385187bf958b6e528c1709a9702..d514e493c8676ca58958c072a64e8e9488c21504 100644
|
| --- a/blimp/client/core/compositor/blimp_compositor.cc
|
| +++ b/blimp/client/core/compositor/blimp_compositor.cc
|
| @@ -29,6 +29,7 @@
|
| #include "cc/surfaces/surface.h"
|
| #include "cc/surfaces/surface_factory.h"
|
| #include "cc/surfaces/surface_id_allocator.h"
|
| +#include "cc/surfaces/surface_info.h"
|
| #include "cc/surfaces/surface_manager.h"
|
| #include "cc/trees/layer_tree_host_in_process.h"
|
| #include "gpu/command_buffer/client/gpu_memory_buffer_manager.h"
|
| @@ -334,9 +335,9 @@ void BlimpCompositor::SubmitCompositorFrame(cc::CompositorFrame frame) {
|
| scoped_refptr<cc::SurfaceLayer> content_layer = cc::SurfaceLayer::Create(
|
| base::Bind(&SatisfyCallback, base::Unretained(surface_manager)),
|
| base::Bind(&RequireCallback, base::Unretained(surface_manager)));
|
| - content_layer->SetSurfaceId(
|
| + content_layer->SetSurfaceInfo(cc::SurfaceInfo(
|
| cc::SurfaceId(surface_factory_->frame_sink_id(), local_frame_id_), 1.f,
|
| - surface_size);
|
| + surface_size));
|
| content_layer->SetBounds(current_surface_size_);
|
| content_layer->SetIsDrawable(true);
|
| content_layer->SetContentsOpaque(true);
|
|
|