| 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 * | 7 * |
| 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 12 matching lines...) Expand all Loading... |
| 23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 24 */ | 24 */ |
| 25 | 25 |
| 26 #include "config.h" | 26 #include "config.h" |
| 27 #include "platform/graphics/DecodingImageGenerator.h" | 27 #include "platform/graphics/DecodingImageGenerator.h" |
| 28 | 28 |
| 29 #include "SkData.h" | 29 #include "SkData.h" |
| 30 #include "SkImageInfo.h" | 30 #include "SkImageInfo.h" |
| 31 #include "platform/PlatformInstrumentation.h" | 31 #include "platform/PlatformInstrumentation.h" |
| 32 #include "platform/SharedBuffer.h" | 32 #include "platform/SharedBuffer.h" |
| 33 #include "platform/TraceEvent.h" | |
| 34 #include "platform/graphics/ImageFrameGenerator.h" | 33 #include "platform/graphics/ImageFrameGenerator.h" |
| 34 #include "wtf/TraceEvent.h" |
| 35 | 35 |
| 36 namespace WebCore { | 36 namespace WebCore { |
| 37 | 37 |
| 38 DecodingImageGenerator::DecodingImageGenerator(PassRefPtr<ImageFrameGenerator> f
rameGenerator, const SkImageInfo& info, size_t index) | 38 DecodingImageGenerator::DecodingImageGenerator(PassRefPtr<ImageFrameGenerator> f
rameGenerator, const SkImageInfo& info, size_t index) |
| 39 : m_frameGenerator(frameGenerator) | 39 : m_frameGenerator(frameGenerator) |
| 40 , m_imageInfo(info) | 40 , m_imageInfo(info) |
| 41 , m_frameIndex(index) | 41 , m_frameIndex(index) |
| 42 , m_generationId(0) | 42 , m_generationId(0) |
| 43 { | 43 { |
| 44 } | 44 } |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 77 ASSERT(info.fHeight == m_imageInfo.fHeight); | 77 ASSERT(info.fHeight == m_imageInfo.fHeight); |
| 78 ASSERT(info.fColorType == m_imageInfo.fColorType); | 78 ASSERT(info.fColorType == m_imageInfo.fColorType); |
| 79 ASSERT(info.fAlphaType == m_imageInfo.fAlphaType); | 79 ASSERT(info.fAlphaType == m_imageInfo.fAlphaType); |
| 80 PlatformInstrumentation::willDecodeLazyPixelRef(m_generationId); | 80 PlatformInstrumentation::willDecodeLazyPixelRef(m_generationId); |
| 81 bool decoded = m_frameGenerator->decodeAndScale(m_imageInfo, m_frameIndex, p
ixels, rowBytes); | 81 bool decoded = m_frameGenerator->decodeAndScale(m_imageInfo, m_frameIndex, p
ixels, rowBytes); |
| 82 PlatformInstrumentation::didDecodeLazyPixelRef(m_generationId); | 82 PlatformInstrumentation::didDecodeLazyPixelRef(m_generationId); |
| 83 return decoded; | 83 return decoded; |
| 84 } | 84 } |
| 85 | 85 |
| 86 } // namespace blink | 86 } // namespace blink |
| OLD | NEW |