webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 9 insertions, 13 deletions

diff --git a/Source/WebCore/platform/image-decoders/bmp/BMPImageDecoder.h b/Source/WebCore/platform/image-decoders/bmp/BMPImageDecoder.h
index f5b9d5e27..6b6270ce1 100644
--- a/Source/WebCore/platform/image-decoders/bmp/BMPImageDecoder.h
+++ b/Source/WebCore/platform/image-decoders/bmp/BMPImageDecoder.h
@@ -28,28 +28,26 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef BMPImageDecoder_h
-#define BMPImageDecoder_h
+#pragma once
 
 #include "BMPImageReader.h"
-#include <wtf/OwnPtr.h>
 
 namespace WebCore {
 
     // This class decodes the BMP image format.
-    class BMPImageDecoder : public ImageDecoder {
+    class BMPImageDecoder final : public ImageDecoder {
     public:
-        BMPImageDecoder(ImageSource::AlphaOption, ImageSource::GammaAndColorProfileOption);
+        BMPImageDecoder(AlphaOption, GammaAndColorProfileOption);
 
         // ImageDecoder
-        virtual String filenameExtension() const { return "bmp"; }
-        virtual void setData(SharedBuffer*, bool allDataReceived);
-        virtual bool isSizeAvailable();
-        virtual ImageFrame* frameBufferAtIndex(size_t index);
+        String filenameExtension() const override { return "bmp"; }
+        void setData(SharedBuffer&, bool allDataReceived) override;
+        bool isSizeAvailable() override;
+        ImageFrame* frameBufferAtIndex(size_t index) override;
         // CAUTION: setFailed() deletes |m_reader|.  Be careful to avoid
         // accessing deleted memory, especially when calling this from inside
         // BMPImageReader!
-        virtual bool setFailed();
+        bool setFailed() override;
 
     private:
         inline uint32_t readUint32(int offset) const
@@ -77,9 +75,7 @@ namespace WebCore {
         size_t m_decodedOffset;
 
         // The reader used to do most of the BMP decoding.
-        OwnPtr<BMPImageReader> m_reader;
+        std::unique_ptr<BMPImageReader> m_reader;
     };
 
 } // namespace WebCore
-
-#endif