diff options
| author |  Hal Canary <halcanary@google.com> | 2018-06-13 09:59:02 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-06-14 14:55:17 +0000 |
| commit | c640d0dc96924699fdbb1a3cbdc907aa07b1cb3c (patch) | |
| tree | d8973c4700da0bbe95c73bb3bc0c7d8f4589186d /src/xml | |
| parent | 4d4665436e540bd2ca393c139cbaff1eabd62ee2 (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 'src/xml')
| -rw-r--r-- | src/xml/SkDOM.cpp | 3 | ||||
| -rw-r--r-- | src/xml/SkXMLParser.cpp | 4 | ||||
| -rw-r--r-- | src/xml/SkXMLWriter.cpp | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/src/xml/SkDOM.cpp b/src/xml/SkDOM.cpp index 2e37dd7807..e6c343515f 100644 --- a/src/xml/SkDOM.cpp +++ b/src/xml/SkDOM.cpp @@ -5,9 +5,10 @@ * found in the LICENSE file. */ - #include "SkDOM.h" + #include "SkStream.h" +#include "SkTo.h" #include "SkXMLParser.h" #include "SkXMLWriter.h" diff --git a/src/xml/SkXMLParser.cpp b/src/xml/SkXMLParser.cpp index 23c4e672b5..36e1ab3ea0 100644 --- a/src/xml/SkXMLParser.cpp +++ b/src/xml/SkXMLParser.cpp @@ -5,12 +5,14 @@ * found in the LICENSE file. */ +#include "SkXMLParser.h" + #include "expat.h" #include "SkStream.h" #include "SkString.h" +#include "SkTo.h" #include "SkTypes.h" -#include "SkXMLParser.h" static char const* const gErrorStrings[] = { "empty or missing file ", diff --git a/src/xml/SkXMLWriter.cpp b/src/xml/SkXMLWriter.cpp index 67dcf59d1d..0be9c5560a 100644 --- a/src/xml/SkXMLWriter.cpp +++ b/src/xml/SkXMLWriter.cpp @@ -6,7 +6,9 @@ */ #include "SkXMLWriter.h" + #include "SkStream.h" +#include "SkTo.h" SkXMLWriter::SkXMLWriter(bool doEscapeMarkup) : fDoEscapeMarkup(doEscapeMarkup) {} |