<!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>[278908] branches/safari-611-branch/Source/WebKit</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/278908">278908</a></dd>
<dt>Author</dt> <dd>alancoon@apple.com</dd>
<dt>Date</dt> <dd>2021-06-15 15:50:20 -0700 (Tue, 15 Jun 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Cherry-pick <a href="http://trac.webkit.org/projects/webkit/changeset/277536">r277536</a>. rdar://problem/78875336

This reverts <a href="http://trac.webkit.org/projects/webkit/changeset/278896">r278896</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari611branchSourceWebKitChangeLog">branches/safari-611-branch/Source/WebKit/ChangeLog</a></li>
<li><a href="#branchessafari611branchSourceWebKitSharedWebCoreArgumentCoderscpp">branches/safari-611-branch/Source/WebKit/Shared/WebCoreArgumentCoders.cpp</a></li>
<li><a href="#branchessafari611branchSourceWebKitSharedWebCoreArgumentCodersh">branches/safari-611-branch/Source/WebKit/Shared/WebCoreArgumentCoders.h</a></li>
<li><a href="#branchessafari611branchSourceWebKitWebProcessWebPageRemoteLayerTreePlatformCAAnimationRemoteh">branches/safari-611-branch/Source/WebKit/WebProcess/WebPage/RemoteLayerTree/PlatformCAAnimationRemote.h</a></li>
<li><a href="#branchessafari611branchSourceWebKitWebProcessWebPageRemoteLayerTreePlatformCAAnimationRemotemm">branches/safari-611-branch/Source/WebKit/WebProcess/WebPage/RemoteLayerTree/PlatformCAAnimationRemote.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari611branchSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-611-branch/Source/WebKit/ChangeLog (278907 => 278908)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-611-branch/Source/WebKit/ChangeLog       2021-06-15 22:06:17 UTC (rev 278907)
+++ branches/safari-611-branch/Source/WebKit/ChangeLog  2021-06-15 22:50:20 UTC (rev 278908)
</span><span class="lines">@@ -1,3 +1,52 @@
</span><ins>+2021-06-04  Alan Coon  <alancoon@apple.com>
+
+        Cherry-pick r277536. rdar://problem/78875336
+
+    Replace PlatformCAAnimationRemote::KeyframeValue with Variant
+    https://bugs.webkit.org/show_bug.cgi?id=225474
+    
+    Patch by Ian Gilbert <iang@apple.com> on 2021-05-15
+    Reviewed by Ryosuke Niwa.
+    
+    KeyframeValue was effectively a Variant. Replaced the existing class with a WTF::Variant.
+    
+    No test as this does not change code behavior.
+    
+    * Shared/WebCoreArgumentCoders.cpp:
+    (IPC::ArgumentCoder<RefPtr<WebCore::FilterOperation>>::encode):
+    (IPC::ArgumentCoder<RefPtr<WebCore::FilterOperation>>::decode):
+    * Shared/WebCoreArgumentCoders.h:
+    * WebProcess/WebPage/RemoteLayerTree/PlatformCAAnimationRemote.h:
+    * WebProcess/WebPage/RemoteLayerTree/PlatformCAAnimationRemote.mm:
+    (WebKit::animationValueFromKeyframeValue):
+    (WebKit::operator<<):
+    (WebKit::PlatformCAAnimationRemote::KeyframeValue::encode const): Deleted.
+    (WebKit::PlatformCAAnimationRemote::KeyframeValue::decode): Deleted.
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@277536 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2021-05-15  Ian Gilbert  <iang@apple.com>
+
+            Replace PlatformCAAnimationRemote::KeyframeValue with Variant
+            https://bugs.webkit.org/show_bug.cgi?id=225474
+
+            Reviewed by Ryosuke Niwa.
+
+            KeyframeValue was effectively a Variant. Replaced the existing class with a WTF::Variant.
+
+            No test as this does not change code behavior.
+
+            * Shared/WebCoreArgumentCoders.cpp:
+            (IPC::ArgumentCoder<RefPtr<WebCore::FilterOperation>>::encode):
+            (IPC::ArgumentCoder<RefPtr<WebCore::FilterOperation>>::decode):
+            * Shared/WebCoreArgumentCoders.h:
+            * WebProcess/WebPage/RemoteLayerTree/PlatformCAAnimationRemote.h:
+            * WebProcess/WebPage/RemoteLayerTree/PlatformCAAnimationRemote.mm:
+            (WebKit::animationValueFromKeyframeValue):
+            (WebKit::operator<<):
+            (WebKit::PlatformCAAnimationRemote::KeyframeValue::encode const): Deleted.
+            (WebKit::PlatformCAAnimationRemote::KeyframeValue::decode): Deleted.
+
</ins><span class="cx"> 2021-06-15  Alan Coon  <alancoon@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Cherry-pick r278318. rdar://problem/79355222
</span></span></pre></div>
<a id="branchessafari611branchSourceWebKitSharedWebCoreArgumentCoderscpp"></a>
<div class="modfile"><h4>Modified: branches/safari-611-branch/Source/WebKit/Shared/WebCoreArgumentCoders.cpp (278907 => 278908)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-611-branch/Source/WebKit/Shared/WebCoreArgumentCoders.cpp        2021-06-15 22:06:17 UTC (rev 278907)
+++ branches/safari-611-branch/Source/WebKit/Shared/WebCoreArgumentCoders.cpp   2021-06-15 22:50:20 UTC (rev 278908)
</span><span class="lines">@@ -2346,6 +2346,28 @@
</span><span class="cx"> 
</span><span class="cx">     return true;
</span><span class="cx"> }
</span><ins>+
+void ArgumentCoder<RefPtr<WebCore::FilterOperation>>::encode(Encoder& encoder, const RefPtr<WebCore::FilterOperation>& operation)
+{
+    encoder << !!operation;
+    if (operation)
+        encoder << *operation;
+}
+
+WARN_UNUSED_RETURN bool ArgumentCoder<RefPtr<WebCore::FilterOperation>>::decode(Decoder& decoder, RefPtr<WebCore::FilterOperation>& value)
+{
+    Optional<bool> isNull;
+    decoder >> isNull;
+    if (!isNull)
+        return false;
+    
+    if (!decodeFilterOperation(decoder, value)) {
+        value = nullptr;
+        return false;
+    }
+    return true;
+}
+
</ins><span class="cx"> #endif // !USE(COORDINATED_GRAPHICS)
</span><span class="cx"> 
</span><span class="cx"> void ArgumentCoder<BlobPart>::encode(Encoder& encoder, const BlobPart& blobPart)
</span></span></pre></div>
<a id="branchessafari611branchSourceWebKitSharedWebCoreArgumentCodersh"></a>
<div class="modfile"><h4>Modified: branches/safari-611-branch/Source/WebKit/Shared/WebCoreArgumentCoders.h (278907 => 278908)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-611-branch/Source/WebKit/Shared/WebCoreArgumentCoders.h  2021-06-15 22:06:17 UTC (rev 278907)
+++ branches/safari-611-branch/Source/WebKit/Shared/WebCoreArgumentCoders.h     2021-06-15 22:50:20 UTC (rev 278908)
</span><span class="lines">@@ -627,6 +627,11 @@
</span><span class="cx">     static void encode(Encoder&, const WebCore::FilterOperation&);
</span><span class="cx"> };
</span><span class="cx"> WARN_UNUSED_RETURN bool decodeFilterOperation(Decoder&, RefPtr<WebCore::FilterOperation>&);
</span><ins>+
+template<> struct ArgumentCoder<RefPtr<WebCore::FilterOperation>> {
+    static void encode(Encoder&, const RefPtr<WebCore::FilterOperation>&);
+    static WARN_UNUSED_RETURN bool decode(Decoder&, RefPtr<WebCore::FilterOperation>&);
+};
</ins><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx"> template<> struct ArgumentCoder<WebCore::BlobPart> {
</span></span></pre></div>
<a id="branchessafari611branchSourceWebKitWebProcessWebPageRemoteLayerTreePlatformCAAnimationRemoteh"></a>
<div class="modfile"><h4>Modified: branches/safari-611-branch/Source/WebKit/WebProcess/WebPage/RemoteLayerTree/PlatformCAAnimationRemote.h (278907 => 278908)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-611-branch/Source/WebKit/WebProcess/WebPage/RemoteLayerTree/PlatformCAAnimationRemote.h  2021-06-15 22:06:17 UTC (rev 278907)
+++ branches/safari-611-branch/Source/WebKit/WebProcess/WebPage/RemoteLayerTree/PlatformCAAnimationRemote.h     2021-06-15 22:50:20 UTC (rev 278908)
</span><span class="lines">@@ -129,125 +129,9 @@
</span><span class="cx"> 
</span><span class="cx">     void didStart(CFTimeInterval beginTime) { m_properties.beginTime = beginTime; }
</span><span class="cx"> 
</span><del>-    class KeyframeValue {
-    public:
-        enum KeyframeType {
-            NumberKeyType,
-            ColorKeyType,
-            PointKeyType,
-            TransformKeyType,
-            FilterKeyType,
-        };
</del><span class="cx"> 
</span><del>-        ~KeyframeValue()
-        {
-        }
</del><ins>+    using KeyframeValue = Variant<float, WebCore::Color, WebCore::FloatPoint3D, WebCore::TransformationMatrix, RefPtr<WebCore::FilterOperation>>;
</ins><span class="cx"> 
</span><del>-        KeyframeValue(float value = 0)
-            : keyType(NumberKeyType)
-            , number(value)
-        {
-        }
-
-        KeyframeValue(WebCore::Color value)
-            : keyType(ColorKeyType)
-            , color(value)
-        {
-        }
-
-        KeyframeValue(const WebCore::FloatPoint3D& value)
-            : keyType(PointKeyType)
-            , point(value)
-        {
-        }
-
-        KeyframeValue(const WebCore::TransformationMatrix& value)
-            : keyType(TransformKeyType)
-            , transform(value)
-        {
-        }
-
-        KeyframeValue(RefPtr<WebCore::FilterOperation>&& value)
-            : keyType(FilterKeyType)
-            , filter(WTFMove(value))
-        {
-        }
-
-        KeyframeValue(const KeyframeValue& other)
-        {
-            *this = other;
-        }
-
-        KeyframeValue& operator=(const KeyframeValue& other)
-        {
-            keyType = other.keyType;
-            switch (keyType) {
-            case NumberKeyType:
-                number = other.number;
-                break;
-            case ColorKeyType:
-                color = other.color;
-                break;
-            case PointKeyType:
-                point = other.point;
-                break;
-            case TransformKeyType:
-                transform = other.transform;
-                break;
-            case FilterKeyType:
-                filter = other.filter;
-                break;
-            }
-
-            return *this;
-        }
-
-        KeyframeType keyframeType() const { return keyType; }
-
-        float numberValue() const
-        {
-            ASSERT(keyType == NumberKeyType);
-            return number;
-        }
-
-        WebCore::Color colorValue() const
-        {
-            ASSERT(keyType == ColorKeyType);
-            return color;
-        }
-
-        const WebCore::FloatPoint3D& pointValue() const
-        {
-            ASSERT(keyType == PointKeyType);
-            return point;
-        }
-
-        const WebCore::TransformationMatrix& transformValue() const
-        {
-            ASSERT(keyType == TransformKeyType);
-            return transform;
-        }
-
-        const WebCore::FilterOperation* filterValue() const
-        {
-            ASSERT(keyType == FilterKeyType);
-            return filter.get();
-        }
-
-        void encode(IPC::Encoder&) const;
-        static Optional<KeyframeValue> decode(IPC::Decoder&);
-
-    private:
-        KeyframeType keyType;
-        union {
-            float number;
-            WebCore::Color color;
-            WebCore::FloatPoint3D point;
-            WebCore::TransformationMatrix transform;
-        };
-        RefPtr<WebCore::FilterOperation> filter;
-    };
-
</del><span class="cx">     struct Properties {
</span><span class="cx">         Properties()
</span><span class="cx">             : animationType(Basic)
</span><span class="lines">@@ -308,24 +192,8 @@
</span><span class="cx">     Properties m_properties;
</span><span class="cx"> };
</span><span class="cx"> 
</span><del>-WTF::TextStream& operator<<(WTF::TextStream&, const PlatformCAAnimationRemote::KeyframeValue&);
</del><span class="cx"> WTF::TextStream& operator<<(WTF::TextStream&, const PlatformCAAnimationRemote::Properties&);
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebKit
</span><span class="cx"> 
</span><span class="cx"> SPECIALIZE_TYPE_TRAITS_CAANIMATION(WebKit::PlatformCAAnimationRemote, isPlatformCAAnimationRemote())
</span><del>-
-namespace WTF {
-
-template<> struct EnumTraits<WebKit::PlatformCAAnimationRemote::KeyframeValue::KeyframeType> {
-    using values = EnumValues<
-        WebKit::PlatformCAAnimationRemote::KeyframeValue::KeyframeType,
-        WebKit::PlatformCAAnimationRemote::KeyframeValue::KeyframeType::NumberKeyType,
-        WebKit::PlatformCAAnimationRemote::KeyframeValue::KeyframeType::ColorKeyType,
-        WebKit::PlatformCAAnimationRemote::KeyframeValue::KeyframeType::PointKeyType,
-        WebKit::PlatformCAAnimationRemote::KeyframeValue::KeyframeType::TransformKeyType,
-        WebKit::PlatformCAAnimationRemote::KeyframeValue::KeyframeType::FilterKeyType
-    >;
-};
-
-} // namespace WTF
</del></span></pre></div>
<a id="branchessafari611branchSourceWebKitWebProcessWebPageRemoteLayerTreePlatformCAAnimationRemotemm"></a>
<div class="modfile"><h4>Modified: branches/safari-611-branch/Source/WebKit/WebProcess/WebPage/RemoteLayerTree/PlatformCAAnimationRemote.mm (278907 => 278908)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-611-branch/Source/WebKit/WebProcess/WebPage/RemoteLayerTree/PlatformCAAnimationRemote.mm 2021-06-15 22:06:17 UTC (rev 278907)
+++ branches/safari-611-branch/Source/WebKit/WebProcess/WebPage/RemoteLayerTree/PlatformCAAnimationRemote.mm    2021-06-15 22:50:20 UTC (rev 278908)
</span><span class="lines">@@ -98,61 +98,6 @@
</span><span class="cx"> namespace WebKit {
</span><span class="cx"> using namespace WebCore;
</span><span class="cx"> 
</span><del>-void PlatformCAAnimationRemote::KeyframeValue::encode(IPC::Encoder& encoder) const
-{
-    encoder << keyType;
-
-    switch (keyType) {
-    case NumberKeyType:
-        encoder << number;
-        break;
-    case ColorKeyType:
-        encoder << color;
-        break;
-    case PointKeyType:
-        encoder << point;
-        break;
-    case TransformKeyType:
-        encoder << transform;
-        break;
-    case FilterKeyType:
-        encoder << *filter.get();
-        break;
-    }
-}
-
-Optional<PlatformCAAnimationRemote::KeyframeValue> PlatformCAAnimationRemote::KeyframeValue::decode(IPC::Decoder& decoder)
-{
-    PlatformCAAnimationRemote::KeyframeValue value;
-    if (!decoder.decode(value.keyType))
-        return WTF::nullopt;
-
-    switch (value.keyType) {
-    case NumberKeyType:
-        if (!decoder.decode(value.number))
-            return WTF::nullopt;
-        break;
-    case ColorKeyType:
-        if (!decoder.decode(value.color))
-            return WTF::nullopt;
-        break;
-    case PointKeyType:
-        if (!decoder.decode(value.point))
-            return WTF::nullopt;
-        break;
-    case TransformKeyType:
-        if (!decoder.decode(value.transform))
-            return WTF::nullopt;
-        break;
-    case FilterKeyType:
-        if (!decodeFilterOperation(decoder, value.filter))
-            return WTF::nullopt;
-        break;
-    }
-
-    return WTFMove(value);
-}
-
</del><span class="cx"> static void encodeTimingFunction(IPC::Encoder& encoder, TimingFunction* timingFunction)
</span><span class="cx"> {
</span><span class="cx">     switch (timingFunction->type()) {
</span><span class="lines">@@ -733,25 +678,22 @@
</span><span class="cx"> 
</span><span class="cx"> static NSObject* animationValueFromKeyframeValue(const PlatformCAAnimationRemote::KeyframeValue& keyframeValue)
</span><span class="cx"> {
</span><del>-    switch (keyframeValue.keyframeType()) {
-    case PlatformCAAnimationRemote::KeyframeValue::NumberKeyType:
-        return @(keyframeValue.numberValue());
-            
-    case PlatformCAAnimationRemote::KeyframeValue::ColorKeyType: {
-        auto [r, g, b, a] = keyframeValue.colorValue().toSRGBALossy<uint8_t>();
-        return @[ @(r), @(g), @(b), @(a) ];
-    }
-
-    case PlatformCAAnimationRemote::KeyframeValue::PointKeyType: {
-        FloatPoint3D point = keyframeValue.pointValue();
-        return @[ @(point.x()), @(point.y()), @(point.z()) ];
-    }
-    case PlatformCAAnimationRemote::KeyframeValue::TransformKeyType:
-        return [NSValue valueWithCATransform3D:keyframeValue.transformValue()];
-            
-    case PlatformCAAnimationRemote::KeyframeValue::FilterKeyType:
-        return PlatformCAFilters::filterValueForOperation(keyframeValue.filterValue(), 0 /* unused */).autorelease();
-    }
</del><ins>+    return WTF::switchOn(keyframeValue,
+        [&](const float number) -> RetainPtr<NSObject> { return @(number); },
+        [&](const WebCore::Color color) -> RetainPtr<NSObject> {
+            auto [r, g, b, a] =  color.toSRGBALossy<uint8_t>();
+            return @[ @(r), @(g), @(b), @(a) ];
+        },
+        [&](const WebCore::FloatPoint3D point) -> RetainPtr<NSObject> {
+            return @[ @(point.x()), @(point.y()), @(point.z()) ];
+        },
+        [&](const WebCore::TransformationMatrix matrix) -> RetainPtr<NSObject> {
+            return [NSValue valueWithCATransform3D:matrix];
+        },
+        [&](const RefPtr<WebCore::FilterOperation> filter) -> RetainPtr<NSObject> {
+            return PlatformCAFilters::filterValueForOperation(filter.get(), 0 /* unused */);
+        }
+    );
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> static RetainPtr<CAAnimation> createAnimation(CALayer *layer, RemoteLayerTreeHost* layerTreeHost, const PlatformCAAnimationRemote::Properties& properties)
</span><span class="lines">@@ -885,35 +827,6 @@
</span><span class="cx">     END_BLOCK_OBJC_EXCEPTIONS
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-TextStream& operator<<(TextStream&ts, const PlatformCAAnimationRemote::KeyframeValue& value)
-{
-    switch (value.keyframeType()) {
-    case PlatformCAAnimationRemote::KeyframeValue::NumberKeyType:
-        ts << "number=" << value.numberValue();
-        break;
-    case PlatformCAAnimationRemote::KeyframeValue::ColorKeyType:
-        ts << "color=";
-        ts << value.colorValue();
-        break;
-    case PlatformCAAnimationRemote::KeyframeValue::PointKeyType:
-        ts << "point=";
-        ts << value.pointValue();
-        break;
-    case PlatformCAAnimationRemote::KeyframeValue::TransformKeyType:
-        ts << "transform=";
-        ts << value.transformValue();
-        break;
-    case PlatformCAAnimationRemote::KeyframeValue::FilterKeyType:
-        ts << "filter=";
-        if (value.filterValue())
-            ts << *value.filterValue();
-        else
-            ts << "null";
-        break;
-    }
-    return ts;
-}
-
</del><span class="cx"> TextStream& operator<<(TextStream& ts, const PlatformCAAnimationRemote::Properties& animation)
</span><span class="cx"> {
</span><span class="cx">     ts << "type=";
</span><span class="lines">@@ -973,9 +886,18 @@
</span><span class="cx">         if (i < animation.timingFunctions.size() && animation.timingFunctions[i])
</span><span class="cx">             ts.dumpProperty<const TimingFunction&>("timing function", *animation.timingFunctions[i]);
</span><span class="cx"> 
</span><del>-        if (i < animation.keyValues.size())
-            ts.dumpProperty("value", animation.keyValues[i]);
-
</del><ins>+        if (i < animation.keyValues.size()) {
+            ts.startGroup();
+            ts << "value ";
+            WTF::switchOn(animation.keyValues[i],
+                [&](const float number) { ts << "number=" << number; },
+                [&](const WebCore::Color color) { ts << "color=" << color; },
+                [&](const WebCore::FloatPoint3D point) { ts << "point=" << point; },
+                [&](const WebCore::TransformationMatrix matrix) { ts << "transform=" << matrix; },
+                [&](const RefPtr<WebCore::FilterOperation> filter) { ts << "filter=" << ValueOrNull(filter.get()); }
+            );
+            ts.endGroup();
+        }
</ins><span class="cx">         ts << ")";
</span><span class="cx">     }
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>