diff options
| author |  robertphillips <robertphillips@google.com> | 2015-02-12 13:29:15 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-02-12 13:29:15 -0800 |
| commit | 3a092042bce0a8b7c43bf621cacdb2c644febeb2 (patch) | |
| tree | 3ac5095fc9dca4fa97459850737abfc7384c235f /debugger | |
| parent | 7cd3f64385ab161a69c39be41fd1827e49da3170 (diff) | |
Revert of Remove SkPictureFlat.h include from SkDrawCommands.h (patchset #3 id:40001 of https://codereview.chromium.org/912403004/)
Reason for revert:
Erm - Chrome.
Original issue's description:
> Remove SkPictureFlat.h include from SkDrawCommands.h
>
> This cannot land until https://codereview.chromium.org/909353004/ (Prepare SkiaBenchmarkingExtensionTest for upcoming Skia changes) lands in Chromium
>
> Committed: https://skia.googlesource.com/skia/+/5a4c233a3657d12d836de388b41e30405b4ab976
>
> Committed: https://skia.googlesource.com/skia/+/fa3a83d0fe53907e618346d3f1c17a95da1a9d22
TBR=reed@google.com,fmalita@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/923753002
Diffstat (limited to 'debugger')
| -rw-r--r-- | debugger/SkDebugger.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/debugger/SkDebugger.cpp b/debugger/SkDebugger.cpp index 61fa3ec642..fc61ddade3 100644 --- a/debugger/SkDebugger.cpp +++ b/debugger/SkDebugger.cpp @@ -66,8 +66,8 @@ void SkDebugger::getOverviewText(const SkTDArray<double>* typeTimes, 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 @@ void SkDebugger::getOverviewText(const SkTDArray<double>* typeTimes, #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) { |