From fdcfb8b7c23fbf18f872d2c31d27978235033876 Mon Sep 17 00:00:00 2001 From: Hal Canary Date: Wed, 13 Jun 2018 09:42:32 -0400 Subject: 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 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 Commit-Queue: Hal Canary --- src/xml/SkDOM.cpp | 3 +-- src/xml/SkXMLParser.cpp | 4 +--- src/xml/SkXMLWriter.cpp | 2 -- 3 files changed, 2 insertions(+), 7 deletions(-) (limited to 'src/xml') diff --git a/src/xml/SkDOM.cpp b/src/xml/SkDOM.cpp index e6c343515f..2e37dd7807 100644 --- a/src/xml/SkDOM.cpp +++ b/src/xml/SkDOM.cpp @@ -5,10 +5,9 @@ * found in the LICENSE file. */ -#include "SkDOM.h" +#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 36e1ab3ea0..23c4e672b5 100644 --- a/src/xml/SkXMLParser.cpp +++ b/src/xml/SkXMLParser.cpp @@ -5,14 +5,12 @@ * 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 0be9c5560a..67dcf59d1d 100644 --- a/src/xml/SkXMLWriter.cpp +++ b/src/xml/SkXMLWriter.cpp @@ -6,9 +6,7 @@ */ #include "SkXMLWriter.h" - #include "SkStream.h" -#include "SkTo.h" SkXMLWriter::SkXMLWriter(bool doEscapeMarkup) : fDoEscapeMarkup(doEscapeMarkup) {} -- cgit v1.2.3