diff options
Diffstat (limited to 'Source/WebCore/css/CSSCrossfadeValue.cpp')
| -rw-r--r-- | Source/WebCore/css/CSSCrossfadeValue.cpp | 171 |
1 files changed, 101 insertions, 70 deletions
diff --git a/Source/WebCore/css/CSSCrossfadeValue.cpp b/Source/WebCore/css/CSSCrossfadeValue.cpp index 26472263a..c324dc112 100644 --- a/Source/WebCore/css/CSSCrossfadeValue.cpp +++ b/Source/WebCore/css/CSSCrossfadeValue.cpp @@ -11,10 +11,10 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY + * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR @@ -29,6 +29,7 @@ #include "AnimationUtilities.h" #include "CSSImageValue.h" +#include "CachedImage.h" #include "CachedResourceLoader.h" #include "CrossfadeGeneratedImage.h" #include "ImageBuffer.h" @@ -44,31 +45,59 @@ static inline double blendFunc(double from, double to, double progress) return blend(from, to, progress); } -static bool subimageKnownToBeOpaque(CSSValue& value, const RenderElement* renderer) +static bool subimageKnownToBeOpaque(const CSSValue& value, const RenderElement& renderer) { - if (value.isImageValue()) - return toCSSImageValue(value).knownToBeOpaque(renderer); + if (is<CSSImageValue>(value)) + return downcast<CSSImageValue>(value).knownToBeOpaque(&renderer); - if (value.isImageGeneratorValue()) - return toCSSImageGeneratorValue(value).knownToBeOpaque(renderer); + if (is<CSSImageGeneratorValue>(value)) + return downcast<CSSImageGeneratorValue>(value).knownToBeOpaque(renderer); ASSERT_NOT_REACHED(); return false; } +inline CSSCrossfadeValue::SubimageObserver::SubimageObserver(CSSCrossfadeValue& owner) + : m_owner(owner) +{ +} + +void CSSCrossfadeValue::SubimageObserver::imageChanged(CachedImage*, const IntRect*) +{ + m_owner.crossfadeChanged(); +} + +inline CSSCrossfadeValue::CSSCrossfadeValue(Ref<CSSValue>&& fromValue, Ref<CSSValue>&& toValue, Ref<CSSPrimitiveValue>&& percentageValue, bool prefixed) + : CSSImageGeneratorValue(CrossfadeClass) + , m_fromValue(WTFMove(fromValue)) + , m_toValue(WTFMove(toValue)) + , m_percentageValue(WTFMove(percentageValue)) + , m_subimageObserver(*this) + , m_isPrefixed(prefixed) +{ +} + +Ref<CSSCrossfadeValue> CSSCrossfadeValue::create(Ref<CSSValue>&& fromValue, Ref<CSSValue>&& toValue, Ref<CSSPrimitiveValue>&& percentageValue, bool prefixed) +{ + return adoptRef(*new CSSCrossfadeValue(WTFMove(fromValue), WTFMove(toValue), WTFMove(percentageValue), prefixed)); +} + CSSCrossfadeValue::~CSSCrossfadeValue() { if (m_cachedFromImage) - m_cachedFromImage->removeClient(&m_crossfadeSubimageObserver); + m_cachedFromImage->removeClient(m_subimageObserver); if (m_cachedToImage) - m_cachedToImage->removeClient(&m_crossfadeSubimageObserver); + m_cachedToImage->removeClient(m_subimageObserver); } String CSSCrossfadeValue::customCSSText() const { StringBuilder result; - result.appendLiteral("-webkit-cross-fade("); + if (m_isPrefixed) + result.appendLiteral("-webkit-cross-fade("); + else + result.appendLiteral("cross-fade("); result.append(m_fromValue->cssText()); result.appendLiteral(", "); result.append(m_toValue->cssText()); @@ -78,142 +107,144 @@ String CSSCrossfadeValue::customCSSText() const return result.toString(); } -IntSize CSSCrossfadeValue::fixedSize(const RenderElement* renderer) +FloatSize CSSCrossfadeValue::fixedSize(const RenderElement& renderer) { - float percentage = m_percentageValue->getFloatValue(); + float percentage = m_percentageValue->floatValue(); float inversePercentage = 1 - percentage; - CachedResourceLoader* cachedResourceLoader = renderer->document().cachedResourceLoader(); - CachedImage* cachedFromImage = cachedImageForCSSValue(m_fromValue.get(), cachedResourceLoader); - CachedImage* cachedToImage = cachedImageForCSSValue(m_toValue.get(), cachedResourceLoader); + // FIXME: Skip Content Security Policy check when cross fade is applied to an element in a user agent shadow tree. + // See <https://bugs.webkit.org/show_bug.cgi?id=146663>. + auto options = CachedResourceLoader::defaultCachedResourceOptions(); + + auto& cachedResourceLoader = renderer.document().cachedResourceLoader(); + auto* cachedFromImage = cachedImageForCSSValue(m_fromValue, cachedResourceLoader, options); + auto* cachedToImage = cachedImageForCSSValue(m_toValue, cachedResourceLoader, options); if (!cachedFromImage || !cachedToImage) - return IntSize(); + return FloatSize(); - IntSize fromImageSize = cachedFromImage->imageForRenderer(renderer)->size(); - IntSize toImageSize = cachedToImage->imageForRenderer(renderer)->size(); + FloatSize fromImageSize = cachedFromImage->imageForRenderer(&renderer)->size(); + FloatSize toImageSize = cachedToImage->imageForRenderer(&renderer)->size(); // Rounding issues can cause transitions between images of equal size to return // a different fixed size; avoid performing the interpolation if the images are the same size. if (fromImageSize == toImageSize) return fromImageSize; - return IntSize(fromImageSize.width() * inversePercentage + toImageSize.width() * percentage, - fromImageSize.height() * inversePercentage + toImageSize.height() * percentage); + return fromImageSize * inversePercentage + toImageSize * percentage; } bool CSSCrossfadeValue::isPending() const { - return CSSImageGeneratorValue::subimageIsPending(m_fromValue.get()) - || CSSImageGeneratorValue::subimageIsPending(m_toValue.get()); + return CSSImageGeneratorValue::subimageIsPending(m_fromValue) + || CSSImageGeneratorValue::subimageIsPending(m_toValue); } -bool CSSCrossfadeValue::knownToBeOpaque(const RenderElement* renderer) const +bool CSSCrossfadeValue::knownToBeOpaque(const RenderElement& renderer) const { - return subimageKnownToBeOpaque(*m_fromValue, renderer) && subimageKnownToBeOpaque(*m_toValue, renderer); + return subimageKnownToBeOpaque(m_fromValue, renderer) + && subimageKnownToBeOpaque(m_toValue, renderer); } -void CSSCrossfadeValue::loadSubimages(CachedResourceLoader* cachedResourceLoader) +void CSSCrossfadeValue::loadSubimages(CachedResourceLoader& cachedResourceLoader, const ResourceLoaderOptions& options) { - CachedResourceHandle<CachedImage> oldCachedFromImage = m_cachedFromImage; - CachedResourceHandle<CachedImage> oldCachedToImage = m_cachedToImage; + auto oldCachedFromImage = m_cachedFromImage; + auto oldCachedToImage = m_cachedToImage; - m_cachedFromImage = CSSImageGeneratorValue::cachedImageForCSSValue(m_fromValue.get(), cachedResourceLoader); - m_cachedToImage = CSSImageGeneratorValue::cachedImageForCSSValue(m_toValue.get(), cachedResourceLoader); + m_cachedFromImage = CSSImageGeneratorValue::cachedImageForCSSValue(m_fromValue, cachedResourceLoader, options); + m_cachedToImage = CSSImageGeneratorValue::cachedImageForCSSValue(m_toValue, cachedResourceLoader, options); if (m_cachedFromImage != oldCachedFromImage) { if (oldCachedFromImage) - oldCachedFromImage->removeClient(&m_crossfadeSubimageObserver); + oldCachedFromImage->removeClient(m_subimageObserver); if (m_cachedFromImage) - m_cachedFromImage->addClient(&m_crossfadeSubimageObserver); + m_cachedFromImage->addClient(m_subimageObserver); } if (m_cachedToImage != oldCachedToImage) { if (oldCachedToImage) - oldCachedToImage->removeClient(&m_crossfadeSubimageObserver); + oldCachedToImage->removeClient(m_subimageObserver); if (m_cachedToImage) - m_cachedToImage->addClient(&m_crossfadeSubimageObserver); + m_cachedToImage->addClient(m_subimageObserver); } - m_crossfadeSubimageObserver.setReady(true); + // FIXME: Unclear why this boolean adds any value; for now keeping it around to avoid changing semantics. + m_subimagesAreReady = true; } -PassRefPtr<Image> CSSCrossfadeValue::image(RenderElement* renderer, const IntSize& size) +Image* CSSCrossfadeValue::image(RenderElement& renderer, const FloatSize& size) { if (size.isEmpty()) - return 0; + return nullptr; - CachedResourceLoader* cachedResourceLoader = renderer->document().cachedResourceLoader(); - CachedImage* cachedFromImage = cachedImageForCSSValue(m_fromValue.get(), cachedResourceLoader); - CachedImage* cachedToImage = cachedImageForCSSValue(m_toValue.get(), cachedResourceLoader); + // FIXME: Skip Content Security Policy check when cross fade is applied to an element in a user agent shadow tree. + // See <https://bugs.webkit.org/show_bug.cgi?id=146663>. + auto options = CachedResourceLoader::defaultCachedResourceOptions(); + + auto& cachedResourceLoader = renderer.document().cachedResourceLoader(); + auto* cachedFromImage = cachedImageForCSSValue(m_fromValue, cachedResourceLoader, options); + auto* cachedToImage = cachedImageForCSSValue(m_toValue, cachedResourceLoader, options); if (!cachedFromImage || !cachedToImage) return Image::nullImage(); - Image* fromImage = cachedFromImage->imageForRenderer(renderer); - Image* toImage = cachedToImage->imageForRenderer(renderer); + auto* fromImage = cachedFromImage->imageForRenderer(&renderer); + auto* toImage = cachedToImage->imageForRenderer(&renderer); if (!fromImage || !toImage) return Image::nullImage(); - m_generatedImage = CrossfadeGeneratedImage::create(fromImage, toImage, m_percentageValue->getFloatValue(), fixedSize(renderer), size); - - return m_generatedImage.release(); + m_generatedImage = CrossfadeGeneratedImage::create(*fromImage, *toImage, m_percentageValue->floatValue(), fixedSize(renderer), size); + return m_generatedImage.get(); } -void CSSCrossfadeValue::crossfadeChanged(const IntRect&) +inline void CSSCrossfadeValue::crossfadeChanged() { - for (auto it = clients().begin(), end = clients().end(); it != end; ++it) - it->key->imageChanged(static_cast<WrappedImagePtr>(this)); + if (!m_subimagesAreReady) + return; + for (auto& client : clients()) + client.key->imageChanged(this); } -void CSSCrossfadeValue::CrossfadeSubimageObserverProxy::imageChanged(CachedImage*, const IntRect* rect) +bool CSSCrossfadeValue::traverseSubresources(const std::function<bool (const CachedResource&)>& handler) const { - if (m_ready) - m_ownerValue->crossfadeChanged(*rect); -} - -bool CSSCrossfadeValue::hasFailedOrCanceledSubresources() const -{ - if (m_cachedFromImage && m_cachedFromImage->loadFailedOrCanceled()) + if (m_cachedFromImage && handler(*m_cachedFromImage)) return true; - if (m_cachedToImage && m_cachedToImage->loadFailedOrCanceled()) + if (m_cachedToImage && handler(*m_cachedToImage)) return true; return false; } -PassRefPtr<CSSCrossfadeValue> CSSCrossfadeValue::blend(const CSSCrossfadeValue& from, double progress) const +RefPtr<CSSCrossfadeValue> CSSCrossfadeValue::blend(const CSSCrossfadeValue& from, double progress) const { ASSERT(equalInputImages(from)); - RefPtr<StyleCachedImage> toStyledImage = StyleCachedImage::create(m_cachedToImage.get()); - RefPtr<StyleCachedImage> fromStyledImage = StyleCachedImage::create(m_cachedFromImage.get()); - auto fromImageValue = CSSImageValue::create(m_cachedFromImage->url(), fromStyledImage.get()); - auto toImageValue = CSSImageValue::create(m_cachedToImage->url(), toStyledImage.get()); + if (!m_cachedToImage || !m_cachedFromImage) + return nullptr; - RefPtr<CSSCrossfadeValue> crossfadeValue = CSSCrossfadeValue::create(std::move(fromImageValue), std::move(toImageValue)); + auto fromImageValue = CSSImageValue::create(*m_cachedFromImage); + auto toImageValue = CSSImageValue::create(*m_cachedToImage); - double fromPercentage = from.m_percentageValue->getDoubleValue(); + double fromPercentage = from.m_percentageValue->doubleValue(); if (from.m_percentageValue->isPercentage()) fromPercentage /= 100.0; - double toPercentage = m_percentageValue->getDoubleValue(); + double toPercentage = m_percentageValue->doubleValue(); if (m_percentageValue->isPercentage()) toPercentage /= 100.0; - crossfadeValue->setPercentage(CSSPrimitiveValue::create(blendFunc(fromPercentage, toPercentage, progress), CSSPrimitiveValue::CSS_NUMBER)); - return crossfadeValue.release(); + auto percentageValue = CSSPrimitiveValue::create(blendFunc(fromPercentage, toPercentage, progress), CSSPrimitiveValue::CSS_NUMBER); + + return CSSCrossfadeValue::create(WTFMove(fromImageValue), WTFMove(toImageValue), WTFMove(percentageValue), from.isPrefixed() && isPrefixed()); } bool CSSCrossfadeValue::equals(const CSSCrossfadeValue& other) const { - return equalInputImages(other) - && compareCSSValuePtr(m_percentageValue, other.m_percentageValue); + return equalInputImages(other) && compareCSSValue(m_percentageValue, other.m_percentageValue); } bool CSSCrossfadeValue::equalInputImages(const CSSCrossfadeValue& other) const { - return compareCSSValuePtr(m_fromValue, other.m_fromValue) - && compareCSSValuePtr(m_toValue, other.m_toValue); + return compareCSSValue(m_fromValue, other.m_fromValue) && compareCSSValue(m_toValue, other.m_toValue); } } // namespace WebCore |