Expose debugger backend classes externally.
SkDebugCanvas & friends are useful beyond the Qt debugger app - Chromium's picture inspector (in development) is at the point where it could take advantage of it.
This patch moves SkDrawCommand, SkDebugCanvas & SkObjectParser from trunk/debugger to trunk/src/utils (since several tools already use these, this seems appropriate), and makes SkDrawCommand & SkDebugCanvas' symbols visible externally (SK_API).
R=reed@google.com
Review URL: https://codereview.chromium.org/16638014
git-svn-id: http://skia.googlecode.com/svn/trunk@9598 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/gyp/SampleApp.gyp b/gyp/SampleApp.gyp
index 94dd37b..29787c7 100644
--- a/gyp/SampleApp.gyp
+++ b/gyp/SampleApp.gyp
@@ -16,12 +16,12 @@
'gmslides.gypi',
],
'sources': [
- '../debugger/SkDrawCommand.h',
- '../debugger/SkDrawCommand.cpp',
- '../debugger/SkDebugCanvas.h',
- '../debugger/SkDebugCanvas.cpp',
- '../debugger/SkObjectParser.h',
- '../debugger/SkObjectParser.cpp',
+ '../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',
'../gm/gm.cpp',
'../gm/gm.h',
diff --git a/gyp/debugger.gyp b/gyp/debugger.gyp
index fcaa6c6..fa7c6f7 100644
--- a/gyp/debugger.gyp
+++ b/gyp/debugger.gyp
@@ -85,13 +85,13 @@
'../tools',
],
'sources': [
- '../debugger/SkDebugCanvas.h',
- '../debugger/SkDebugCanvas.cpp',
'../debugger/SkDebugger.cpp',
- '../debugger/SkDrawCommand.h',
- '../debugger/SkDrawCommand.cpp',
- '../debugger/SkObjectParser.h',
- '../debugger/SkObjectParser.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',
],
'dependencies': [
'skia_lib.gyp:skia_lib',
diff --git a/gyp/gm.gyp b/gyp/gm.gyp
index 699dcb7..2f280af 100644
--- a/gyp/gm.gyp
+++ b/gyp/gm.gyp
@@ -39,19 +39,19 @@
'gmslides.gypi',
],
'sources': [
- '../debugger/SkDrawCommand.h',
- '../debugger/SkDrawCommand.cpp',
- '../debugger/SkDebugCanvas.h',
- '../debugger/SkDebugCanvas.cpp',
- '../debugger/SkObjectParser.h',
- '../debugger/SkObjectParser.cpp',
-
'../gm/gm.cpp',
'../gm/gmmain.cpp',
'../gm/system_preferences_default.cpp',
'../src/pipe/utils/SamplePipeControllers.h',
'../src/pipe/utils/SamplePipeControllers.cpp',
+
+ '../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',
],
'dependencies': [
'skia_lib.gyp:skia_lib',
diff --git a/gyp/tools.gyp b/gyp/tools.gyp
index 552dfc8..cb7d4ac 100644
--- a/gyp/tools.gyp
+++ b/gyp/tools.gyp
@@ -288,12 +288,12 @@
'../tools/filtermain.cpp',
'../tools/path_utils.h',
'../tools/path_utils.cpp',
- '../debugger/SkDrawCommand.h',
- '../debugger/SkDrawCommand.cpp',
- '../debugger/SkDebugCanvas.h',
- '../debugger/SkDebugCanvas.cpp',
- '../debugger/SkObjectParser.h',
- '../debugger/SkObjectParser.cpp',
+ '../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',
],
'dependencies': [
'skia_lib.gyp:skia_lib',
diff --git a/debugger/SkDebugCanvas.cpp b/src/utils/debugger/SkDebugCanvas.cpp
similarity index 100%
rename from debugger/SkDebugCanvas.cpp
rename to src/utils/debugger/SkDebugCanvas.cpp
diff --git a/debugger/SkDebugCanvas.h b/src/utils/debugger/SkDebugCanvas.h
similarity index 99%
rename from debugger/SkDebugCanvas.h
rename to src/utils/debugger/SkDebugCanvas.h
index bcb2bbf..99df00e 100644
--- a/debugger/SkDebugCanvas.h
+++ b/src/utils/debugger/SkDebugCanvas.h
@@ -16,7 +16,7 @@
#include "SkTArray.h"
#include "SkString.h"
-class SkDebugCanvas : public SkCanvas {
+class SK_API SkDebugCanvas : public SkCanvas {
public:
SkDebugCanvas(int width, int height);
virtual ~SkDebugCanvas();
diff --git a/debugger/SkDrawCommand.cpp b/src/utils/debugger/SkDrawCommand.cpp
similarity index 100%
rename from debugger/SkDrawCommand.cpp
rename to src/utils/debugger/SkDrawCommand.cpp
diff --git a/debugger/SkDrawCommand.h b/src/utils/debugger/SkDrawCommand.h
similarity index 99%
rename from debugger/SkDrawCommand.h
rename to src/utils/debugger/SkDrawCommand.h
index 4b5ab0a..f48a79b 100644
--- a/debugger/SkDrawCommand.h
+++ b/src/utils/debugger/SkDrawCommand.h
@@ -13,7 +13,7 @@
#include "SkCanvas.h"
#include "SkString.h"
-class SkDrawCommand {
+class SK_API SkDrawCommand {
public:
/* TODO(chudy): Remove subclasses. */
SkDrawCommand(DrawType drawType);
diff --git a/debugger/SkObjectParser.cpp b/src/utils/debugger/SkObjectParser.cpp
similarity index 100%
rename from debugger/SkObjectParser.cpp
rename to src/utils/debugger/SkObjectParser.cpp
diff --git a/debugger/SkObjectParser.h b/src/utils/debugger/SkObjectParser.h
similarity index 100%
rename from debugger/SkObjectParser.h
rename to src/utils/debugger/SkObjectParser.h