Revert of Remove SkPictureFlat.h include from SkDrawCommands.h

debugger/SkDebugger.cpp

 
 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkDebugger.h"
 #include "SkPictureRecorder.h"
@@ skipping 48 matching lines @@
     return recorder.endRecording();
 }
 
 void SkDebugger::getOverviewText(const SkTDArray<double>* typeTimes,
                                  double totTime,
                                  SkString* overview,
                                  int numRuns) {
     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;
     }
 
     for (int i = 0; i < commands.count(); i++) {
         counts[commands[i]->getType()]++;
     }
 
     overview->reset();
     int total = 0;
 #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) {
             overview->append(" - ");
             overview->appendf("%.2f", (*typeTimes)[i]/(float)numRuns);
             overview->append("ms");
             overview->append(" - ");
             double percent = 100.0*(*typeTimes)[i]/totTime;
             overview->appendf("%.2f", percent);
             overview->append("%");
@@ skipping 39 matching lines @@
     overview->append(" R: ");
     overview->appendScalar(this->pictureCull().fRight);
     overview->append(" B: ");
     overview->appendScalar(this->pictureCull().fBottom);
     overview->append("<br/>");
 }
 
 void SkDebugger::getClipStackText(SkString* clipStack) {
     clipStack->set(fDebugCanvas->clipStackData());
 }