OLD | NEW |
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 are | 5 * modification, are permitted provided that the following conditions are |
6 * met: | 6 * met: |
7 * | 7 * |
8 * * Redistributions of source code must retain the above copyright | 8 * * 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 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
(...skipping 16 matching lines...) Expand all Loading... |
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
29 */ | 29 */ |
30 | 30 |
31 #include "config.h" | 31 #include "config.h" |
32 #include "WebImageDecoder.h" | 32 #include "WebImageDecoder.h" |
33 | 33 |
34 #include "core/platform/SharedBuffer.h" | 34 #include "core/platform/SharedBuffer.h" |
35 #include "core/platform/image-decoders/bmp/BMPImageDecoder.h" | 35 #include "core/platform/image-decoders/bmp/BMPImageDecoder.h" |
36 #include "core/platform/image-decoders/ico/ICOImageDecoder.h" | 36 #include "core/platform/image-decoders/ico/ICOImageDecoder.h" |
| 37 #include "wtf/CPU.h" |
| 38 #include "wtf/OwnPtr.h" |
| 39 #include "wtf/PassOwnPtr.h" |
| 40 #include "wtf/PassRefPtr.h" |
37 #include <public/WebData.h> | 41 #include <public/WebData.h> |
38 #include <public/WebImage.h> | 42 #include <public/WebImage.h> |
39 #include <public/WebSize.h> | 43 #include <public/WebSize.h> |
40 #include <wtf/OwnPtr.h> | |
41 #include <wtf/PassOwnPtr.h> | |
42 #include <wtf/PassRefPtr.h> | |
43 | 44 |
44 using namespace WebCore; | 45 using namespace WebCore; |
45 | 46 |
46 namespace WebKit { | 47 namespace WebKit { |
47 | 48 |
48 void WebImageDecoder::reset() | 49 void WebImageDecoder::reset() |
49 { | 50 { |
50 delete m_private; | 51 delete m_private; |
51 } | 52 } |
52 | 53 |
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
105 { | 106 { |
106 ASSERT(m_private); | 107 ASSERT(m_private); |
107 ImageFrame* const frameBuffer = m_private->frameBufferAtIndex(index); | 108 ImageFrame* const frameBuffer = m_private->frameBufferAtIndex(index); |
108 if (!frameBuffer) | 109 if (!frameBuffer) |
109 return WebImage(); | 110 return WebImage(); |
110 RefPtr<NativeImageSkia> image = frameBuffer->asNewNativeImage(); | 111 RefPtr<NativeImageSkia> image = frameBuffer->asNewNativeImage(); |
111 return WebImage(image->bitmap()); | 112 return WebImage(image->bitmap()); |
112 } | 113 } |
113 | 114 |
114 } // namespace WebKit | 115 } // namespace WebKit |
OLD | NEW |