| Index: cc/surfaces/surface_factory.h
|
| diff --git a/cc/surfaces/surface_factory.h b/cc/surfaces/surface_factory.h
|
| index 742cc2a47302fa44780a9fcd172b200045afca2c..eee51bf5ddfeabbf3b53f028668897c501b04410 100644
|
| --- a/cc/surfaces/surface_factory.h
|
| +++ b/cc/surfaces/surface_factory.h
|
| @@ -5,12 +5,12 @@
|
| #ifndef CC_SURFACES_SURFACE_FACTORY_H_
|
| #define CC_SURFACES_SURFACE_FACTORY_H_
|
|
|
| +#include <memory>
|
| #include <set>
|
| #include <unordered_map>
|
|
|
| #include "base/callback_forward.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/observer_list.h"
|
| #include "cc/output/compositor_frame.h"
|
| @@ -54,10 +54,10 @@ class CC_SURFACES_EXPORT SurfaceFactory
|
| // The callback is called the first time this frame is used to draw, or if
|
| // the frame is discarded.
|
| void SubmitCompositorFrame(SurfaceId surface_id,
|
| - scoped_ptr<CompositorFrame> frame,
|
| + std::unique_ptr<CompositorFrame> frame,
|
| const DrawCallback& callback);
|
| void RequestCopyOfSurface(SurfaceId surface_id,
|
| - scoped_ptr<CopyOutputRequest> copy_request);
|
| + std::unique_ptr<CopyOutputRequest> copy_request);
|
|
|
| void WillDrawSurface(SurfaceId id, const gfx::Rect& damage_rect);
|
|
|
| @@ -83,7 +83,7 @@ class CC_SURFACES_EXPORT SurfaceFactory
|
| bool needs_sync_points_;
|
|
|
| using OwningSurfaceMap =
|
| - std::unordered_map<SurfaceId, scoped_ptr<Surface>, SurfaceIdHash>;
|
| + std::unordered_map<SurfaceId, std::unique_ptr<Surface>, SurfaceIdHash>;
|
| OwningSurfaceMap surface_map_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(SurfaceFactory);
|
|
|