| Index: gpu/vulkan/vulkan_swap_chain.h
|
| diff --git a/gpu/vulkan/vulkan_swap_chain.h b/gpu/vulkan/vulkan_swap_chain.h
|
| index 345e4bebf860911452580c173bcc850d67bba46d..6702febea6fcb438e3c43dfd4e2909de106dda6e 100644
|
| --- a/gpu/vulkan/vulkan_swap_chain.h
|
| +++ b/gpu/vulkan/vulkan_swap_chain.h
|
| @@ -6,9 +6,10 @@
|
| #define GPU_VULKAN_VULKAN_SWAP_CHAIN_H_
|
|
|
| #include <vulkan/vulkan.h>
|
| +
|
| +#include <memory>
|
| #include <vector>
|
|
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "gpu/vulkan/vulkan_export.h"
|
| #include "ui/gfx/geometry/size.h"
|
| #include "ui/gfx/swap_result.h"
|
| @@ -64,7 +65,7 @@ class VulkanSwapChain {
|
| VulkanDeviceQueue* device_queue_;
|
| VkSwapchainKHR swap_chain_ = VK_NULL_HANDLE;
|
|
|
| - scoped_ptr<VulkanCommandPool> command_pool_;
|
| + std::unique_ptr<VulkanCommandPool> command_pool_;
|
|
|
| gfx::Size size_;
|
|
|
| @@ -73,13 +74,13 @@ class VulkanSwapChain {
|
| ~ImageData();
|
|
|
| VkImage image = VK_NULL_HANDLE;
|
| - scoped_ptr<VulkanImageView> image_view;
|
| - scoped_ptr<VulkanCommandBuffer> command_buffer;
|
| + std::unique_ptr<VulkanImageView> image_view;
|
| + std::unique_ptr<VulkanCommandBuffer> command_buffer;
|
|
|
| VkSemaphore render_semaphore = VK_NULL_HANDLE;
|
| VkSemaphore present_semaphore = VK_NULL_HANDLE;
|
| };
|
| - std::vector<scoped_ptr<ImageData>> images_;
|
| + std::vector<std::unique_ptr<ImageData>> images_;
|
| uint32_t current_image_ = 0;
|
|
|
| VkSemaphore next_present_semaphore_ = VK_NULL_HANDLE;
|
|
|