Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1667)

Unified Diff: content/renderer/pepper/ppb_image_data_impl.h

Issue 1873783003: Convert //content/renderer from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/pepper/ppb_graphics_3d_impl.h ('k') | content/renderer/pepper/ppb_image_data_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/pepper/ppb_image_data_impl.h
diff --git a/content/renderer/pepper/ppb_image_data_impl.h b/content/renderer/pepper/ppb_image_data_impl.h
index 13a1e0cdf7b36221235d30f14aa10c1eb9d3cc11..63258205397a3349a23f588f323ed72aa30bad41 100644
--- a/content/renderer/pepper/ppb_image_data_impl.h
+++ b/content/renderer/pepper/ppb_image_data_impl.h
@@ -7,8 +7,9 @@
#include <stdint.h>
+#include <memory>
+
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/shared_memory.h"
#include "content/common/content_export.h"
#include "ppapi/c/ppb_image_data.h"
@@ -108,7 +109,7 @@ class CONTENT_EXPORT PPB_ImageData_Impl
PP_ImageDataFormat format_;
int width_;
int height_;
- scoped_ptr<Backend> backend_;
+ std::unique_ptr<Backend> backend_;
DISALLOW_COPY_AND_ASSIGN(PPB_ImageData_Impl);
};
@@ -141,7 +142,7 @@ class ImageDataPlatformBackend : public PPB_ImageData_Impl::Backend {
// swapped with another.
int width_;
int height_;
- scoped_ptr<TransportDIB> dib_;
+ std::unique_ptr<TransportDIB> dib_;
// When the device is mapped, this is the image. Null when umapped.
sk_sp<SkCanvas> mapped_canvas_;
@@ -171,7 +172,7 @@ class ImageDataSimpleBackend : public PPB_ImageData_Impl::Backend {
const SkBitmap* GetMappedBitmap() const override;
private:
- scoped_ptr<base::SharedMemory> shared_memory_;
+ std::unique_ptr<base::SharedMemory> shared_memory_;
// skia_bitmap_ is backed by shared_memory_.
SkBitmap skia_bitmap_;
sk_sp<SkCanvas> skia_canvas_;
« no previous file with comments | « content/renderer/pepper/ppb_graphics_3d_impl.h ('k') | content/renderer/pepper/ppb_image_data_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698