aboutsummaryrefslogtreecommitdiffhomepage
path: root/experimental
diff options
context:
space:
mode:
authorGravatar Hal Canary <halcanary@google.com>2018-06-13 09:59:02 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-06-14 14:55:17 +0000
commitc640d0dc96924699fdbb1a3cbdc907aa07b1cb3c (patch)
treed8973c4700da0bbe95c73bb3bc0c7d8f4589186d /experimental
parent4d4665436e540bd2ca393c139cbaff1eabd62ee2 (diff)
Revert "Revert "SkTypes: extract SkTo""
This reverts commit fdcfb8b7c23fbf18f872d2c31d27978235033876. > Original change's description: > > SkTypes: extract SkTo > > > > Change-Id: I8de790d5013db2105ad885fa2683303d7c250b09 > > Reviewed-on: https://skia-review.googlesource.com/133620 > > Reviewed-by: Mike Klein <mtklein@google.com> Change-Id: Ida74fbc5c21248a724a5edbf9fae18a33bcb23aa Reviewed-on: https://skia-review.googlesource.com/134506 Reviewed-by: Mike Klein <mtklein@google.com> Commit-Queue: Hal Canary <halcanary@google.com>
Diffstat (limited to 'experimental')
-rw-r--r--experimental/svg/model/SkSVGDOM.cpp7
-rw-r--r--experimental/svg/model/SkSVGRenderContext.cpp4
2 files changed, 7 insertions, 4 deletions
diff --git a/experimental/svg/model/SkSVGDOM.cpp b/experimental/svg/model/SkSVGDOM.cpp
index 5b4dc6626f..758a3ede12 100644
--- a/experimental/svg/model/SkSVGDOM.cpp
+++ b/experimental/svg/model/SkSVGDOM.cpp
@@ -8,12 +8,11 @@
#include "SkCanvas.h"
#include "SkDOM.h"
#include "SkParsePath.h"
-#include "SkString.h"
#include "SkSVGAttributeParser.h"
#include "SkSVGCircle.h"
#include "SkSVGClipPath.h"
-#include "SkSVGDefs.h"
#include "SkSVGDOM.h"
+#include "SkSVGDefs.h"
#include "SkSVGEllipse.h"
#include "SkSVGG.h"
#include "SkSVGLine.h"
@@ -25,12 +24,14 @@
#include "SkSVGRadialGradient.h"
#include "SkSVGRect.h"
#include "SkSVGRenderContext.h"
-#include "SkSVGStop.h"
#include "SkSVGSVG.h"
+#include "SkSVGStop.h"
#include "SkSVGTypes.h"
#include "SkSVGUse.h"
#include "SkSVGValue.h"
+#include "SkString.h"
#include "SkTSearch.h"
+#include "SkTo.h"
namespace {
diff --git a/experimental/svg/model/SkSVGRenderContext.cpp b/experimental/svg/model/SkSVGRenderContext.cpp
index 2b7ba2cf2c..cab5a00ea9 100644
--- a/experimental/svg/model/SkSVGRenderContext.cpp
+++ b/experimental/svg/model/SkSVGRenderContext.cpp
@@ -5,13 +5,15 @@
* found in the LICENSE file.
*/
+#include "SkSVGRenderContext.h"
+
#include "SkCanvas.h"
#include "SkDashPathEffect.h"
#include "SkPath.h"
#include "SkSVGAttribute.h"
#include "SkSVGNode.h"
-#include "SkSVGRenderContext.h"
#include "SkSVGTypes.h"
+#include "SkTo.h"
namespace {