From c45a5c559365b2e04c89a3ef09752e5c1bb24aa2 Mon Sep 17 00:00:00 2001
From: Florin Malita <fmalita@chromium.org>
Date: Mon, 16 Jul 2018 14:20:51 -0400
Subject: [skottie] Treat color properties as optional (default black)

TBR=
Change-Id: I51029b5718ec9925c214709ae4e3497dae130d37
Reviewed-on: https://skia-review.googlesource.com/141544
Reviewed-by: Florin Malita <fmalita@chromium.org>
Commit-Queue: Florin Malita <fmalita@chromium.org>
---
 modules/skottie/src/Skottie.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'modules')

diff --git a/modules/skottie/src/Skottie.cpp b/modules/skottie/src/Skottie.cpp
index 20390eedc5..760d9c52fa 100644
--- a/modules/skottie/src/Skottie.cpp
+++ b/modules/skottie/src/Skottie.cpp
@@ -254,12 +254,12 @@ sk_sp<sksg::GeometryNode> AttachPolystarGeometry(const skjson::ObjectValue& jsta
 
 sk_sp<sksg::Color> AttachColor(const skjson::ObjectValue& jcolor, AttachContext* ctx) {
     auto color_node = sksg::Color::Make(SK_ColorBLACK);
-    auto color_attached = BindProperty<VectorValue>(jcolor["c"], &ctx->fAnimators,
+    BindProperty<VectorValue>(jcolor["c"], &ctx->fAnimators,
         [color_node](const VectorValue& c) {
             color_node->setColor(ValueTraits<VectorValue>::As<SkColor>(c));
         });
 
-    return color_attached ? color_node : nullptr;
+    return color_node;
 }
 
 sk_sp<sksg::Gradient> AttachGradient(const skjson::ObjectValue& jgrad, AttachContext* ctx) {
-- 
cgit v1.2.3