aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Herb Derby <herb@google.com>2017-02-14 14:42:30 -0500
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-02-14 20:17:05 +0000
commit5a8fe978c3d90a5aced700af42b9394d4264cdfc (patch)
tree23db8eb5d66015a9ff6c1416c0f010c7b1c91a33
parentc42a1cdd1de7a3cf57a9a5fd7363f5fb660e97d0 (diff)
Remove include/xml from public API.
Move SkDOM and ilk from include/xml to src/xml. I have looked for uses of SkDOM in the depot using cs/ and have found none, but this is not perfect. So, if this breaks external builds, revert it. TBR=reed@google.com Change-Id: I162a1977f0649b049c0f93f016701784d025996d Reviewed-on: https://skia-review.googlesource.com/8447 Reviewed-by: Herb Derby <herb@google.com> Reviewed-by: Mike Reed <reed@google.com> Reviewed-by: Florin Malita <fmalita@chromium.org> Commit-Queue: Herb Derby <herb@google.com>
-rw-r--r--BUILD.gn2
-rw-r--r--src/xml/SkDOM.h (renamed from include/xml/SkDOM.h)2
-rw-r--r--src/xml/SkXMLParser.h (renamed from include/xml/SkXMLParser.h)0
-rw-r--r--src/xml/SkXMLWriter.h (renamed from include/xml/SkXMLWriter.h)0
4 files changed, 2 insertions, 2 deletions
diff --git a/BUILD.gn b/BUILD.gn
index ffc5713bc3..b1bfb015e5 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -67,7 +67,6 @@ skia_public_includes = [
"include/svg",
"include/utils",
"include/utils/mac",
- "include/xml",
]
# Skia public API, generally provided by :skia.
@@ -112,6 +111,7 @@ config("skia_private") {
"src/sksl",
"src/utils",
"src/utils/win",
+ "src/xml",
"third_party/etc1",
"third_party/gif",
"third_party/ktx",
diff --git a/include/xml/SkDOM.h b/src/xml/SkDOM.h
index aa7ea784f6..0ffb04232a 100644
--- a/include/xml/SkDOM.h
+++ b/src/xml/SkDOM.h
@@ -20,7 +20,7 @@ class SkDOMParser;
class SkStream;
class SkXMLParser;
-class SK_API SkDOM : public SkNoncopyable {
+class SkDOM : public SkNoncopyable {
public:
SkDOM();
~SkDOM();
diff --git a/include/xml/SkXMLParser.h b/src/xml/SkXMLParser.h
index 3f69013ce6..3f69013ce6 100644
--- a/include/xml/SkXMLParser.h
+++ b/src/xml/SkXMLParser.h
diff --git a/include/xml/SkXMLWriter.h b/src/xml/SkXMLWriter.h
index b1d513c508..b1d513c508 100644
--- a/include/xml/SkXMLWriter.h
+++ b/src/xml/SkXMLWriter.h