| 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 234 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 245 | 245 |
| 246 m_generatedImage = CrossfadeGeneratedImage::create(fromImageRef, toImageRef,
m_percentageValue->getFloatValue(), fixedSize(layoutObject, FloatSize(size)), s
ize); | 246 m_generatedImage = CrossfadeGeneratedImage::create(fromImageRef, toImageRef,
m_percentageValue->getFloatValue(), fixedSize(layoutObject, FloatSize(size)), s
ize); |
| 247 | 247 |
| 248 return m_generatedImage.release(); | 248 return m_generatedImage.release(); |
| 249 } | 249 } |
| 250 | 250 |
| 251 void CSSCrossfadeValue::crossfadeChanged(const IntRect&) | 251 void CSSCrossfadeValue::crossfadeChanged(const IntRect&) |
| 252 { | 252 { |
| 253 for (const auto& curr : clients()) { | 253 for (const auto& curr : clients()) { |
| 254 LayoutObject* client = const_cast<LayoutObject*>(curr.key); | 254 LayoutObject* client = const_cast<LayoutObject*>(curr.key); |
| 255 client->imageChanged(static_cast<WrappedImagePtr>(this)); | 255 client->imageChanged(false, static_cast<WrappedImagePtr>(this)); |
| 256 } | 256 } |
| 257 } | 257 } |
| 258 | 258 |
| 259 void CSSCrossfadeValue::CrossfadeSubimageObserverProxy::imageChanged(ImageResour
ce*, const IntRect* rect) | 259 void CSSCrossfadeValue::CrossfadeSubimageObserverProxy::imageChanged(bool, Image
Resource*, const IntRect* rect) |
| 260 { | 260 { |
| 261 if (m_ready) | 261 if (m_ready) |
| 262 m_ownerValue->crossfadeChanged(*rect); | 262 m_ownerValue->crossfadeChanged(*rect); |
| 263 } | 263 } |
| 264 | 264 |
| 265 bool CSSCrossfadeValue::hasFailedOrCanceledSubresources() const | 265 bool CSSCrossfadeValue::hasFailedOrCanceledSubresources() const |
| 266 { | 266 { |
| 267 if (m_cachedFromImage && m_cachedFromImage->loadFailedOrCanceled()) | 267 if (m_cachedFromImage && m_cachedFromImage->loadFailedOrCanceled()) |
| 268 return true; | 268 return true; |
| 269 if (m_cachedToImage && m_cachedToImage->loadFailedOrCanceled()) | 269 if (m_cachedToImage && m_cachedToImage->loadFailedOrCanceled()) |
| (...skipping 13 matching lines...) Expand all Loading... |
| 283 visitor->trace(m_fromValue); | 283 visitor->trace(m_fromValue); |
| 284 visitor->trace(m_toValue); | 284 visitor->trace(m_toValue); |
| 285 visitor->trace(m_percentageValue); | 285 visitor->trace(m_percentageValue); |
| 286 visitor->trace(m_cachedFromImage); | 286 visitor->trace(m_cachedFromImage); |
| 287 visitor->trace(m_cachedToImage); | 287 visitor->trace(m_cachedToImage); |
| 288 visitor->trace(m_crossfadeSubimageObserver); | 288 visitor->trace(m_crossfadeSubimageObserver); |
| 289 CSSImageGeneratorValue::traceAfterDispatch(visitor); | 289 CSSImageGeneratorValue::traceAfterDispatch(visitor); |
| 290 } | 290 } |
| 291 | 291 |
| 292 } // namespace blink | 292 } // namespace blink |
| OLD | NEW |