| 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) 2007 Alp Toker <alp.toker@collabora.co.uk> | 3 * Copyright (C) 2007 Alp Toker <alp.toker@collabora.co.uk> |
| 4 * Copyright (C) 2008, Google Inc. All rights reserved. | 4 * Copyright (C) 2008, Google Inc. All rights reserved. |
| 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 12 matching lines...) Expand all Loading... |
| 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 #include "config.h" | 28 #include "config.h" |
| 29 #include "core/platform/graphics/ImageSource.h" | 29 #include "core/platform/graphics/ImageSource.h" |
| 30 | 30 |
| 31 #include "core/platform/graphics/DeferredImageDecoder.h" | 31 #include "core/platform/graphics/DeferredImageDecoder.h" |
| 32 #include "core/platform/image-decoders/ImageDecoder.h" | 32 #include "core/platform/image-decoders/ImageDecoder.h" |
| 33 #include "platform/graphics/ImageOrientation.h" | |
| 34 #include "wtf/PassOwnPtr.h" | 33 #include "wtf/PassOwnPtr.h" |
| 35 #include "wtf/PassRefPtr.h" | 34 #include "wtf/PassRefPtr.h" |
| 36 | 35 |
| 37 namespace WebCore { | 36 namespace WebCore { |
| 38 | 37 |
| 39 ImageSource::ImageSource(ImageSource::AlphaOption alphaOption, ImageSource::Gamm
aAndColorProfileOption gammaAndColorProfileOption) | 38 ImageSource::ImageSource(ImageSource::AlphaOption alphaOption, ImageSource::Gamm
aAndColorProfileOption gammaAndColorProfileOption) |
| 40 : m_alphaOption(alphaOption) | 39 : m_alphaOption(alphaOption) |
| 41 , m_gammaAndColorProfileOption(gammaAndColorProfileOption) | 40 , m_gammaAndColorProfileOption(gammaAndColorProfileOption) |
| 42 { | 41 { |
| 43 } | 42 } |
| (...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 161 } | 160 } |
| 162 | 161 |
| 163 unsigned ImageSource::frameBytesAtIndex(size_t index) const | 162 unsigned ImageSource::frameBytesAtIndex(size_t index) const |
| 164 { | 163 { |
| 165 if (!m_decoder) | 164 if (!m_decoder) |
| 166 return 0; | 165 return 0; |
| 167 return m_decoder->frameBytesAtIndex(index); | 166 return m_decoder->frameBytesAtIndex(index); |
| 168 } | 167 } |
| 169 | 168 |
| 170 } | 169 } |
| OLD | NEW |