| Index: content/browser/compositor/gpu_process_transport_factory.h
|
| diff --git a/content/browser/compositor/gpu_process_transport_factory.h b/content/browser/compositor/gpu_process_transport_factory.h
|
| index f4e007aa1885db95b18707958a0d1bc7931224a2..1996a848f2689d104b9d63d7bf0bbe55f8a55e68 100644
|
| --- a/content/browser/compositor/gpu_process_transport_factory.h
|
| +++ b/content/browser/compositor/gpu_process_transport_factory.h
|
| @@ -8,11 +8,11 @@
|
| #include <stdint.h>
|
|
|
| #include <map>
|
| +#include <memory>
|
|
|
| #include "base/id_map.h"
|
| #include "base/macros.h"
|
| #include "base/memory/ref_counted.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/observer_list.h"
|
| #include "build/build_config.h"
|
| @@ -48,13 +48,13 @@ class GpuProcessTransportFactory
|
|
|
| ~GpuProcessTransportFactory() override;
|
|
|
| - scoped_ptr<WebGraphicsContext3DCommandBufferImpl>
|
| + std::unique_ptr<WebGraphicsContext3DCommandBufferImpl>
|
| CreateOffscreenCommandBufferContext();
|
|
|
| // ui::ContextFactory implementation.
|
| void CreateOutputSurface(base::WeakPtr<ui::Compositor> compositor) override;
|
| - scoped_ptr<ui::Reflector> CreateReflector(ui::Compositor* source,
|
| - ui::Layer* target) override;
|
| + std::unique_ptr<ui::Reflector> CreateReflector(ui::Compositor* source,
|
| + ui::Layer* target) override;
|
| void RemoveReflector(ui::Reflector* reflector) override;
|
| void RemoveCompositor(ui::Compositor* compositor) override;
|
| scoped_refptr<cc::ContextProvider> SharedMainThreadContextProvider() override;
|
| @@ -64,7 +64,7 @@ class GpuProcessTransportFactory
|
| cc::SharedBitmapManager* GetSharedBitmapManager() override;
|
| gpu::GpuMemoryBufferManager* GetGpuMemoryBufferManager() override;
|
| cc::TaskGraphRunner* GetTaskGraphRunner() override;
|
| - scoped_ptr<cc::SurfaceIdAllocator> CreateSurfaceIdAllocator() override;
|
| + std::unique_ptr<cc::SurfaceIdAllocator> CreateSurfaceIdAllocator() override;
|
| void ResizeDisplay(ui::Compositor* compositor,
|
| const gfx::Size& size) override;
|
|
|
| @@ -89,12 +89,12 @@ class GpuProcessTransportFactory
|
| struct PerCompositorData;
|
|
|
| PerCompositorData* CreatePerCompositorData(ui::Compositor* compositor);
|
| - scoped_ptr<cc::SoftwareOutputDevice> CreateSoftwareOutputDevice(
|
| + std::unique_ptr<cc::SoftwareOutputDevice> CreateSoftwareOutputDevice(
|
| ui::Compositor* compositor);
|
| void EstablishedGpuChannel(base::WeakPtr<ui::Compositor> compositor,
|
| bool create_gpu_output_surface,
|
| int num_attempts);
|
| - scoped_ptr<WebGraphicsContext3DCommandBufferImpl> CreateContextCommon(
|
| + std::unique_ptr<WebGraphicsContext3DCommandBufferImpl> CreateContextCommon(
|
| scoped_refptr<gpu::GpuChannelHost> gpu_channel_host,
|
| gpu::SurfaceHandle surface_handle);
|
|
|
| @@ -104,15 +104,15 @@ class GpuProcessTransportFactory
|
| typedef std::map<ui::Compositor*, PerCompositorData*> PerCompositorDataMap;
|
| PerCompositorDataMap per_compositor_data_;
|
| scoped_refptr<ContextProviderCommandBuffer> shared_main_thread_contexts_;
|
| - scoped_ptr<GLHelper> gl_helper_;
|
| + std::unique_ptr<GLHelper> gl_helper_;
|
| base::ObserverList<ImageTransportFactoryObserver> observer_list_;
|
| - scoped_ptr<cc::SurfaceManager> surface_manager_;
|
| + std::unique_ptr<cc::SurfaceManager> surface_manager_;
|
| uint32_t next_surface_id_namespace_;
|
| - scoped_ptr<cc::SingleThreadTaskGraphRunner> task_graph_runner_;
|
| + std::unique_ptr<cc::SingleThreadTaskGraphRunner> task_graph_runner_;
|
| scoped_refptr<ContextProviderCommandBuffer> shared_worker_context_provider_;
|
|
|
| #if defined(OS_WIN)
|
| - scoped_ptr<OutputDeviceBacking> software_backing_;
|
| + std::unique_ptr<OutputDeviceBacking> software_backing_;
|
| #endif
|
|
|
| // The contents of this map and its methods may only be used on the compositor
|
|
|