diff options
| -rw-r--r-- | debugger/QT/SkDebuggerGUI.cpp | 3 | ||||
| -rw-r--r-- | src/utils/debugger/SkDrawCommand.h | 2 | ||||
| -rw-r--r-- | tests/MatrixClipCollapseTest.cpp | 4 | ||||
| -rw-r--r-- | tools/filtermain.cpp | 1 |
4 files changed, 5 insertions, 5 deletions
diff --git a/debugger/QT/SkDebuggerGUI.cpp b/debugger/QT/SkDebuggerGUI.cpp index 01d8c665e3..b202e3dd03 100644 --- a/debugger/QT/SkDebuggerGUI.cpp +++ b/debugger/QT/SkDebuggerGUI.cpp @@ -7,9 +7,6 @@ #include "SkDebuggerGUI.h" #include "PictureRenderer.h" -#include "SkPictureData.h" -#include "SkPicturePlayback.h" -#include "SkPictureRecord.h" #include <QListWidgetItem> #include <QtGui> diff --git a/src/utils/debugger/SkDrawCommand.h b/src/utils/debugger/SkDrawCommand.h index bcc97ca791..45b5ee1572 100644 --- a/src/utils/debugger/SkDrawCommand.h +++ b/src/utils/debugger/SkDrawCommand.h @@ -110,6 +110,8 @@ private: bool fVisible; }; +typedef SkDrawCommand::OpType DrawType; + class SkRestoreCommand : public SkDrawCommand { public: SkRestoreCommand(); diff --git a/tests/MatrixClipCollapseTest.cpp b/tests/MatrixClipCollapseTest.cpp index c9940272c0..36a3ea4c98 100644 --- a/tests/MatrixClipCollapseTest.cpp +++ b/tests/MatrixClipCollapseTest.cpp @@ -6,6 +6,9 @@ */ #include "Test.h" + +#ifdef SK_COLLAPSE_MATRIX_CLIP_STATE + #include "SkCanvas.h" #include "SkDebugCanvas.h" #include "SkPicture.h" @@ -52,7 +55,6 @@ // system is ready for prime time // bench the recording times with/without matrix/clip collapsing -#ifdef SK_COLLAPSE_MATRIX_CLIP_STATE // Enable/disable debugging helper code //#define TEST_COLLAPSE_MATRIX_CLIP_STATE 1 diff --git a/tools/filtermain.cpp b/tools/filtermain.cpp index 6883ff2047..ec4d6aa1d6 100644 --- a/tools/filtermain.cpp +++ b/tools/filtermain.cpp @@ -13,7 +13,6 @@ #include "SkImageEncoder.h" #include "SkOSFile.h" #include "SkPicture.h" -#include "SkPictureRecord.h" #include "SkPictureRecorder.h" #include "SkStream.h" #include "picture_utils.h" |