Remove OwnPtr from Blink.

third_party/WebKit/Source/platform/graphics/ImageDecodingStore.h

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 13 matching lines @@
  */
 
 #ifndef ImageDecodingStore_h
 #define ImageDecodingStore_h
 
 #include "SkSize.h"
 #include "SkTypes.h"
 #include "platform/PlatformExport.h"
 #include "platform/graphics/skia/SkSizeHash.h"
 #include "platform/image-decoders/ImageDecoder.h"
-
 #include "wtf/DoublyLinkedList.h"
 #include "wtf/HashSet.h"
-#include "wtf/OwnPtr.h"
-#include "wtf/PassOwnPtr.h"
+#include "wtf/PtrUtil.h"
 #include "wtf/ThreadingPrimitives.h"
 #include "wtf/Vector.h"
+#include <memory>
 
 namespace blink {
 
 class ImageFrameGenerator;
 
 // FUNCTION
 //
 // ImageDecodingStore is a class used to manage cached decoder objects.
 //
 // EXTERNAL OBJECTS
 //
 // ImageDecoder
 //   A decoder object. It is used to decode raw data into bitmap images.
 //
 // ImageFrameGenerator
 //   This is a direct user of this cache. Responsible for generating bitmap images
 //   using an ImageDecoder. It contains encoded image data and is used to represent
 //   one image file. It is used to index image and decoder objects in the cache.
 //
 // THREAD SAFETY
 //
 // All public methods can be used on any thread.
 
 class PLATFORM_EXPORT ImageDecodingStore final {
     USING_FAST_MALLOC(ImageDecodingStore);
     WTF_MAKE_NONCOPYABLE(ImageDecodingStore);
 public:
-    static PassOwnPtr<ImageDecodingStore> create() { return adoptPtr(new ImageDecodingStore); }
+    static std::unique_ptr<ImageDecodingStore> create() { return wrapUnique(new ImageDecodingStore); }
     ~ImageDecodingStore();
 
     static ImageDecodingStore& instance();
 
     // Access a cached decoder object. A decoder is indexed by origin (ImageFrameGenerator)
     // and scaled size. Return true if the cached object is found.
     bool lockDecoder(const ImageFrameGenerator*, const SkISize& scaledSize, ImageDecoder**);
     void unlockDecoder(const ImageFrameGenerator*, const ImageDecoder*);
-    void insertDecoder(const ImageFrameGenerator*, PassOwnPtr<ImageDecoder>);
+    void insertDecoder(const ImageFrameGenerator*, std::unique_ptr<ImageDecoder>);
     void removeDecoder(const ImageFrameGenerator*, const ImageDecoder*);
 
     // Remove all cache entries indexed by ImageFrameGenerator.
     void removeCacheIndexedByGenerator(const ImageFrameGenerator*);
 
     void clear();
     void setCacheLimitInBytes(size_t);
     size_t memoryUsageInBytes();
     int cacheEntries();
     int decoderCacheEntries();
@@ skipping 41 matching lines @@
         const ImageFrameGenerator* m_generator;
         int m_useCount;
 
     private:
         CacheEntry* m_prev;
         CacheEntry* m_next;
     };
 
     class DecoderCacheEntry final : public CacheEntry {
     public:
-        static PassOwnPtr<DecoderCacheEntry> create(const ImageFrameGenerator* generator, PassOwnPtr<ImageDecoder> decoder)
+        static std::unique_ptr<DecoderCacheEntry> create(const ImageFrameGenerator* generator, std::unique_ptr<ImageDecoder> decoder)
         {
-            return adoptPtr(new DecoderCacheEntry(generator, 0, std::move(decoder)));
+            return wrapUnique(new DecoderCacheEntry(generator, 0, std::move(decoder)));
         }
 
-        DecoderCacheEntry(const ImageFrameGenerator* generator, int count, PassOwnPtr<ImageDecoder> decoder)
+        DecoderCacheEntry(const ImageFrameGenerator* generator, int count, std::unique_ptr<ImageDecoder> decoder)
             : CacheEntry(generator, count)
             , m_cachedDecoder(std::move(decoder))
             , m_size(SkISize::Make(m_cachedDecoder->decodedSize().width(), m_cachedDecoder->decodedSize().height()))
         {
         }
 
         size_t memoryUsageInBytes() const override { return m_size.width() * m_size.height() * 4; }
         CacheType type() const override { return TypeDecoder; }
 
         static DecoderCacheKey makeCacheKey(const ImageFrameGenerator* generator, const SkISize& size)
         {
             return std::make_pair(generator, size);
         }
         static DecoderCacheKey makeCacheKey(const ImageFrameGenerator* generator, const ImageDecoder* decoder)
         {
             return std::make_pair(generator, SkISize::Make(decoder->decodedSize().width(), decoder->decodedSize().height()));
         }
         DecoderCacheKey cacheKey() const { return makeCacheKey(m_generator, m_size); }
         ImageDecoder* cachedDecoder() const { return m_cachedDecoder.get(); }
 
     private:
-        OwnPtr<ImageDecoder> m_cachedDecoder;
+        std::unique_ptr<ImageDecoder> m_cachedDecoder;
         SkISize m_size;
     };
 
     ImageDecodingStore();
 
     void prune();
 
     // These helper methods are called while m_mutex is locked.
-    template<class T, class U, class V> void insertCacheInternal(PassOwnPtr<T> cacheEntry, U* cacheMap, V* identifierMap);
+    template<class T, class U, class V> void insertCacheInternal(std::unique_ptr<T> cacheEntry, U* cacheMap, V* identifierMap);
 
     // Helper method to remove a cache entry. Ownership is transferred to
     // deletionList. Use of Vector<> is handy when removing multiple entries.
-    template<class T, class U, class V> void removeFromCacheInternal(const T* cacheEntry, U* cacheMap, V* identifierMap, Vector<OwnPtr<CacheEntry>>* deletionList);
+    template<class T, class U, class V> void removeFromCacheInternal(const T* cacheEntry, U* cacheMap, V* identifierMap, Vector<std::unique_ptr<CacheEntry>>* deletionList);
 
     // Helper method to remove a cache entry. Uses the templated version base on
     // the type of cache entry.
-    void removeFromCacheInternal(const CacheEntry*, Vector<OwnPtr<CacheEntry>>* deletionList);
+    void removeFromCacheInternal(const CacheEntry*, Vector<std::unique_ptr<CacheEntry>>* deletionList);
 
     // Helper method to remove all cache entries associated with a ImageFraneGenerator.
     // Ownership of cache entries is transferred to deletionList.
-    template<class U, class V> void removeCacheIndexedByGeneratorInternal(U* cacheMap, V* identifierMap, const ImageFrameGenerator*, Vector<OwnPtr<CacheEntry>>* deletionList);
+    template<class U, class V> void removeCacheIndexedByGeneratorInternal(U* cacheMap, V* identifierMap, const ImageFrameGenerator*, Vector<std::unique_ptr<CacheEntry>>* deletionList);
 
     // Helper method to remove cache entry pointers from the LRU list.
-    void removeFromCacheListInternal(const Vector<OwnPtr<CacheEntry>>& deletionList);
+    void removeFromCacheListInternal(const Vector<std::unique_ptr<CacheEntry>>& deletionList);
 
     // A doubly linked list that maintains usage history of cache entries.
     // This is used for eviction of old entries.
     // Head of this list is the least recently used cache entry.
     // Tail of this list is the most recently used cache entry.
     DoublyLinkedList<CacheEntry> m_orderedCacheList;
 
     // A lookup table for all decoder cache objects. Owns all decoder cache objects.
-    typedef HashMap<DecoderCacheKey, OwnPtr<DecoderCacheEntry>> DecoderCacheMap;
+    typedef HashMap<DecoderCacheKey, std::unique_ptr<DecoderCacheEntry>> DecoderCacheMap;
     DecoderCacheMap m_decoderCacheMap;
 
     // A lookup table to map ImageFrameGenerator to all associated
     // decoder cache keys.
     typedef HashSet<DecoderCacheKey> DecoderCacheKeySet;
     typedef HashMap<const ImageFrameGenerator*, DecoderCacheKeySet> DecoderCacheKeyMap;
     DecoderCacheKeyMap m_decoderCacheKeyMap;
 
     size_t m_heapLimitInBytes;
     size_t m_heapMemoryUsageInBytes;
 
     // Protect concurrent access to these members:
     //   m_orderedCacheList
     //   m_decoderCacheMap and all CacheEntrys stored in it
     //   m_decoderCacheKeyMap
     //   m_heapLimitInBytes
     //   m_heapMemoryUsageInBytes
     // This mutex also protects calls to underlying skBitmap's
     // lockPixels()/unlockPixels() as they are not threadsafe.
     Mutex m_mutex;
 };
 
 } // namespace blink
 
 #endif