AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[reland] SkMetaData: move from src/ to tools/

Browse Source 
Original: https://skia-review.googlesource.com/c/skia/+/227436
Change-Id: Iec326027319f39b0402e1b5c03b327cb26249159
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/227778
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
This commit is contained in:
Hal Canary 2019-07-15 14:01:37 -04:00 committed by Skia Commit-Bot
parent 63fdd0191b
commit e574f1e409
8 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BUILD.gn
View File

@ -1636,6 +1636,8 @@ if (skia_enable_tools) {
"tools/LsanSuppressions.cpp",
"tools/ProcStats.cpp",
"tools/Resources.cpp",
"tools/SkMetaData.cpp",
"tools/SkMetaData.h",
"tools/SkSharingProc.cpp",
"tools/ToolUtils.cpp",
"tools/UrlDataManager.cpp",

2
gm/fontmgr.cpp
View File

@ -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>

1
gn/utils.gni
View File

@ -54,7 +54,6 @@ skia_utils_sources = [
"$_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",

14
public.bzl
View File

@ -457,10 +457,9 @@ DM_SRCS_ALL = struct(
"src/xml/*.cpp",
"tests/*.cpp",
"tests/*.h",
"tools/ios_utils.h",
"tools/AutoreleasePool.h",
"tools/BinaryAsset.h",
"tools/BigPathBench.inc",
"tools/BinaryAsset.h",
"tools/CrashHandler.cpp",
"tools/CrashHandler.h",
"tools/DDLPromiseImageHelper.cpp",
@ -475,8 +474,13 @@ DM_SRCS_ALL = struct(
"tools/ResourceFactory.h",
"tools/Resources.cpp",
"tools/Resources.h",
"tools/SkMetaData.cpp",
"tools/SkMetaData.h",
"tools/SkSharingProc.cpp",
"tools/SkVMBuilders.cpp",
"tools/SkVMBuilders.h",
"tools/ToolUtils.cpp",
"tools/ToolUtils.h",
"tools/UrlDataManager.cpp",
"tools/UrlDataManager.h",
"tools/debugger/*.cpp",
@ -492,17 +496,15 @@ DM_SRCS_ALL = struct(
"tools/fonts/TestTypeface.cpp",
"tools/fonts/TestTypeface.h",
"tools/fonts/ToolUtilsFont.cpp",
"tools/fonts/test_font_index.inc",
"tools/fonts/test_font_monospace.inc",
"tools/fonts/test_font_sans_serif.inc",
"tools/fonts/test_font_serif.inc",
"tools/fonts/test_font_index.inc",
"tools/gpu/**/*.cpp",
"tools/gpu/**/*.h",
"tools/ios_utils.h",
"tools/random_parse_path.cpp",
"tools/random_parse_path.h",
"tools/SkSharingProc.cpp",
"tools/ToolUtils.cpp",
"tools/ToolUtils.h",
"tools/timer/*.cpp",
"tools/timer/*.h",
"tools/trace/*.cpp",

2
samplecode/Sample.h
View File

@ -13,10 +13,10 @@
#include "include/core/SkRefCnt.h"
#include "include/core/SkString.h"
#include "include/private/SkMacros.h"
#include "src/utils/SkMetaData.h"
#include "tools/InputState.h"
#include "tools/ModifierKey.h"
#include "tools/Registry.h"
#include "tools/SkMetaData.h"
class SkCanvas;
class Sample;

2
tests/MetaDataTest.cpp
View File

@ -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) {

2
src/utils/SkMetaData.cpp → tools/SkMetaData.cpp
View File

@ -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"

0
src/utils/SkMetaData.h → tools/SkMetaData.h
View File