diff options
| author |  robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-03-12 15:33:40 +0000 |
|---|---|---|
| committer | robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-03-12 15:33:40 +0000 |
| commit | e428f9b1132c12299c204a333192495d7e748511 (patch) | |
| tree | 1a92cd6b8da40382f6b46bf2e02399abedd16ee4 /debugger/SkDebugger.cpp | |
| parent | 167876ea18687f13a768f0e23d369ea7cca0e47b (diff) | |
Fix debugger build errors/warnings
https://codereview.appspot.com/7729045/
git-svn-id: http://skia.googlecode.com/svn/trunk@8105 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'debugger/SkDebugger.cpp')
| -rw-r--r-- | debugger/SkDebugger.cpp | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/debugger/SkDebugger.cpp b/debugger/SkDebugger.cpp index 5ed11870d4..b40e6ecef5 100644 --- a/debugger/SkDebugger.cpp +++ b/debugger/SkDebugger.cpp @@ -48,7 +48,8 @@ SkPicture* SkDebugger::copyPicture() { void SkDebugger::getOverviewText(const SkTDArray<double>* typeTimes, double totTime, - SkString* overview) { + SkString* overview, + int numRuns) { const SkTDArray<SkDrawCommand*>& commands = this->getDrawCommands(); SkTDArray<int> counts; @@ -75,14 +76,14 @@ void SkDebugger::getOverviewText(const SkTDArray<double>* typeTimes, overview->append(SkDrawCommand::GetCommandString((DrawType) i)); overview->append(": "); - overview->appendScalar(counts[i]); + overview->appendS32(counts[i]); if (NULL != typeTimes) { overview->append(" - "); - overview->appendScalar((*typeTimes)[i]); + overview->appendf("%.2f", (*typeTimes)[i]/(float)numRuns); overview->append("ms"); overview->append(" - "); double percent = 100.0*(*typeTimes)[i]/totTime; - overview->appendScalar(percent); + overview->appendf("%.2f", percent); overview->append("%"); #ifdef SK_DEBUG totPercent += percent; @@ -94,18 +95,20 @@ void SkDebugger::getOverviewText(const SkTDArray<double>* typeTimes, } #ifdef SK_DEBUG if (NULL != typeTimes) { - SkASSERT(SkScalarNearlyEqual(totPercent, 100.0)); - SkASSERT(SkScalarNearlyEqual(tempSum, totTime)); + SkASSERT(SkScalarNearlyEqual(SkDoubleToScalar(totPercent), + SkDoubleToScalar(100.0))); + SkASSERT(SkScalarNearlyEqual(SkDoubleToScalar(tempSum), + SkDoubleToScalar(totTime))); } #endif if (totTime > 0.0) { overview->append("Total Time: "); - overview->appendScalar(totTime); + overview->appendf("%.2f", totTime/(float)numRuns); overview->append("ms"); #ifdef SK_DEBUG overview->append(" "); - overview->appendScalar(totPercent); + overview->appendScalar(SkDoubleToScalar(totPercent)); overview->append("% "); #endif overview->append("<br/>"); @@ -113,15 +116,15 @@ void SkDebugger::getOverviewText(const SkTDArray<double>* typeTimes, SkString totalStr; totalStr.append("Total Draw Commands: "); - totalStr.appendScalar(total); + totalStr.appendScalar(SkDoubleToScalar(total)); totalStr.append("<br/>"); overview->insert(0, totalStr); overview->append("<br/>"); overview->append("SkPicture Width: "); - overview->appendScalar(pictureWidth()); + overview->appendS32(pictureWidth()); overview->append("px<br/>"); overview->append("SkPicture Height: "); - overview->appendScalar(pictureHeight()); + overview->appendS32(pictureHeight()); overview->append("px"); } |