Web Animations CSS: Support animation of fill and stroke

Source/core/animation/AnimatableSVGPaint.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 11 matching lines @@
  * OWNER 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 PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
-#include "core/animation/AnimatableVisibility.h"
+#include "core/animation/AnimatableSVGPaint.h"
 
 namespace WebCore {
 
-PassRefPtr<AnimatableValue> AnimatableVisibility::interpolateTo(const AnimatableValue* value, double fraction) const
+PassRefPtr<AnimatableValue> AnimatableSVGPaint::interpolateTo(const AnimatableValue* value, double fraction) const
 {
-    EVisibility from = m_visibility;
-    EVisibility to = toAnimatableVisibility(value)->m_visibility;
-    if (from != VISIBLE && to != VISIBLE)
+    const AnimatableSVGPaint* svgPaint = toAnimatableSVGPaint(value);
+    if (paintType() != SVGPaint::SVG_PAINTTYPE_RGBCOLOR || svgPaint->paintType() != SVGPaint::SVG_PAINTTYPE_RGBCOLOR)
         return defaultInterpolateTo(this, value, fraction);
-    if (fraction <= 0)
-        return takeConstRef(this);
-    if (fraction >= 1)
-        return takeConstRef(value);
-    return takeConstRef(from == VISIBLE ? this : value);
+    return AnimatableSVGPaint::create(this->paintType(), this->m_color.interpolateTo(svgPaint->m_color, fraction), this->uri());

[Steve Block, 2013/10/03 02:37:53]

If you test for (paintType() == SVG_PAINTTYPE_RGBCOLOR && svgPaint->paintType()
== SVG_PAINTTYPE_RGBCOLOR) it would be more clear why it's OK to pass
this->paintType() to create(). You could even pass SVG_PAINTTYPE_RGBCOLOR
directly.

Also, no need for this->foo().

Also, can you assert that the uri is unused/empty in this case?

[dstockwell, 2013/10/03 05:01:07]

Done.

 }
 
-} // namespace WebCore
+PassRefPtr<AnimatableValue> AnimatableSVGPaint::addWith(const AnimatableValue* value) const
+{
+    const AnimatableSVGPaint* svgPaint = toAnimatableSVGPaint(value);
+    if (paintType() != SVGPaint::SVG_PAINTTYPE_RGBCOLOR || svgPaint->paintType() != SVGPaint::SVG_PAINTTYPE_RGBCOLOR)
+        return defaultAddWith(this, value);
+    return AnimatableSVGPaint::create(this->paintType(), this->m_color.addWith(svgPaint->m_color), this->uri());

[Steve Block, 2013/10/03 02:37:53]

Similar comments to above.

[dstockwell, 2013/10/03 05:01:07]

Done.

+}
+
+}