OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2011 Apple Inc. All rights reserved. | 2 * Copyright (C) 2011 Apple 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 171 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
182 if (!fromImage || !toImage) | 182 if (!fromImage || !toImage) |
183 return Image::nullImage(); | 183 return Image::nullImage(); |
184 | 184 |
185 m_generatedImage = CrossfadeGeneratedImage::create(fromImage, toImage, m_per
centageValue->getFloatValue(), fixedSize(renderer), size); | 185 m_generatedImage = CrossfadeGeneratedImage::create(fromImage, toImage, m_per
centageValue->getFloatValue(), fixedSize(renderer), size); |
186 | 186 |
187 return m_generatedImage.release(); | 187 return m_generatedImage.release(); |
188 } | 188 } |
189 | 189 |
190 void CSSCrossfadeValue::crossfadeChanged(const IntRect&) | 190 void CSSCrossfadeValue::crossfadeChanged(const IntRect&) |
191 { | 191 { |
192 RenderObjectSizeCountMap::const_iterator end = clients().end(); | 192 for (const auto& curr : clients()) { |
193 for (RenderObjectSizeCountMap::const_iterator curr = clients().begin(); curr
!= end; ++curr) { | 193 RenderObject* client = const_cast<RenderObject*>(curr.key); |
194 RenderObject* client = const_cast<RenderObject*>(curr->key); | |
195 client->imageChanged(static_cast<WrappedImagePtr>(this)); | 194 client->imageChanged(static_cast<WrappedImagePtr>(this)); |
196 } | 195 } |
197 } | 196 } |
198 | 197 |
199 void CSSCrossfadeValue::CrossfadeSubimageObserverProxy::imageChanged(ImageResour
ce*, const IntRect* rect) | 198 void CSSCrossfadeValue::CrossfadeSubimageObserverProxy::imageChanged(ImageResour
ce*, const IntRect* rect) |
200 { | 199 { |
201 if (m_ready) | 200 if (m_ready) |
202 m_ownerValue->crossfadeChanged(*rect); | 201 m_ownerValue->crossfadeChanged(*rect); |
203 } | 202 } |
204 | 203 |
(...skipping 15 matching lines...) Expand all Loading... |
220 | 219 |
221 void CSSCrossfadeValue::traceAfterDispatch(Visitor* visitor) | 220 void CSSCrossfadeValue::traceAfterDispatch(Visitor* visitor) |
222 { | 221 { |
223 visitor->trace(m_fromValue); | 222 visitor->trace(m_fromValue); |
224 visitor->trace(m_toValue); | 223 visitor->trace(m_toValue); |
225 visitor->trace(m_percentageValue); | 224 visitor->trace(m_percentageValue); |
226 CSSImageGeneratorValue::traceAfterDispatch(visitor); | 225 CSSImageGeneratorValue::traceAfterDispatch(visitor); |
227 } | 226 } |
228 | 227 |
229 } // namespace blink | 228 } // namespace blink |
OLD | NEW |