<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[285423] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/285423">285423</a></dd>
<dt>Author</dt> <dd>graouts@webkit.org</dd>
<dt>Date</dt> <dd>2021-11-08 12:14:48 -0800 (Mon, 08 Nov 2021)</dd>
</dl>
<h3>Log Message</h3>
<pre>Discrete animation of content property does not work
https://bugs.webkit.org/show_bug.cgi?id=183544
LayoutTests/imported/w3c:
<rdar://problem/38360395>
Reviewed by Antti Koivisto.
Add a new test to check that we can animate the "content" property using a discrete animation.
* web-platform-tests/css/css-content/content-animation-expected.txt: Added.
* web-platform-tests/css/css-content/content-animation.html: Added.
Source/WebCore:
Reviewed by Antti Koivisto.
Test: imported/w3c/web-platform-tests/css/css-content/content-animation.html
Add support for animating the "content" property.
* animation/CSSPropertyAnimation.cpp:
(WebCore::CSSPropertyAnimationWrapperMap::CSSPropertyAnimationWrapperMap):
* rendering/style/RenderStyle.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsimportedw3cChangeLog">trunk/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreanimationCSSPropertyAnimationcpp">trunk/Source/WebCore/animation/CSSPropertyAnimation.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleRenderStyleh">trunk/Source/WebCore/rendering/style/RenderStyle.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestscsscsscontentcontentanimationexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-content/content-animation-expected.txt</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestscsscsscontentcontentanimationhtml">trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-content/content-animation.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/ChangeLog (285422 => 285423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog 2021-11-08 19:57:03 UTC (rev 285422)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2021-11-08 20:14:48 UTC (rev 285423)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2021-11-08 Antoine Quint <graouts@webkit.org>
+
+ Discrete animation of content property does not work
+ https://bugs.webkit.org/show_bug.cgi?id=183544
+ <rdar://problem/38360395>
+
+ Reviewed by Antti Koivisto.
+
+ Add a new test to check that we can animate the "content" property using a discrete animation.
+
+ * web-platform-tests/css/css-content/content-animation-expected.txt: Added.
+ * web-platform-tests/css/css-content/content-animation.html: Added.
+
</ins><span class="cx"> 2021-11-08 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, reverting r285408.
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestscsscsscontentcontentanimationexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-content/content-animation-expected.txt (0 => 285423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-content/content-animation-expected.txt (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-content/content-animation-expected.txt 2021-11-08 20:14:48 UTC (rev 285423)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+
+PASS The content property can be animated with a discrete animation type.
+
</ins></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestscsscsscontentcontentanimationhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-content/content-animation.html (0 => 285423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-content/content-animation.html (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-content/content-animation.html 2021-11-08 20:14:48 UTC (rev 285423)
</span><span class="lines">@@ -0,0 +1,51 @@
</span><ins>+<!DOCTYPE html>
+<meta charset="UTF-8">
+<title>content animation</title>
+<link rel="help" href="https://drafts.csswg.org/css-content/#content-property">
+<meta name="test" content="box-shadow supports animation">
+<link rel="author" href="mailto:graouts@apple.com" title="Antoine Quint">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+
+.target::after {
+ content: "default";
+}
+
+@keyframes content-animation {
+ from { content: "from" }
+ to { content: "to" }
+}
+
+.target.animated::after {
+ animation: content-animation 1s paused linear forwards;
+}
+
+</style>
+<body>
+<div class="target"></div>
+<script>
+
+test(function() {
+ const target = document.querySelector(".target");
+ const style = getComputedStyle(target, "::after");
+
+ assert_equals(style.content, '"default"', "Before the animation is applied.");
+
+ target.classList.add("animated");
+ const animation = target.getAnimations({ subtree: true })[0];
+
+ const testContentAtTime = (time, expected) => {
+ animation.currentTime = time;
+ assert_equals(style.content, `"${expected}"`, `Check the animated value at time = ${time}ms`);
+ };
+
+ testContentAtTime(0, 'from');
+ testContentAtTime(499, 'from');
+ testContentAtTime(500, 'to');
+ testContentAtTime(999, 'to');
+ testContentAtTime(1000, 'to');
+}, "The content property can be animated with a discrete animation type.");
+
+</script>
+</body>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (285422 => 285423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2021-11-08 19:57:03 UTC (rev 285422)
+++ trunk/Source/WebCore/ChangeLog 2021-11-08 20:14:48 UTC (rev 285423)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2021-11-08 Antoine Quint <graouts@webkit.org>
+
+ Discrete animation of content property does not work
+ https://bugs.webkit.org/show_bug.cgi?id=183544
+
+ Reviewed by Antti Koivisto.
+
+ Test: imported/w3c/web-platform-tests/css/css-content/content-animation.html
+
+ Add support for animating the "content" property.
+
+ * animation/CSSPropertyAnimation.cpp:
+ (WebCore::CSSPropertyAnimationWrapperMap::CSSPropertyAnimationWrapperMap):
+ * rendering/style/RenderStyle.h:
+
</ins><span class="cx"> 2021-11-08 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, reverting r285408.
</span></span></pre></div>
<a id="trunkSourceWebCoreanimationCSSPropertyAnimationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/animation/CSSPropertyAnimation.cpp (285422 => 285423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/animation/CSSPropertyAnimation.cpp 2021-11-08 19:57:03 UTC (rev 285422)
+++ trunk/Source/WebCore/animation/CSSPropertyAnimation.cpp 2021-11-08 20:14:48 UTC (rev 285423)
</span><span class="lines">@@ -42,6 +42,7 @@
</span><span class="cx"> #include "CachedImage.h"
</span><span class="cx"> #include "CalculationValue.h"
</span><span class="cx"> #include "ColorBlending.h"
</span><ins>+#include "ContentData.h"
</ins><span class="cx"> #include "FloatConversion.h"
</span><span class="cx"> #include "FontCascade.h"
</span><span class="cx"> #include "FontSelectionAlgorithm.h"
</span><span class="lines">@@ -2366,6 +2367,45 @@
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+class PropertyWrapperContent final : public AnimationPropertyWrapperBase {
+ WTF_MAKE_FAST_ALLOCATED;
+public:
+ PropertyWrapperContent()
+ : AnimationPropertyWrapperBase(CSSPropertyContent)
+ {
+ }
+
+ bool canInterpolate(const RenderStyle&, const RenderStyle&, CompositeOperation) const final { return false; }
+
+ bool equals(const RenderStyle& a, const RenderStyle& b) const final
+ {
+ if (!a.hasContent() && !b.hasContent())
+ return true;
+ if (a.hasContent() && b.hasContent())
+ return *a.contentData() == *b.contentData();
+ return false;
+ }
+
+#if !LOG_DISABLED
+ void logBlend(const RenderStyle&, const RenderStyle&, const RenderStyle&, double progress) const final
+ {
+ LOG_WITH_STREAM(Animations, stream << " blending content at " << TextStream::FormatNumberRespectingIntegers(progress) << ".");
+ }
+#endif
+
+ void blend(RenderStyle& destination, const RenderStyle& from, const RenderStyle& to, const CSSPropertyBlendingContext& context) const final
+ {
+ ASSERT(context.isDiscrete);
+ ASSERT(!context.progress || context.progress == 1);
+
+ auto& style = context.progress ? to : from;
+ if (auto* content = style.contentData())
+ destination.setContent(content->clone(), false);
+ else
+ destination.clearContent();
+ }
+};
+
</ins><span class="cx"> class CSSPropertyAnimationWrapperMap final {
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><span class="lines">@@ -2684,7 +2724,8 @@
</span><span class="cx"> new PathOperationPropertyWrapper(CSSPropertyOffsetPath, &RenderStyle::offsetPath, &RenderStyle::setOffsetPath),
</span><span class="cx"> new LengthPropertyWrapper(CSSPropertyOffsetDistance, &RenderStyle::offsetDistance, &RenderStyle::setOffsetDistance, LengthPropertyWrapper::Flags::IsLengthPercentage),
</span><span class="cx"> new LengthPointOrAutoPropertyWrapper(CSSPropertyOffsetPosition, &RenderStyle::offsetPosition, &RenderStyle::setOffsetPosition),
</span><del>- new LengthPointOrAutoPropertyWrapper(CSSPropertyOffsetAnchor, &RenderStyle::offsetAnchor, &RenderStyle::setOffsetAnchor)
</del><ins>+ new LengthPointOrAutoPropertyWrapper(CSSPropertyOffsetAnchor, &RenderStyle::offsetAnchor, &RenderStyle::setOffsetAnchor),
+ new PropertyWrapperContent
</ins><span class="cx"> };
</span><span class="cx"> const unsigned animatableLonghandPropertiesCount = WTF_ARRAY_LENGTH(animatableLonghandPropertyWrappers);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStyleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyle.h (285422 => 285423)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyle.h 2021-11-08 19:57:03 UTC (rev 285422)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.h 2021-11-08 20:14:48 UTC (rev 285423)
</span><span class="lines">@@ -1474,6 +1474,7 @@
</span><span class="cx">
</span><span class="cx"> bool hasContent() const { return contentData(); }
</span><span class="cx"> const ContentData* contentData() const { return m_rareNonInheritedData->content.get(); }
</span><ins>+ void setContent(std::unique_ptr<ContentData>, bool add);
</ins><span class="cx"> bool contentDataEquivalent(const RenderStyle* otherStyle) const { return const_cast<RenderStyle*>(this)->m_rareNonInheritedData->contentDataEquivalent(*const_cast<RenderStyle*>(otherStyle)->m_rareNonInheritedData); }
</span><span class="cx"> void clearContent();
</span><span class="cx"> void setHasExplicitlyClearedContent(bool v) { m_nonInheritedFlags.hasExplicitlyClearedContent = v; }
</span><span class="lines">@@ -1995,8 +1996,6 @@
</span><span class="cx"> bool hasAutoLeftAndRight() const { return left().isAuto() && right().isAuto(); }
</span><span class="cx"> bool hasAutoTopAndBottom() const { return top().isAuto() && bottom().isAuto(); }
</span><span class="cx">
</span><del>- void setContent(std::unique_ptr<ContentData>, bool add);
-
</del><span class="cx"> static bool isDisplayReplacedType(DisplayType);
</span><span class="cx"> static bool isDisplayInlineType(DisplayType);
</span><span class="cx"> static bool isDisplayFlexibleBox(DisplayType);
</span></span></pre>
</div>
</div>
</body>
</html>