Changeset 155100 in webkit for trunk/Source/WebCore/css/CSSCrossfadeValue.cpp

Timestamp:

Sep 4, 2013, 11:50:05 PM (12 years ago)

Author:

[email protected]

Message:

Support interpolation between cross-fade() images
​https://bugs.webkit.org/show_bug.cgi?id=119955

Reviewed by Darin Adler.

Source/WebCore:

With this patch, CSS can animate from one -webkit-cross-fade
function to another, when the input images are the same in the
same order.

• css/CSSCrossfadeValue.cpp: Added blend function.

(WebCore::blendFunc):
(WebCore::CSSCrossfadeValue::blend):
(WebCore::CSSCrossfadeValue::equals):
(WebCore::CSSCrossfadeValue::equalInputImages):

• css/CSSCrossfadeValue.h: Added save casting functions.

(WebCore::toCSSCrossfadeValue):

• css/CSSValue.h:

(WebCore::CSSValue::isCrossfadeValue):

• page/animation/CSSPropertyAnimation.cpp: Add another condition to

interpolate between two -webkit-cross-fade functions.

(WebCore::blendFunc):

LayoutTests:

Test interpolation from one cross-fade function to another. Changed pixel test
to a ref test.

• animations/cross-fade-background-image.html:
• animations/cross-fade-background-image-expected.html: Added.
• platform/mac/animations/cross-fade-background-image-expected.png: Removed.
• platform/mac/animations/cross-fade-background-image-expected.txt: Removed.

File:

• trunk/Source/WebCore/css/CSSCrossfadeValue.cpp (modified) (4 diffs)

trunk/Source/WebCore/css/CSSCrossfadeValue.cpp

@@ -1 +1 @@
 /*
  * Copyright (C) 2011 Apple Inc.  All rights reserved.
+ * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -27 +28 @@
 #include "CSSCrossfadeValue.h"
 
+#include "AnimationUtilities.h"
 #include "CSSImageValue.h"
 #include "CachedResourceLoader.h"
@@ -37 +39 @@
 
 namespace WebCore {
+
+static inline double blendFunc(double from, double to, double progress)
+{
+    return blend(from, to, progress);
+}
 
 static bool subimageKnownToBeOpaque(CSSValue* value, const RenderObject* renderer)
@@ -179 +186 @@
 }
 
+PassRefPtr<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());
+
+    RefPtr<CSSImageValue> fromImageValue = CSSImageValue::create(m_cachedFromImage->url(), fromStyledImage.get());
+    RefPtr<CSSImageValue> toImageValue = CSSImageValue::create(m_cachedToImage->url(), toStyledImage.get());
+
+    RefPtr<CSSCrossfadeValue> crossfadeValue = CSSCrossfadeValue::create(fromImageValue, toImageValue);
+
+    double fromPercentage = from.m_percentageValue->getDoubleValue();
+    if (from.m_percentageValue->isPercentage())
+        fromPercentage /= 100.0;
+    double toPercentage = m_percentageValue->getDoubleValue();
+    if (m_percentageValue->isPercentage())
+        toPercentage /= 100.0;
+    crossfadeValue->setPercentage(CSSPrimitiveValue::create(blendFunc(fromPercentage, toPercentage, progress), CSSPrimitiveValue::CSS_NUMBER));
+    return crossfadeValue.release();
+}
+
 bool CSSCrossfadeValue::equals(const CSSCrossfadeValue& other) const
 {
+    return equalInputImages(other)
+        && compareCSSValuePtr(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)
-        && compareCSSValuePtr(m_percentageValue, other.m_percentageValue);
+        && compareCSSValuePtr(m_toValue, other.m_toValue);
 }