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

Side by Side Diff: third_party/WebKit/Source/platform/image-decoders/webp/WEBPImageDecoder.h

Issue 1866243003: Revert of Eliminate copies of encoded image data (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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2010 Google Inc. All rights reserved. 2 * Copyright (C) 2010 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 12 matching lines...) Expand all
23 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 23 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
24 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 24 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27 */ 27 */
28 28
29 #ifndef WEBPImageDecoder_h 29 #ifndef WEBPImageDecoder_h
30 #define WEBPImageDecoder_h 30 #define WEBPImageDecoder_h
31 31
32 #include "platform/image-decoders/ImageDecoder.h" 32 #include "platform/image-decoders/ImageDecoder.h"
33 #include "third_party/skia/include/core/SkData.h"
34 #include "webp/decode.h" 33 #include "webp/decode.h"
35 #include "webp/demux.h" 34 #include "webp/demux.h"
36 #include "wtf/RefPtr.h"
37 35
38 namespace blink { 36 namespace blink {
39 37
40 class PLATFORM_EXPORT WEBPImageDecoder final : public ImageDecoder { 38 class PLATFORM_EXPORT WEBPImageDecoder final : public ImageDecoder {
41 WTF_MAKE_NONCOPYABLE(WEBPImageDecoder); 39 WTF_MAKE_NONCOPYABLE(WEBPImageDecoder);
42 public: 40 public:
43 WEBPImageDecoder(AlphaOption, GammaAndColorProfileOption, size_t maxDecodedB ytes); 41 WEBPImageDecoder(AlphaOption, GammaAndColorProfileOption, size_t maxDecodedB ytes);
44 ~WEBPImageDecoder() override; 42 ~WEBPImageDecoder() override;
45 43
46 // ImageDecoder: 44 // ImageDecoder:
47 String filenameExtension() const override { return "webp"; } 45 String filenameExtension() const override { return "webp"; }
48 void onSetData(SegmentReader* data) override; 46 void onSetData(SharedBuffer* data) override;
49 int repetitionCount() const override; 47 int repetitionCount() const override;
50 bool frameIsCompleteAtIndex(size_t) const override; 48 bool frameIsCompleteAtIndex(size_t) const override;
51 float frameDurationAtIndex(size_t) const override; 49 float frameDurationAtIndex(size_t) const override;
52 size_t clearCacheExceptFrame(size_t) override; 50 size_t clearCacheExceptFrame(size_t) override;
53 51
54 private: 52 private:
55 // ImageDecoder: 53 // ImageDecoder:
56 virtual void decodeSize() { updateDemuxer(); } 54 virtual void decodeSize() { updateDemuxer(); }
57 size_t decodeFrameCount() override; 55 size_t decodeFrameCount() override;
58 void initializeNewFrame(size_t) override; 56 void initializeNewFrame(size_t) override;
(...skipping 19 matching lines...) Expand all
78 WebPDemuxState m_demuxState; 76 WebPDemuxState m_demuxState;
79 bool m_haveAlreadyParsedThisData; 77 bool m_haveAlreadyParsedThisData;
80 int m_repetitionCount; 78 int m_repetitionCount;
81 int m_decodedHeight; 79 int m_decodedHeight;
82 80
83 typedef void (*AlphaBlendFunction)(ImageFrame&, ImageFrame&, int, int, int); 81 typedef void (*AlphaBlendFunction)(ImageFrame&, ImageFrame&, int, int, int);
84 AlphaBlendFunction m_blendFunction; 82 AlphaBlendFunction m_blendFunction;
85 83
86 void clear(); 84 void clear();
87 void clearDecoder(); 85 void clearDecoder();
88
89 // FIXME: Update libwebp's API so it does not require copying the data on ea ch update.
90 RefPtr<SkData> m_consolidatedData;
91 }; 86 };
92 87
93 } // namespace blink 88 } // namespace blink
94 89
95 #endif 90 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698