commit 97e0861b677c833b2cb9886c125a79f442c271df
author Florin Malita <fmalita@chromium.org> Fri Apr 10 00:29:13 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Apr 10 13:35:53 2020 +0000
tree a09602040a2254e07e6f34cf084218acf028b3f1
parent f7255d72f8da16153cb3d794a4b6802494f390e2

[SVG] Replace custom attribute value wrappers with std::variant

Less boilerplate, more STL.

Change-Id: I601f75877d60085cbf3d39f401543fbe9c086f90
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/282836
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Florin Malita <fmalita@chromium.org>

experimental/svg/model/SkSVGTransformableNode.cpp

diff --git a/experimental/svg/model/SkSVGTransformableNode.cpp b/experimental/svg/model/SkSVGTransformableNode.cpp
index 9eeb7ea..df21b20 100644
--- a/experimental/svg/model/SkSVGTransformableNode.cpp
+++ b/experimental/svg/model/SkSVGTransformableNode.cpp
@@ -7,7 +7,6 @@
 
 #include "experimental/svg/model/SkSVGRenderContext.h"
 #include "experimental/svg/model/SkSVGTransformableNode.h"
-#include "experimental/svg/model/SkSVGValue.h"
 #include "include/core/SkCanvas.h"
 
 SkSVGTransformableNode::SkSVGTransformableNode(SkSVGTag tag)
@@ -24,10 +23,10 @@
     return this->INHERITED::onPrepareToRender(ctx);
 }
 
-void SkSVGTransformableNode::onSetAttribute(SkSVGAttribute attr, const SkSVGValue& v) {
+void SkSVGTransformableNode::onSetAttribute(SkSVGAttribute attr, const SkSVGAttributeValue& v) {
     switch (attr) {
     case SkSVGAttribute::kTransform:
-        if (const auto* transform = v.as<SkSVGTransformValue>()) {
+        if (const auto* transform = std::get_if<SkSVGTransformType>(&v)) {
             this->setTransform(*transform);
         }
         break;