OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2006 Apple Computer, Inc. All rights reserved. | 2 * Copyright (C) 2006 Apple Computer, Inc. All rights reserved. |
3 * Copyright (C) 2008, 2009 Google, Inc. | 3 * Copyright (C) 2008, 2009 Google, Inc. |
4 * | 4 * |
5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
7 * are met: | 7 * are met: |
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 10 matching lines...) Expand all Loading... |
21 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY | 21 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY |
22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
25 */ | 25 */ |
26 | 26 |
27 #include "config.h" | 27 #include "config.h" |
28 #include "ImageDecoder.h" | 28 #include "ImageDecoder.h" |
29 | 29 |
30 #include "NativeImageSkia.h" | 30 #include "NativeImageSkia.h" |
31 #include "PlatformMemoryInstrumentation.h" | |
32 | 31 |
33 namespace WebCore { | 32 namespace WebCore { |
34 | 33 |
35 ImageFrame::ImageFrame() | 34 ImageFrame::ImageFrame() |
36 : m_bitmap(NativeImageSkia::create()) | 35 : m_bitmap(NativeImageSkia::create()) |
37 , m_allocator(0) | 36 , m_allocator(0) |
38 , m_hasAlpha(false) | 37 , m_hasAlpha(false) |
39 , m_status(FrameEmpty) | 38 , m_status(FrameEmpty) |
40 , m_duration(0) | 39 , m_duration(0) |
41 , m_disposalMethod(DisposeNotSpecified) | 40 , m_disposalMethod(DisposeNotSpecified) |
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
135 | 134 |
136 void ImageFrame::setStatus(FrameStatus status) | 135 void ImageFrame::setStatus(FrameStatus status) |
137 { | 136 { |
138 m_status = status; | 137 m_status = status; |
139 if (m_status == FrameComplete) { | 138 if (m_status == FrameComplete) { |
140 m_bitmap->bitmap().setIsOpaque(!m_hasAlpha); | 139 m_bitmap->bitmap().setIsOpaque(!m_hasAlpha); |
141 m_bitmap->setDataComplete(); // Tell the bitmap it's done. | 140 m_bitmap->setDataComplete(); // Tell the bitmap it's done. |
142 } | 141 } |
143 } | 142 } |
144 | 143 |
145 void ImageFrame::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const | |
146 { | |
147 MemoryClassInfo info(memoryObjectInfo, this, PlatformMemoryTypes::Image); | |
148 info.addMember(m_bitmap, "bitmap"); | |
149 } | |
150 | |
151 } // namespace WebCore | 144 } // namespace WebCore |
OLD | NEW |