Chromium Code Reviews| 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 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 138 SkBitmap::Allocator*, | 138 SkBitmap::Allocator*, |
| 139 ImageDecoder::AlphaOption); | 139 ImageDecoder::AlphaOption); |
| 140 | 140 |
| 141 const SkISize full_size_; | 141 const SkISize full_size_; |
| 142 | 142 |
| 143 // Parameters used to create internal ImageDecoder objects. | 143 // Parameters used to create internal ImageDecoder objects. |
| 144 const ColorBehavior decoder_color_behavior_; | 144 const ColorBehavior decoder_color_behavior_; |
| 145 | 145 |
| 146 const bool is_multi_frame_; | 146 const bool is_multi_frame_; |
| 147 bool decode_failed_; | 147 bool decode_failed_; |
| 148 bool yuv_decoding_failed_; | |
|
scroggo_chromium
2017/06/15 14:45:22
I don't understand the removal of this variable. T
| |
| 149 size_t frame_count_; | 148 size_t frame_count_; |
| 150 Vector<bool> has_alpha_; | 149 Vector<bool> has_alpha_; |
| 151 | 150 |
| 152 std::unique_ptr<ImageDecoderFactory> image_decoder_factory_; | 151 std::unique_ptr<ImageDecoderFactory> image_decoder_factory_; |
| 153 | 152 |
| 154 // Prevents multiple decode operations on the same data. | 153 // Prevents multiple decode operations on the same data. |
| 155 Mutex decode_mutex_; | 154 Mutex decode_mutex_; |
| 156 | 155 |
| 157 // Protect concurrent access to m_hasAlpha. | 156 // Protect concurrent access to m_hasAlpha. |
| 158 Mutex alpha_mutex_; | 157 Mutex alpha_mutex_; |
| 159 }; | 158 }; |
| 160 | 159 |
| 161 } // namespace blink | 160 } // namespace blink |
| 162 | 161 |
| 163 #endif | 162 #endif |
| OLD | NEW |