aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gyp/SampleApp.gyp2
-rw-r--r--gyp/debugger.gyp18
-rw-r--r--gyp/dm.gypi12
-rw-r--r--gyp/gmslides.gypi18
-rw-r--r--gyp/skiaserve.gyp18
-rw-r--r--gyp/tests.gypi18
-rw-r--r--public.bzl2
-rw-r--r--tools/debugger/SkDebugCanvas.cpp (renamed from src/utils/debugger/SkDebugCanvas.cpp)0
-rw-r--r--tools/debugger/SkDebugCanvas.h (renamed from src/utils/debugger/SkDebugCanvas.h)0
-rw-r--r--tools/debugger/SkDrawCommand.cpp (renamed from src/utils/debugger/SkDrawCommand.cpp)0
-rw-r--r--tools/debugger/SkDrawCommand.h (renamed from src/utils/debugger/SkDrawCommand.h)0
-rw-r--r--tools/debugger/SkObjectParser.cpp (renamed from src/utils/debugger/SkObjectParser.cpp)0
-rw-r--r--tools/debugger/SkObjectParser.h (renamed from src/utils/debugger/SkObjectParser.h)0
-rw-r--r--tools/debugger/SkOverdrawMode.cpp (renamed from src/utils/debugger/SkOverdrawMode.cpp)0
-rw-r--r--tools/debugger/SkOverdrawMode.h (renamed from src/utils/debugger/SkOverdrawMode.h)0
15 files changed, 44 insertions, 44 deletions
diff --git a/gyp/SampleApp.gyp b/gyp/SampleApp.gyp
index 1cd78b77d2..bb48affe9a 100644
--- a/gyp/SampleApp.gyp
+++ b/gyp/SampleApp.gyp
@@ -17,7 +17,7 @@
'../src/lazy',
'../gm', # needed to pull gm.h
'../samplecode', # To pull SampleApp.h and SampleCode.h
- '../src/utils/debugger',
+ '../tools/debugger',
'../tools',
'../experimental',
],
diff --git a/gyp/debugger.gyp b/gyp/debugger.gyp
index fb0269656f..e7e8275125 100644
--- a/gyp/debugger.gyp
+++ b/gyp/debugger.gyp
@@ -84,7 +84,7 @@
'include_dirs' : [
'../include/private',
'../src/core',
- '../src/utils/debugger',
+ '../tools/debugger',
'../debugger', # To pull SkDebugger.h
'../src/gpu', # To pull gl/GrGLUtil.h
'../src/ports', # To pull SkFontDescriptor.h
@@ -95,14 +95,14 @@
],
'sources': [
'../debugger/SkDebugger.cpp',
- '../src/utils/debugger/SkDebugCanvas.h',
- '../src/utils/debugger/SkDebugCanvas.cpp',
- '../src/utils/debugger/SkDrawCommand.h',
- '../src/utils/debugger/SkDrawCommand.cpp',
- '../src/utils/debugger/SkObjectParser.h',
- '../src/utils/debugger/SkObjectParser.cpp',
- '../src/utils/debugger/SkOverdrawMode.h',
- '../src/utils/debugger/SkOverdrawMode.cpp',
+ '../tools/debugger/SkDebugCanvas.h',
+ '../tools/debugger/SkDebugCanvas.cpp',
+ '../tools/debugger/SkDrawCommand.h',
+ '../tools/debugger/SkDrawCommand.cpp',
+ '../tools/debugger/SkObjectParser.h',
+ '../tools/debugger/SkObjectParser.cpp',
+ '../tools/debugger/SkOverdrawMode.h',
+ '../tools/debugger/SkOverdrawMode.cpp',
'../debugger/debuggermain.cpp',
'../debugger/QT/SkDebuggerGUI.cpp',
'../debugger/QT/SkDebuggerGUI.h',
diff --git a/gyp/dm.gypi b/gyp/dm.gypi
index 2fda486d89..fbfd4e539e 100644
--- a/gyp/dm.gypi
+++ b/gyp/dm.gypi
@@ -13,7 +13,7 @@
'../src/images',
'../src/lazy',
'../src/utils',
- '../src/utils/debugger',
+ '../tools/debugger',
'../tests',
],
'dependencies': [
@@ -41,11 +41,11 @@
'../dm/DMJsonWriter.cpp',
'../gm/gm.cpp',
- '../src/utils/debugger/SkDebugCanvas.cpp',
- '../src/utils/debugger/SkDrawCommand.cpp',
- '../src/utils/debugger/SkObjectParser.cpp',
- '../src/utils/debugger/SkOverdrawMode.h',
- '../src/utils/debugger/SkOverdrawMode.cpp',
+ '../tools/debugger/SkDebugCanvas.cpp',
+ '../tools/debugger/SkDrawCommand.cpp',
+ '../tools/debugger/SkObjectParser.cpp',
+ '../tools/debugger/SkOverdrawMode.h',
+ '../tools/debugger/SkOverdrawMode.cpp',
],
'conditions': [
[ 'skia_gpu == 1', {
diff --git a/gyp/gmslides.gypi b/gyp/gmslides.gypi
index 595bb36a79..6ad0cca97e 100644
--- a/gyp/gmslides.gypi
+++ b/gyp/gmslides.gypi
@@ -8,7 +8,7 @@
'../gm',
# include dirs needed by particular GMs
'../include/client/android',
- '../src/utils/debugger',
+ '../tools/debugger',
'../src/images',
'../src/lazy',
],
@@ -22,14 +22,14 @@
# Files needed by particular GMs
'../src/gpu/batches/GrTestBatch.h',
- '../src/utils/debugger/SkDrawCommand.h',
- '../src/utils/debugger/SkDrawCommand.cpp',
- '../src/utils/debugger/SkDebugCanvas.h',
- '../src/utils/debugger/SkDebugCanvas.cpp',
- '../src/utils/debugger/SkObjectParser.h',
- '../src/utils/debugger/SkObjectParser.cpp',
- '../src/utils/debugger/SkOverdrawMode.h',
- '../src/utils/debugger/SkOverdrawMode.cpp',
+ '../tools/debugger/SkDrawCommand.h',
+ '../tools/debugger/SkDrawCommand.cpp',
+ '../tools/debugger/SkDebugCanvas.h',
+ '../tools/debugger/SkDebugCanvas.cpp',
+ '../tools/debugger/SkObjectParser.h',
+ '../tools/debugger/SkObjectParser.cpp',
+ '../tools/debugger/SkOverdrawMode.h',
+ '../tools/debugger/SkOverdrawMode.cpp',
],
}],
],
diff --git a/gyp/skiaserve.gyp b/gyp/skiaserve.gyp
index 58fdea1fde..7bfbe2dd4f 100644
--- a/gyp/skiaserve.gyp
+++ b/gyp/skiaserve.gyp
@@ -15,19 +15,19 @@
'include_dirs': [
'../src/core',
'../src/ports',
- '../src/utils/debugger',
+ '../tools/debugger',
'../tools/json',
],
'sources': [
# Stuff for the debug canvas
- '../src/utils/debugger/SkDrawCommand.h',
- '../src/utils/debugger/SkDrawCommand.cpp',
- '../src/utils/debugger/SkDebugCanvas.h',
- '../src/utils/debugger/SkDebugCanvas.cpp',
- '../src/utils/debugger/SkObjectParser.h',
- '../src/utils/debugger/SkObjectParser.cpp',
- '../src/utils/debugger/SkOverdrawMode.h',
- '../src/utils/debugger/SkOverdrawMode.cpp',
+ '../tools/debugger/SkDrawCommand.h',
+ '../tools/debugger/SkDrawCommand.cpp',
+ '../tools/debugger/SkDebugCanvas.h',
+ '../tools/debugger/SkDebugCanvas.cpp',
+ '../tools/debugger/SkObjectParser.h',
+ '../tools/debugger/SkObjectParser.cpp',
+ '../tools/debugger/SkOverdrawMode.h',
+ '../tools/debugger/SkOverdrawMode.cpp',
'<!@(python find.py ../tools/skiaserve "*.cpp")',
],
'dependencies': [
diff --git a/gyp/tests.gypi b/gyp/tests.gypi
index 5f3df964e1..09050ad1c9 100644
--- a/gyp/tests.gypi
+++ b/gyp/tests.gypi
@@ -16,7 +16,7 @@
'../src/pdf',
'../src/ports',
'../src/utils',
- '../src/utils/debugger',
+ '../tools/debugger',
],
'dependencies': [
'experimental.gyp:experimental',
@@ -51,14 +51,14 @@
'sources': [
'../tests/Test.h',
'<!@(python find.py ../tests "*.c*")',
- '../src/utils/debugger/SkDrawCommand.h',
- '../src/utils/debugger/SkDrawCommand.cpp',
- '../src/utils/debugger/SkDebugCanvas.h',
- '../src/utils/debugger/SkDebugCanvas.cpp',
- '../src/utils/debugger/SkObjectParser.h',
- '../src/utils/debugger/SkObjectParser.cpp',
- '../src/utils/debugger/SkOverdrawMode.h',
- '../src/utils/debugger/SkOverdrawMode.cpp',
+ '../tools/debugger/SkDrawCommand.h',
+ '../tools/debugger/SkDrawCommand.cpp',
+ '../tools/debugger/SkDebugCanvas.h',
+ '../tools/debugger/SkDebugCanvas.cpp',
+ '../tools/debugger/SkObjectParser.h',
+ '../tools/debugger/SkObjectParser.cpp',
+ '../tools/debugger/SkOverdrawMode.h',
+ '../tools/debugger/SkOverdrawMode.cpp',
],
'sources!': [
'../tests/SkpSkGrTest.cpp',
diff --git a/public.bzl b/public.bzl
index 5bdef98e56..8bf328dd4c 100644
--- a/public.bzl
+++ b/public.bzl
@@ -440,7 +440,7 @@ DM_INCLUDES = [
"src/pathops",
"src/pipe/utils",
"src/ports",
- "src/utils/debugger",
+ "tools/debugger",
"tests",
"tools",
"tools/flags",
diff --git a/src/utils/debugger/SkDebugCanvas.cpp b/tools/debugger/SkDebugCanvas.cpp
index c2dd8f8a19..c2dd8f8a19 100644
--- a/src/utils/debugger/SkDebugCanvas.cpp
+++ b/tools/debugger/SkDebugCanvas.cpp
diff --git a/src/utils/debugger/SkDebugCanvas.h b/tools/debugger/SkDebugCanvas.h
index 217b52e3ce..217b52e3ce 100644
--- a/src/utils/debugger/SkDebugCanvas.h
+++ b/tools/debugger/SkDebugCanvas.h
diff --git a/src/utils/debugger/SkDrawCommand.cpp b/tools/debugger/SkDrawCommand.cpp
index 17c59e67a6..17c59e67a6 100644
--- a/src/utils/debugger/SkDrawCommand.cpp
+++ b/tools/debugger/SkDrawCommand.cpp
diff --git a/src/utils/debugger/SkDrawCommand.h b/tools/debugger/SkDrawCommand.h
index f67df92de7..f67df92de7 100644
--- a/src/utils/debugger/SkDrawCommand.h
+++ b/tools/debugger/SkDrawCommand.h
diff --git a/src/utils/debugger/SkObjectParser.cpp b/tools/debugger/SkObjectParser.cpp
index 6d71a38b7b..6d71a38b7b 100644
--- a/src/utils/debugger/SkObjectParser.cpp
+++ b/tools/debugger/SkObjectParser.cpp
diff --git a/src/utils/debugger/SkObjectParser.h b/tools/debugger/SkObjectParser.h
index 9bdfad5e79..9bdfad5e79 100644
--- a/src/utils/debugger/SkObjectParser.h
+++ b/tools/debugger/SkObjectParser.h
diff --git a/src/utils/debugger/SkOverdrawMode.cpp b/tools/debugger/SkOverdrawMode.cpp
index 3b695eca26..3b695eca26 100644
--- a/src/utils/debugger/SkOverdrawMode.cpp
+++ b/tools/debugger/SkOverdrawMode.cpp
diff --git a/src/utils/debugger/SkOverdrawMode.h b/tools/debugger/SkOverdrawMode.h
index dba7635f6a..dba7635f6a 100644
--- a/src/utils/debugger/SkOverdrawMode.h
+++ b/tools/debugger/SkOverdrawMode.h
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-03 02:47:11 +0000