| 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) Research In Motion Limited 2009-2010. All rights reserved. | 3 * Copyright (C) Research In Motion Limited 2009-2010. All rights reserved. |
| 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 |
| 11 * notice, this list of conditions and the following disclaimer in the | 11 * notice, this list of conditions and the following disclaimer in the |
| 12 * documentation and/or other materials provided with the distribution. | 12 * documentation and/or other materials provided with the distribution. |
| 13 * | 13 * |
| 14 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY | 14 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY |
| 15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
| 16 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 16 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR |
| 17 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR | 17 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR |
| 18 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | 18 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, |
| 19 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | 19 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, |
| 20 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | 20 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR |
| 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 #ifndef ImageDecoder_h | 27 #ifndef ImageDecoder_h |
| 28 #define ImageDecoder_h | 28 #define ImageDecoder_h |
| 29 | 29 |
| 30 #include <memory> |
| 30 #include "SkColorPriv.h" | 31 #include "SkColorPriv.h" |
| 31 #include "SkColorSpaceXform.h" | 32 #include "SkColorSpaceXform.h" |
| 32 #include "platform/PlatformExport.h" | 33 #include "platform/PlatformExport.h" |
| 33 #include "platform/SharedBuffer.h" | 34 #include "platform/SharedBuffer.h" |
| 34 #include "platform/graphics/ColorBehavior.h" | 35 #include "platform/graphics/ColorBehavior.h" |
| 35 #include "platform/graphics/ImageOrientation.h" | 36 #include "platform/graphics/ImageOrientation.h" |
| 36 #include "platform/image-decoders/ImageAnimation.h" | 37 #include "platform/image-decoders/ImageAnimation.h" |
| 37 #include "platform/image-decoders/ImageFrame.h" | 38 #include "platform/image-decoders/ImageFrame.h" |
| 38 #include "platform/image-decoders/SegmentReader.h" | 39 #include "platform/image-decoders/SegmentReader.h" |
| 39 #include "public/platform/Platform.h" | 40 #include "public/platform/Platform.h" |
| 40 #include "wtf/Assertions.h" | 41 #include "wtf/Assertions.h" |
| 41 #include "wtf/RefPtr.h" | 42 #include "wtf/RefPtr.h" |
| 42 #include "wtf/Threading.h" | 43 #include "wtf/Threading.h" |
| 43 #include "wtf/Vector.h" | 44 #include "wtf/Vector.h" |
| 44 #include "wtf/text/WTFString.h" | 45 #include "wtf/text/WTFString.h" |
| 45 #include <memory> | |
| 46 | 46 |
| 47 namespace blink { | 47 namespace blink { |
| 48 | 48 |
| 49 #if SK_B32_SHIFT | 49 #if SK_B32_SHIFT |
| 50 inline SkColorSpaceXform::ColorFormat xformColorFormat() { | 50 inline SkColorSpaceXform::ColorFormat xformColorFormat() { |
| 51 return SkColorSpaceXform::kRGBA_8888_ColorFormat; | 51 return SkColorSpaceXform::kRGBA_8888_ColorFormat; |
| 52 } | 52 } |
| 53 #else | 53 #else |
| 54 inline SkColorSpaceXform::ColorFormat xformColorFormat() { | 54 inline SkColorSpaceXform::ColorFormat xformColorFormat() { |
| 55 return SkColorSpaceXform::kBGRA_8888_ColorFormat; | 55 return SkColorSpaceXform::kBGRA_8888_ColorFormat; |
| (...skipping 363 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 419 bool m_hasHistogrammedColorSpace = false; | 419 bool m_hasHistogrammedColorSpace = false; |
| 420 | 420 |
| 421 sk_sp<SkColorSpace> m_embeddedColorSpace = nullptr; | 421 sk_sp<SkColorSpace> m_embeddedColorSpace = nullptr; |
| 422 bool m_sourceToTargetColorTransformNeedsUpdate = false; | 422 bool m_sourceToTargetColorTransformNeedsUpdate = false; |
| 423 std::unique_ptr<SkColorSpaceXform> m_sourceToTargetColorTransform; | 423 std::unique_ptr<SkColorSpaceXform> m_sourceToTargetColorTransform; |
| 424 }; | 424 }; |
| 425 | 425 |
| 426 } // namespace blink | 426 } // namespace blink |
| 427 | 427 |
| 428 #endif | 428 #endif |
| OLD | NEW |