Revert of Remove SkPictureFlat.h include from SkDrawCommands.h

debugger/SkDebugger.cpp

Index: debugger/SkDebugger.cpp
diff --git a/debugger/SkDebugger.cpp b/debugger/SkDebugger.cpp
index 61fa3ec642045eafc9701668ba81e634121b930c..fc61ddade39a2fa72becd5dd9fe27c4e36479c7a 100644
--- a/debugger/SkDebugger.cpp
+++ b/debugger/SkDebugger.cpp
@@ -66,8 +66,8 @@
     const SkTDArray<SkDrawCommand*>& commands = this->getDrawCommands();
 
     SkTDArray<int> counts;
-    counts.setCount(SkDrawCommand::kOpTypeCount);
-    for (int i = 0; i < SkDrawCommand::kOpTypeCount; ++i) {
+    counts.setCount(LAST_DRAWTYPE_ENUM+1);
+    for (int i = 0; i < LAST_DRAWTYPE_ENUM+1; ++i) {
         counts[i] = 0;
     }
 
@@ -80,14 +80,14 @@
 #ifdef SK_DEBUG
     double totPercent = 0, tempSum = 0;
 #endif
-    for (int i = 0; i < SkDrawCommand::kOpTypeCount; ++i) {
+    for (int i = 0; i < LAST_DRAWTYPE_ENUM+1; ++i) {
         if (0 == counts[i]) {
             // if there were no commands of this type then they should've consumed no time
             SkASSERT(NULL == typeTimes || 0.0 == (*typeTimes)[i]);
             continue;
         }
 
-        overview->append(SkDrawCommand::GetCommandString((SkDrawCommand::OpType) i));
+        overview->append(SkDrawCommand::GetCommandString((DrawType) i));
         overview->append(": ");
         overview->appendS32(counts[i]);
         if (typeTimes && totTime >= 0.0) {