Fix Chromium build

TBR=jvanverth@google.com

Review URL: https://codereview.chromium.org/916763003

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>
 

src/utils/debugger/SkDrawCommand.h

@@ -110,6 +110,8 @@ private:
     bool   fVisible;
 };
 
+typedef SkDrawCommand::OpType DrawType;
+
 class SkRestoreCommand : public SkDrawCommand {
 public:
     SkRestoreCommand();

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

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"