| 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 |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 83 | 83 |
| 84 std::unique_ptr<DeferredImageDecoder> DeferredImageDecoder::createForTesting( | 84 std::unique_ptr<DeferredImageDecoder> DeferredImageDecoder::createForTesting( |
| 85 std::unique_ptr<ImageDecoder> actualDecoder) { | 85 std::unique_ptr<ImageDecoder> actualDecoder) { |
| 86 return wrapUnique(new DeferredImageDecoder(std::move(actualDecoder))); | 86 return wrapUnique(new DeferredImageDecoder(std::move(actualDecoder))); |
| 87 } | 87 } |
| 88 | 88 |
| 89 DeferredImageDecoder::DeferredImageDecoder( | 89 DeferredImageDecoder::DeferredImageDecoder( |
| 90 std::unique_ptr<ImageDecoder> actualDecoder) | 90 std::unique_ptr<ImageDecoder> actualDecoder) |
| 91 : m_allDataReceived(false), | 91 : m_allDataReceived(false), |
| 92 m_actualDecoder(std::move(actualDecoder)), | 92 m_actualDecoder(std::move(actualDecoder)), |
| 93 m_targetColorSpace(m_actualDecoder->targetColorSpace()), |
| 93 m_repetitionCount(cAnimationNone), | 94 m_repetitionCount(cAnimationNone), |
| 94 m_canYUVDecode(false), | 95 m_canYUVDecode(false), |
| 95 m_hasHotSpot(false) {} | 96 m_hasHotSpot(false) {} |
| 96 | 97 |
| 97 DeferredImageDecoder::~DeferredImageDecoder() {} | 98 DeferredImageDecoder::~DeferredImageDecoder() {} |
| 98 | 99 |
| 99 String DeferredImageDecoder::filenameExtension() const { | 100 String DeferredImageDecoder::filenameExtension() const { |
| 100 return m_actualDecoder ? m_actualDecoder->filenameExtension() | 101 return m_actualDecoder ? m_actualDecoder->filenameExtension() |
| 101 : m_filenameExtension; | 102 : m_filenameExtension; |
| 102 } | 103 } |
| (...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 366 | 367 |
| 367 namespace WTF { | 368 namespace WTF { |
| 368 template <> | 369 template <> |
| 369 struct VectorTraits<blink::DeferredFrameData> | 370 struct VectorTraits<blink::DeferredFrameData> |
| 370 : public SimpleClassVectorTraits<blink::DeferredFrameData> { | 371 : public SimpleClassVectorTraits<blink::DeferredFrameData> { |
| 371 STATIC_ONLY(VectorTraits); | 372 STATIC_ONLY(VectorTraits); |
| 372 static const bool canInitializeWithMemset = | 373 static const bool canInitializeWithMemset = |
| 373 false; // Not all DeferredFrameData members initialize to 0. | 374 false; // Not all DeferredFrameData members initialize to 0. |
| 374 }; | 375 }; |
| 375 } | 376 } |
| OLD | NEW |