Fix Chromium build
TBR=jvanverth@google.com
Review URL: https://codereview.chromium.org/916763003
diff --git a/debugger/QT/SkDebuggerGUI.cpp b/debugger/QT/SkDebuggerGUI.cpp
index 01d8c66..b202e3d 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 bcc97ca..45b5ee1 100644
--- a/src/utils/debugger/SkDrawCommand.h
+++ b/src/utils/debugger/SkDrawCommand.h
@@ -110,6 +110,8 @@
bool fVisible;
};
+typedef SkDrawCommand::OpType DrawType;
+
class SkRestoreCommand : public SkDrawCommand {
public:
SkRestoreCommand();
diff --git a/tests/MatrixClipCollapseTest.cpp b/tests/MatrixClipCollapseTest.cpp
index c994027..36a3ea4 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 6883ff2..ec4d6aa 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"