commit 9d844d8ce5a29130686d1e2f3d612b180cef5f0b
author Hal Canary <halcanary@google.com> Mon Jul 15 14:01:37 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Jul 15 18:45:09 2019 +0000
tree 8b0be3f5bed63a496ce37bbb3e6eeec2e6b111f0
parent aa2ca3f868560fe0e2d2b263e372c744c9b3e7a6

SkMetaData: move from src/ to tools/

Change-Id: If581c8ceeaa76985535cb7b6772742f0011cfe8e
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/227436
Commit-Queue: Hal Canary <halcanary@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>
Auto-Submit: Hal Canary <halcanary@google.com>
Reviewed-by: Ben Wagner <bungeman@google.com>

BUILD.gn

diff --git a/BUILD.gn b/BUILD.gn
index 6fba35f..b1a2931 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1634,6 +1634,8 @@
       "tools/LsanSuppressions.cpp",
       "tools/ProcStats.cpp",
       "tools/Resources.cpp",
+      "tools/SkMetaData.cpp",
+      "tools/SkMetaData.h",
       "tools/SkSharingProc.cpp",
       "tools/ToolUtils.cpp",
       "tools/UrlDataManager.cpp",

gm/fontmgr.cpp

diff --git a/gm/fontmgr.cpp b/gm/fontmgr.cpp
index 9290825..8b2b244 100644
--- a/gm/fontmgr.cpp
+++ b/gm/fontmgr.cpp
@@ -25,7 +25,7 @@
 #include "include/core/SkTypeface.h"
 #include "include/core/SkTypes.h"
 #include "src/core/SkFontPriv.h"
-#include "src/utils/SkMetaData.h"
+#include "tools/SkMetaData.h"
 #include "tools/ToolUtils.h"
 
 #include <utility>

gn/utils.gni

diff --git a/gn/utils.gni b/gn/utils.gni
index 7dcb013..96af919 100644
--- a/gn/utils.gni
+++ b/gn/utils.gni
@@ -54,7 +54,6 @@
   "$_src/utils/SkJSONWriter.h",
   "$_src/utils/SkMatrix22.cpp",
   "$_src/utils/SkMatrix22.h",
-  "$_src/utils/SkMetaData.cpp",
   "$_src/utils/SkMultiPictureDocument.cpp",
   "$_src/utils/SkNWayCanvas.cpp",
   "$_src/utils/SkNullCanvas.cpp",

samplecode/Sample.h

diff --git a/samplecode/Sample.h b/samplecode/Sample.h
index 390ac4c..199bbad 100644
--- a/samplecode/Sample.h
+++ b/samplecode/Sample.h
@@ -13,7 +13,7 @@
 #include "include/core/SkRefCnt.h"
 #include "include/core/SkString.h"
 #include "include/private/SkMacros.h"
-#include "src/utils/SkMetaData.h"
+#include "tools/SkMetaData.h"
 #include "tools/ModifierKey.h"
 #include "tools/Registry.h"
 

tests/MetaDataTest.cpp

diff --git a/tests/MetaDataTest.cpp b/tests/MetaDataTest.cpp
index 7e9a774..204928e 100644
--- a/tests/MetaDataTest.cpp
+++ b/tests/MetaDataTest.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "include/core/SkRefCnt.h"
-#include "src/utils/SkMetaData.h"
+#include "tools/SkMetaData.h"
 #include "tests/Test.h"
 
 static void test_ptrs(skiatest::Reporter* reporter) {

tools/SkMetaData.cpp

diff --git a/src/utils/SkMetaData.cpp b/tools/SkMetaData.cpp
similarity index 99%
rename from src/utils/SkMetaData.cpp
rename to tools/SkMetaData.cpp
index 57640e9..76807db 100644
--- a/src/utils/SkMetaData.cpp
+++ b/tools/SkMetaData.cpp
@@ -5,7 +5,7 @@
  * found in the LICENSE file.
  */
 
-#include "src/utils/SkMetaData.h"
+#include "tools/SkMetaData.h"
 
 #include "include/core/SkRefCnt.h"
 #include "include/private/SkMalloc.h"

tools/SkMetaData.h

diff --git a/src/utils/SkMetaData.h b/tools/SkMetaData.h
similarity index 100%
rename from src/utils/SkMetaData.h
rename to tools/SkMetaData.h