| Index: cc/trees/layer_tree_host_impl.h
|
| diff --git a/cc/trees/layer_tree_host_impl.h b/cc/trees/layer_tree_host_impl.h
|
| index f7fad1517c5152d0f3b9b78e711d9a03c0e95a4c..1fbd92d9123af69eb66ee0d903cdc79d30469e6b 100644
|
| --- a/cc/trees/layer_tree_host_impl.h
|
| +++ b/cc/trees/layer_tree_host_impl.h
|
| @@ -362,14 +362,14 @@
|
| // Implementation.
|
| int id() const { return id_; }
|
| bool CanDraw() const;
|
| - OutputSurface* output_surface() const { return output_surface_; }
|
| + OutputSurface* output_surface() const { return output_surface_.get(); }
|
|
|
| std::string LayerTreeAsJson() const;
|
|
|
| void FinishAllRendering();
|
| int RequestedMSAASampleCount() const;
|
|
|
| - virtual bool InitializeRenderer(OutputSurface* output_surface);
|
| + virtual bool InitializeRenderer(scoped_ptr<OutputSurface> output_surface);
|
| TileManager* tile_manager() { return tile_manager_.get(); }
|
|
|
| void SetHasGpuRasterizationTrigger(bool flag) {
|
| @@ -696,7 +696,7 @@
|
| // request queue.
|
| std::set<UIResourceId> evicted_ui_resources_;
|
|
|
| - OutputSurface* output_surface_;
|
| + scoped_ptr<OutputSurface> output_surface_;
|
|
|
| scoped_ptr<ResourceProvider> resource_provider_;
|
| bool content_is_suitable_for_gpu_rasterization_;
|
|
|