diff options
| author |  Hal Canary <halcanary@google.com> | 2018-06-13 09:42:32 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-06-13 13:45:47 +0000 |
| commit | fdcfb8b7c23fbf18f872d2c31d27978235033876 (patch) | |
| tree | 3e3ad1c6ffe8647f45b08a560ab99384437dc2ba /experimental | |
| parent | bb9ee9b4aa7d80e8a85832a462a3123060d4bd64 (diff) | |
Revert "SkTypes: extract SkTo"
This reverts commit 2a2f67592602b18527bc3fd449132d420cd5b62e.
Reason for revert: this appears to be what is holding up the Chrome roll.
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>
TBR=mtklein@google.com,halcanary@google.com
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Change-Id: Iafd738aedfb679a23c061a51afe4b98a8d4cdfae
Reviewed-on: https://skia-review.googlesource.com/134504
Reviewed-by: Hal Canary <halcanary@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
Diffstat (limited to 'experimental')
| -rw-r--r-- | experimental/svg/model/SkSVGDOM.cpp | 7 | ||||
| -rw-r--r-- | experimental/svg/model/SkSVGRenderContext.cpp | 4 |
2 files changed, 4 insertions, 7 deletions
diff --git a/experimental/svg/model/SkSVGDOM.cpp b/experimental/svg/model/SkSVGDOM.cpp index 758a3ede12..5b4dc6626f 100644 --- a/experimental/svg/model/SkSVGDOM.cpp +++ b/experimental/svg/model/SkSVGDOM.cpp @@ -8,11 +8,12 @@ #include "SkCanvas.h" #include "SkDOM.h" #include "SkParsePath.h" +#include "SkString.h" #include "SkSVGAttributeParser.h" #include "SkSVGCircle.h" #include "SkSVGClipPath.h" -#include "SkSVGDOM.h" #include "SkSVGDefs.h" +#include "SkSVGDOM.h" #include "SkSVGEllipse.h" #include "SkSVGG.h" #include "SkSVGLine.h" @@ -24,14 +25,12 @@ #include "SkSVGRadialGradient.h" #include "SkSVGRect.h" #include "SkSVGRenderContext.h" -#include "SkSVGSVG.h" #include "SkSVGStop.h" +#include "SkSVGSVG.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 cab5a00ea9..2b7ba2cf2c 100644 --- a/experimental/svg/model/SkSVGRenderContext.cpp +++ b/experimental/svg/model/SkSVGRenderContext.cpp @@ -5,15 +5,13 @@ * 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 { |