Revert of Eliminate copies of encoded image data

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 15 matching lines @@
 
 #ifndef ImageDecoder_h
 #define ImageDecoder_h
 
 #include "SkColorPriv.h"
 #include "platform/PlatformExport.h"
 #include "platform/SharedBuffer.h"
 #include "platform/graphics/ImageOrientation.h"
 #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"
 
 #if USE(QCMSLIB)
 #include "qcms.h"
@@ skipping 69 matching lines @@
         , m_sizeAvailable(false)
         , m_isAllDataReceived(false)
         , m_failed(false) { }
 
     virtual ~ImageDecoder() { }
 
     // Returns a caller-owned decoder of the appropriate type.  Returns 0 if
     // we can't sniff a supported type from the provided data (possibly
     // because there isn't enough data yet).
     // Sets m_maxDecodedBytes to Platform::maxImageDecodedBytes().
-    static PassOwnPtr<ImageDecoder> create(const char* data, size_t length, AlphaOption, GammaAndColorProfileOption);
-    static PassOwnPtr<ImageDecoder> create(const SharedBuffer&, AlphaOption, GammaAndColorProfileOption);
-    static PassOwnPtr<ImageDecoder> create(const SegmentReader&, AlphaOption, GammaAndColorProfileOption);
+    static PassOwnPtr<ImageDecoder> create(const SharedBuffer& data, AlphaOption, GammaAndColorProfileOption);
 
     virtual String filenameExtension() const = 0;
 
     bool isAllDataReceived() const { return m_isAllDataReceived; }
 
-    void setData(PassRefPtr<SegmentReader> data, bool allDataReceived)
+    void setData(SharedBuffer* data, bool allDataReceived)
     {
         if (m_failed)
             return;
         m_data = data;
         m_isAllDataReceived = allDataReceived;
-        onSetData(m_data.get());
+        onSetData(data);
     }
 
-    void setData(PassRefPtr<SharedBuffer> data, bool allDataReceived)
-    {
-        setData(SegmentReader::createFromSharedBuffer(data), allDataReceived);
-    }
-
-    virtual void onSetData(SegmentReader* data) { }
+    virtual void onSetData(SharedBuffer* data) { }
 
     bool isSizeAvailable()
     {
         if (m_failed)
             return false;
         if (!m_sizeAvailable)
             decodeSize();
         return isDecodedSizeAvailable();
     }
 
@@ skipping 152 matching lines @@
     // returns that number.
     virtual size_t decodeFrameCount() { return 1; }
 
     // Performs any additional setup of the requested frame after it has been
     // initially created, e.g. setting a duration or disposal method.
     virtual void initializeNewFrame(size_t) { }
 
     // Decodes the requested frame.
     virtual void decode(size_t) = 0;
 
-    RefPtr<SegmentReader> m_data; // The encoded data.
+    RefPtr<SharedBuffer> m_data; // The encoded data.
     Vector<ImageFrame, 1> m_frameBufferCache;
     bool m_premultiplyAlpha;
     bool m_ignoreGammaAndColorProfile;
     ImageOrientation m_orientation;
 
     // The maximum amount of memory a decoded image should require. Ideally,
     // image decoders should downsample large images to fit under this limit
     // (and then return the downsampled size from decodedSize()). Ignoring
     // this limit can cause excessive memory use or even crashes on low-
     // memory devices.
@@ skipping 15 matching lines @@
     bool m_failed;
 
 #if USE(QCMSLIB)
     OwnPtr<qcms_transform> m_sourceToOutputDeviceColorTransform;
 #endif
 };
 
 } // namespace blink
 
 #endif