| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  * Copyright (C) 2012 Google Inc. All rights reserved. | 2  * Copyright (C) 2012 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 | 5  * modification, are permitted provided that the following conditions | 
| 6  * are met: | 6  * are met: | 
| 7  * 1. Redistributions of source code must retain the above copyright | 7  * 1. Redistributions of source code must retain the above copyright | 
| 8  *    notice, this list of conditions and the following disclaimer. | 8  *    notice, this list of conditions and the following disclaimer. | 
| 9  * 2. Redistributions in binary form must reproduce the above copyright | 9  * 2. Redistributions in binary form must reproduce the above copyright | 
| 10  *    notice, this list of conditions and the following disclaimer in the | 10  *    notice, this list of conditions and the following disclaimer in the | 
| 11  *    documentation and/or other materials provided with the distribution. | 11  *    documentation and/or other materials provided with the distribution. | 
| 12  * | 12  * | 
| 13  * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY | 13  * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY | 
| 14  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 14  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 
| 15  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 15  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 
| 16  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR | 16  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR | 
| 17  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | 17  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | 
| 18  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | 18  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | 
| 19  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | 19  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | 
| 20  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY | 20  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY | 
| 21  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 21  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 
| 22  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 22  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 
| 23  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 
| 24  */ | 24  */ | 
| 25 | 25 | 
| 26 #ifndef ImageFrameGenerator_h | 26 #ifndef ImageFrameGenerator_h | 
| 27 #define ImageFrameGenerator_h | 27 #define ImageFrameGenerator_h | 
| 28 | 28 | 
|  | 29 #include <memory> | 
| 29 #include "platform/PlatformExport.h" | 30 #include "platform/PlatformExport.h" | 
| 30 #include "platform/image-decoders/ImageDecoder.h" | 31 #include "platform/image-decoders/ImageDecoder.h" | 
| 31 #include "platform/image-decoders/SegmentReader.h" | 32 #include "platform/image-decoders/SegmentReader.h" | 
| 32 #include "third_party/skia/include/core/SkBitmap.h" | 33 #include "third_party/skia/include/core/SkBitmap.h" | 
| 33 #include "third_party/skia/include/core/SkSize.h" | 34 #include "third_party/skia/include/core/SkSize.h" | 
| 34 #include "third_party/skia/include/core/SkTypes.h" | 35 #include "third_party/skia/include/core/SkTypes.h" | 
| 35 #include "wtf/Allocator.h" | 36 #include "wtf/Allocator.h" | 
| 36 #include "wtf/Noncopyable.h" | 37 #include "wtf/Noncopyable.h" | 
| 37 #include "wtf/PassRefPtr.h" | 38 #include "wtf/PassRefPtr.h" | 
| 38 #include "wtf/RefCounted.h" | 39 #include "wtf/RefCounted.h" | 
| 39 #include "wtf/RefPtr.h" | 40 #include "wtf/RefPtr.h" | 
| 40 #include "wtf/ThreadSafeRefCounted.h" | 41 #include "wtf/ThreadSafeRefCounted.h" | 
| 41 #include "wtf/ThreadingPrimitives.h" | 42 #include "wtf/ThreadingPrimitives.h" | 
| 42 #include "wtf/Vector.h" | 43 #include "wtf/Vector.h" | 
| 43 #include <memory> |  | 
| 44 | 44 | 
| 45 struct SkYUVSizeInfo; | 45 struct SkYUVSizeInfo; | 
| 46 | 46 | 
| 47 namespace blink { | 47 namespace blink { | 
| 48 | 48 | 
| 49 class ImageDecoder; | 49 class ImageDecoder; | 
| 50 | 50 | 
| 51 class PLATFORM_EXPORT ImageDecoderFactory { | 51 class PLATFORM_EXPORT ImageDecoderFactory { | 
| 52   USING_FAST_MALLOC(ImageDecoderFactory); | 52   USING_FAST_MALLOC(ImageDecoderFactory); | 
| 53   WTF_MAKE_NONCOPYABLE(ImageDecoderFactory); | 53   WTF_MAKE_NONCOPYABLE(ImageDecoderFactory); | 
| (...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 151   // Prevents multiple decode operations on the same data. | 151   // Prevents multiple decode operations on the same data. | 
| 152   Mutex m_decodeMutex; | 152   Mutex m_decodeMutex; | 
| 153 | 153 | 
| 154   // Protect concurrent access to m_hasAlpha. | 154   // Protect concurrent access to m_hasAlpha. | 
| 155   Mutex m_alphaMutex; | 155   Mutex m_alphaMutex; | 
| 156 }; | 156 }; | 
| 157 | 157 | 
| 158 }  // namespace blink | 158 }  // namespace blink | 
| 159 | 159 | 
| 160 #endif | 160 #endif | 
| OLD | NEW | 
|---|