Simplify benchmark internal API.
I'm not quite sure why I wrote such a convoluted API with setLoops()/getLoops().
This replaces it with a loops argument passed to onDraw().
This CL is largely mechanical translation from the old API to the new one.
MathBench used this->getLoops() outside onDraw(), which seems incorrect. I
fixed it.
BUG=
R=djsollen@google.com
Author: mtklein@google.com
Review URL: https://codereview.chromium.org/99893003
git-svn-id: http://skia.googlecode.com/svn/trunk@12466 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/bench/RefCntBench.cpp b/bench/RefCntBench.cpp
index f6ec733..5147c99 100644
--- a/bench/RefCntBench.cpp
+++ b/bench/RefCntBench.cpp
@@ -25,8 +25,8 @@
return "ref_cnt_stack";
}
- virtual void onDraw(SkCanvas*) {
- for (int i = 0; i < this->getLoops(); ++i) {
+ virtual void onDraw(const int loops, SkCanvas*) {
+ for (int i = 0; i < loops; ++i) {
SkRefCnt ref;
for (int j = 0; j < M; ++j) {
ref.ref();
@@ -63,9 +63,9 @@
return "ref_cnt_heap";
}
- virtual void onDraw(SkCanvas*) {
+ virtual void onDraw(const int loops, SkCanvas*) {
char memory[sizeof(PlacedRefCnt)];
- for (int i = 0; i < this->getLoops(); ++i) {
+ for (int i = 0; i < loops; ++i) {
PlacedRefCnt* ref = new (memory) PlacedRefCnt();
for (int j = 0; j < M; ++j) {
ref->ref();
@@ -90,8 +90,8 @@
return "ref_cnt_new";
}
- virtual void onDraw(SkCanvas*) {
- for (int i = 0; i < this->getLoops(); ++i) {
+ virtual void onDraw(const int loops, SkCanvas*) {
+ for (int i = 0; i < loops; ++i) {
SkRefCnt* ref = new SkRefCnt();
for (int j = 0; j < M; ++j) {
ref->ref();
@@ -118,8 +118,8 @@
return "ref_cnt_stack_weak";
}
- virtual void onDraw(SkCanvas*) {
- for (int i = 0; i < this->getLoops(); ++i) {
+ virtual void onDraw(const int loops, SkCanvas*) {
+ for (int i = 0; i < loops; ++i) {
SkWeakRefCnt ref;
for (int j = 0; j < M; ++j) {
ref.ref();
@@ -149,9 +149,9 @@
return "ref_cnt_heap_weak";
}
- virtual void onDraw(SkCanvas*) {
+ virtual void onDraw(const int loops, SkCanvas*) {
char memory[sizeof(PlacedWeakRefCnt)];
- for (int i = 0; i < this->getLoops(); ++i) {
+ for (int i = 0; i < loops; ++i) {
PlacedWeakRefCnt* ref = new (memory) PlacedWeakRefCnt();
for (int j = 0; j < M; ++j) {
ref->ref();
@@ -176,8 +176,8 @@
return "ref_cnt_new_weak";
}
- virtual void onDraw(SkCanvas*) {
- for (int i = 0; i < this->getLoops(); ++i) {
+ virtual void onDraw(const int loops, SkCanvas*) {
+ for (int i = 0; i < loops; ++i) {
SkWeakRefCnt* ref = new SkWeakRefCnt();
for (int j = 0; j < M; ++j) {
ref->ref();