Remove the use of OwnedPtrDeleter in ImageDecoder.

third_party/WebKit/Source/platform/image-decoders/ImageDecoder.h

 /*
  * Copyright (C) 2006 Apple Computer, Inc.  All rights reserved.
  * Copyright (C) Research In Motion Limited 2009-2010. 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
@@ skipping 23 matching lines @@
 #include "platform/image-decoders/ImageAnimation.h"
 #include "platform/image-decoders/ImageFrame.h"
 #include "platform/image-decoders/SegmentReader.h"
 #include "public/platform/Platform.h"
 #include "wtf/Assertions.h"
 #include "wtf/PassOwnPtr.h"
 #include "wtf/RefPtr.h"
 #include "wtf/Threading.h"
 #include "wtf/Vector.h"
 #include "wtf/text/WTFString.h"
+#include <memory>
 
 #if USE(QCMSLIB)
 #include "qcms.h"
+#endif
 
-namespace WTF {
+namespace blink {
 
-template <typename T>
-struct OwnedPtrDeleter;
-template <>
-struct OwnedPtrDeleter<qcms_transform> {
-    static void deletePtr(qcms_transform* transform)
+#if USE(QCMSLIB)
+
+struct QCMSTransformDeleter {
+    void operator()(qcms_transform* transform)
     {
         if (transform)
             qcms_transform_release(transform);
     }
 };
 
-template <typename T>
-struct OwnedPtrDeleter;
-template <>
-struct OwnedPtrDeleter<qcms_profile> {
-    static void deletePtr(qcms_profile* profile)
+using QCMSTransformUniquePtr = std::unique_ptr<qcms_transform, QCMSTransformDeleter>;
+
+struct QCMSProfileDeleter {

[urvang, 2016/06/06 15:56:03]

64 to 72 can technically be moved to the cpp file, right?

[Yuta Kitamura, 2016/06/07 05:25:40]

Yeah, fixed in PS2.

+    void operator()(qcms_profile* profile)
     {
         if (profile)
             qcms_profile_release(profile);
     }
 };
 
-} // namespace WTF
+using QCMSProfileUniquePtr = std::unique_ptr<qcms_profile, QCMSProfileDeleter>;
 
 #endif // USE(QCMSLIB)
 
-namespace blink {
-
 // ImagePlanes can be used to decode color components into provided buffers instead of using an ImageFrame.
 class PLATFORM_EXPORT ImagePlanes final {
     USING_FAST_MALLOC(ImagePlanes);
     WTF_MAKE_NONCOPYABLE(ImagePlanes);
 public:
     ImagePlanes();
     ImagePlanes(void* planes[3], const size_t rowBytes[3]);
 
     void* plane(int);
     size_t rowBytes(int) const;
@@ skipping 252 matching lines @@
                                       * static_cast<unsigned long long>(height);
         return total_size > ((1 << 29) - 1);
     }
 
     IntSize m_size;
     bool m_sizeAvailable;
     bool m_isAllDataReceived;
     bool m_failed;
 
 #if USE(QCMSLIB)
-    OwnPtr<qcms_transform> m_sourceToOutputDeviceColorTransform;
+    QCMSTransformUniquePtr m_sourceToOutputDeviceColorTransform;
 #endif
 };
 
 } // namespace blink
 
 #endif