| Index: gpu/ipc/service/pass_through_image_transport_surface.h
|
| diff --git a/gpu/ipc/service/pass_through_image_transport_surface.h b/gpu/ipc/service/pass_through_image_transport_surface.h
|
| index 4c8f92731446a022d6762144fe1f0f59a8e5b5f2..e679fd5b54f5b4f53553d47e2a37baae0cb29e0d 100644
|
| --- a/gpu/ipc/service/pass_through_image_transport_surface.h
|
| +++ b/gpu/ipc/service/pass_through_image_transport_surface.h
|
| @@ -7,10 +7,10 @@
|
|
|
| #include <stdint.h>
|
|
|
| +#include <memory>
|
| #include <vector>
|
|
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "gpu/ipc/service/image_transport_surface.h"
|
| #include "ui/gl/gl_surface.h"
|
| @@ -52,11 +52,12 @@ class PassThroughImageTransportSurface : public gfx::GLSurfaceAdapter {
|
| void SendVSyncUpdateIfAvailable();
|
|
|
| void SetLatencyInfo(const std::vector<ui::LatencyInfo>& latency_info);
|
| - scoped_ptr<std::vector<ui::LatencyInfo>> StartSwapBuffers();
|
| - void FinishSwapBuffers(scoped_ptr<std::vector<ui::LatencyInfo>> latency_info,
|
| - gfx::SwapResult result);
|
| + std::unique_ptr<std::vector<ui::LatencyInfo>> StartSwapBuffers();
|
| + void FinishSwapBuffers(
|
| + std::unique_ptr<std::vector<ui::LatencyInfo>> latency_info,
|
| + gfx::SwapResult result);
|
| void FinishSwapBuffersAsync(
|
| - scoped_ptr<std::vector<ui::LatencyInfo>> latency_info,
|
| + std::unique_ptr<std::vector<ui::LatencyInfo>> latency_info,
|
| GLSurface::SwapCompletionCallback callback,
|
| gfx::SwapResult result);
|
|
|
|
|