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

Side by Side Diff: third_party/WebKit/Source/platform/graphics/DeferredImageDecoder.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) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 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 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 13 matching lines...) Expand all
24 */ 24 */
25 25
26 #ifndef DeferredImageDecoder_h 26 #ifndef DeferredImageDecoder_h
27 #define DeferredImageDecoder_h 27 #define DeferredImageDecoder_h
28 28
29 #include "platform/PlatformExport.h" 29 #include "platform/PlatformExport.h"
30 #include "platform/geometry/IntSize.h" 30 #include "platform/geometry/IntSize.h"
31 #include "platform/image-decoders/ImageDecoder.h" 31 #include "platform/image-decoders/ImageDecoder.h"
32 #include "third_party/skia/include/core/SkBitmap.h" 32 #include "third_party/skia/include/core/SkBitmap.h"
33 #include "third_party/skia/include/core/SkPixelRef.h" 33 #include "third_party/skia/include/core/SkPixelRef.h"
34 #include "third_party/skia/include/core/SkRWBuffer.h"
35 #include "wtf/Allocator.h" 34 #include "wtf/Allocator.h"
36 #include "wtf/Forward.h" 35 #include "wtf/Forward.h"
37 #include "wtf/OwnPtr.h" 36 #include "wtf/OwnPtr.h"
38 #include "wtf/Vector.h" 37 #include "wtf/Vector.h"
39 38
40 class SkImage; 39 class SkImage;
41 40
42 namespace blink { 41 namespace blink {
43 42
44 class ImageFrameGenerator; 43 class ImageFrameGenerator;
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 explicit DeferredImageDecoder(PassOwnPtr<ImageDecoder> actualDecoder); 81 explicit DeferredImageDecoder(PassOwnPtr<ImageDecoder> actualDecoder);
83 82
84 friend class DeferredImageDecoderTest; 83 friend class DeferredImageDecoderTest;
85 ImageFrameGenerator* frameGenerator() { return m_frameGenerator.get(); } 84 ImageFrameGenerator* frameGenerator() { return m_frameGenerator.get(); }
86 85
87 void activateLazyDecoding(); 86 void activateLazyDecoding();
88 void prepareLazyDecodedFrames(); 87 void prepareLazyDecodedFrames();
89 88
90 PassRefPtr<SkImage> createFrameImageAtIndex(size_t index, bool knownToBeOpaq ue) const; 89 PassRefPtr<SkImage> createFrameImageAtIndex(size_t index, bool knownToBeOpaq ue) const;
91 90
92 // Copy of the data that is passed in, used by deferred decoding. 91 RefPtr<SharedBuffer> m_data;
93 // Allows creating readonly snapshots that may be read in another thread.
94 OwnPtr<SkRWBuffer> m_rwBuffer;
95 bool m_allDataReceived; 92 bool m_allDataReceived;
93 unsigned m_lastDataSize;
96 OwnPtr<ImageDecoder> m_actualDecoder; 94 OwnPtr<ImageDecoder> m_actualDecoder;
97 95
98 String m_filenameExtension; 96 String m_filenameExtension;
99 IntSize m_size; 97 IntSize m_size;
100 int m_repetitionCount; 98 int m_repetitionCount;
101 bool m_hasColorProfile; 99 bool m_hasColorProfile;
102 bool m_canYUVDecode; 100 bool m_canYUVDecode;
103 101
104 // Carries only frame state and other information. Does not carry bitmap. 102 // Carries only frame state and other information. Does not carry bitmap.
105 Vector<FrameData> m_frameData; 103 Vector<FrameData> m_frameData;
106 RefPtr<ImageFrameGenerator> m_frameGenerator; 104 RefPtr<ImageFrameGenerator> m_frameGenerator;
107 105
108 static bool s_enabled; 106 static bool s_enabled;
109 }; 107 };
110 108
111 } // namespace blink 109 } // namespace blink
112 110
113 #endif 111 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698