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

Side by Side Diff: Source/platform/graphics/FrameData.h

Issue 1001703003: Take NativeImageSkia out behind the woodshed. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Switch to skia-style API (return bool instead of SkBitmap) Created 5 years, 9 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 | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com) 2 * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
3 * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc. All rights reserved. 3 * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc. All rights reserved.
4 * Copyright (C) 2008-2009 Torch Mobile, Inc. 4 * Copyright (C) 2008-2009 Torch Mobile, Inc.
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions 7 * modification, are permitted provided that the following conditions
8 * are met: 8 * are met:
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 11 matching lines...) Expand all
22 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 22 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
23 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 23 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
25 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28 #ifndef FrameData_h 28 #ifndef FrameData_h
29 #define FrameData_h 29 #define FrameData_h
30 30
31 #include "platform/graphics/ImageOrientation.h" 31 #include "platform/graphics/ImageOrientation.h"
32 #include "third_party/skia/include/core/SkBitmap.h"
32 #include "wtf/Noncopyable.h" 33 #include "wtf/Noncopyable.h"
33 #include "wtf/RefPtr.h" 34 #include "wtf/RefPtr.h"
34 #include "wtf/VectorTraits.h" 35 #include "wtf/VectorTraits.h"
35 36
36 namespace blink { 37 namespace blink {
37 38
38 class NativeImageSkia;
39
40 struct FrameData { 39 struct FrameData {
41 WTF_MAKE_NONCOPYABLE(FrameData); 40 WTF_MAKE_NONCOPYABLE(FrameData);
42 public: 41 public:
43 FrameData(); 42 FrameData();
44 ~FrameData(); 43 ~FrameData();
45 44
46 // Clear the cached image data on the frame, and (optionally) the metadata. 45 // Clear the cached image data on the frame, and (optionally) the metadata.
47 // Returns whether there was cached image data to clear. 46 // Returns whether there was cached image data to clear.
48 bool clear(bool clearMetadata); 47 bool clear(bool clearMetadata);
49 48
50 RefPtr<NativeImageSkia> m_frame; 49 SkBitmap m_frame;
51 ImageOrientation m_orientation; 50 ImageOrientation m_orientation;
52 float m_duration; 51 float m_duration;
53 bool m_haveMetadata : 1; 52 bool m_haveMetadata : 1;
54 bool m_isComplete : 1; 53 bool m_isComplete : 1;
55 bool m_hasAlpha : 1; 54 bool m_hasAlpha : 1;
56 unsigned m_frameBytes; 55 unsigned m_frameBytes;
57 }; 56 };
58 57
59 } // namespace blink 58 } // namespace blink
60 59
61 namespace WTF { 60 namespace WTF {
62 template<> struct VectorTraits<blink::FrameData> : public SimpleClassVectorTrait s<blink::FrameData> { 61 template<> struct VectorTraits<blink::FrameData> : public SimpleClassVectorTrait s<blink::FrameData> {
63 static const bool canInitializeWithMemset = false; // Not all FrameData memb ers initialize to 0. 62 static const bool canInitializeWithMemset = false; // Not all FrameData memb ers initialize to 0.
64 }; 63 };
65 } 64 }
66 65
67 #endif // FrameData_h 66 #endif // FrameData_h
OLDNEW
« no previous file with comments | « Source/platform/graphics/DeferredImageDecoderTest.cpp ('k') | Source/platform/graphics/FrameData.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698