| 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 11 matching lines...) Expand all Loading... |
| 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 * OF 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 "core/css/CSSCrossfadeValue.h" | 27 #include "core/css/CSSCrossfadeValue.h" |
| 28 | 28 |
| 29 #include "core/css/CSSImageValue.h" | 29 #include "core/css/CSSImageValue.h" |
| 30 #include "core/dom/WebCoreMemoryInstrumentation.h" | 30 #include "core/dom/WebCoreMemoryInstrumentation.h" |
| 31 #include "core/loader/cache/CachedImage.h" | 31 #include "core/loader/cache/CachedImage.h" |
| 32 #include "core/loader/cache/CachedResourceLoader.h" | |
| 33 #include "core/platform/graphics/CrossfadeGeneratedImage.h" | 32 #include "core/platform/graphics/CrossfadeGeneratedImage.h" |
| 34 #include "core/platform/graphics/ImageBuffer.h" | |
| 35 #include "core/rendering/RenderObject.h" | 33 #include "core/rendering/RenderObject.h" |
| 36 #include "core/rendering/style/StyleCachedImage.h" | 34 #include "core/rendering/style/StyleCachedImage.h" |
| 37 #include "core/rendering/style/StyleGeneratedImage.h" | |
| 38 #include <wtf/text/StringBuilder.h> | 35 #include <wtf/text/StringBuilder.h> |
| 39 | 36 |
| 40 namespace WebCore { | 37 namespace WebCore { |
| 41 | 38 |
| 42 static bool subimageIsPending(CSSValue* value) | 39 static bool subimageIsPending(CSSValue* value) |
| 43 { | 40 { |
| 44 if (value->isImageValue()) | 41 if (value->isImageValue()) |
| 45 return toCSSImageValue(value)->cachedOrPendingImage()->isPendingImage(); | 42 return toCSSImageValue(value)->cachedOrPendingImage()->isPendingImage(); |
| 46 | 43 |
| 47 if (value->isImageGeneratorValue()) | 44 if (value->isImageGeneratorValue()) |
| (...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 230 } | 227 } |
| 231 | 228 |
| 232 bool CSSCrossfadeValue::equals(const CSSCrossfadeValue& other) const | 229 bool CSSCrossfadeValue::equals(const CSSCrossfadeValue& other) const |
| 233 { | 230 { |
| 234 return compareCSSValuePtr(m_fromValue, other.m_fromValue) | 231 return compareCSSValuePtr(m_fromValue, other.m_fromValue) |
| 235 && compareCSSValuePtr(m_toValue, other.m_toValue) | 232 && compareCSSValuePtr(m_toValue, other.m_toValue) |
| 236 && compareCSSValuePtr(m_percentageValue, other.m_percentageValue); | 233 && compareCSSValuePtr(m_percentageValue, other.m_percentageValue); |
| 237 } | 234 } |
| 238 | 235 |
| 239 } // namespace WebCore | 236 } // namespace WebCore |
| OLD | NEW |