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

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.h (modified) (2 diffs)

trunk/Source/WebCore/css/CSSCrossfadeValue.h

@@ -66 +66 @@
     bool hasFailedOrCanceledSubresources() const;
 
+    PassRefPtr<CSSCrossfadeValue> blend(const CSSCrossfadeValue&, double) const;
+
     bool equals(const CSSCrossfadeValue&) const;
+
+    bool equalInputImages(const CSSCrossfadeValue&) const;
 
 private:
@@ -107 +111 @@
 };
 
+inline CSSCrossfadeValue* toCSSCrossfadeValue(CSSImageGeneratorValue* value)
+{
+    ASSERT_WITH_SECURITY_IMPLICATION(!value || value->isCrossfadeValue());
+    return static_cast<CSSCrossfadeValue*>(value);
+}
+
 } // namespace WebCore