commit 26e30c5223c627d1a2fed0ac8010d442bc546b8a
author robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Oct 28 18:07:44 2013 +0000
committer robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Oct 28 18:07:44 2013 +0000
tree 925e6fe11320a35de96a69f79178ed08733df4e6
parent 77e079af1a909ee9d14306db48561d77e2f9fcab

Cleanup displacement bench

https://codereview.chromium.org/47553005/



git-svn-id: http://skia.googlecode.com/svn/trunk@11982 2bbb7eff-a529-9590-31e7-b0007b416f81

bench/DisplacementBench.cpp

diff --git a/bench/DisplacementBench.cpp b/bench/DisplacementBench.cpp
index 3d0f215..bfe2e3e 100644
--- a/bench/DisplacementBench.cpp
+++ b/bench/DisplacementBench.cpp
@@ -24,15 +24,15 @@
 protected:
     virtual void onPreDraw() SK_OVERRIDE {
         if (!fInitialized) {
-            make_bitmap();
-            make_checkerboard();
+            this->makeBitmap();
+            this->makeCheckerboard();
             fInitialized = true;
         }
     }
 
-    void make_bitmap() {
-        const int w = isSmall() ? FILTER_WIDTH_SMALL : FILTER_WIDTH_LARGE;
-        const int h = isSmall() ? FILTER_HEIGHT_LARGE : FILTER_HEIGHT_LARGE;
+    void makeBitmap() {
+        const int w = this->isSmall() ? FILTER_WIDTH_SMALL : FILTER_WIDTH_LARGE;
+        const int h = this->isSmall() ? FILTER_HEIGHT_LARGE : FILTER_HEIGHT_LARGE;
         fBitmap.setConfig(SkBitmap::kARGB_8888_Config, w, h);
         fBitmap.allocPixels();
         SkBitmapDevice device(fBitmap);
@@ -46,9 +46,9 @@
         canvas.drawText(str, strlen(str), SkIntToScalar(15), SkIntToScalar(55), paint);
     }
 
-    void make_checkerboard() {
-        const int w = isSmall() ? FILTER_WIDTH_SMALL : FILTER_WIDTH_LARGE;
-        const int h = isSmall() ? FILTER_HEIGHT_LARGE : FILTER_HEIGHT_LARGE;
+    void makeCheckerboard() {
+        const int w = this->isSmall() ? FILTER_WIDTH_SMALL : FILTER_WIDTH_LARGE;
+        const int h = this->isSmall() ? FILTER_HEIGHT_LARGE : FILTER_HEIGHT_LARGE;
         fCheckerboard.setConfig(SkBitmap::kARGB_8888_Config, w, h);
         fCheckerboard.allocPixels();
         SkBitmapDevice device(fCheckerboard);
@@ -74,7 +74,8 @@
     void drawClippedBitmap(SkCanvas* canvas, int x, int y, const SkPaint& paint) {
         canvas->save();
         canvas->clipRect(SkRect::MakeXYWH(SkIntToScalar(x), SkIntToScalar(y),
-            SkIntToScalar(fBitmap.width()), SkIntToScalar(fBitmap.height())));
+                                          SkIntToScalar(fBitmap.width()), 
+                                          SkIntToScalar(fBitmap.height())));
         canvas->drawBitmap(fBitmap, SkIntToScalar(x), SkIntToScalar(y), &paint);
         canvas->restore();
     }
@@ -95,7 +96,7 @@
 
 protected:
     virtual const char* onGetName() SK_OVERRIDE {
-        return isSmall() ? "displacement_zero_small" : "displacement_zero_large";
+        return this->isSmall() ? "displacement_zero_small" : "displacement_zero_large";
     }
 
     virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
@@ -107,7 +108,7 @@
              SkDisplacementMapEffect::kG_ChannelSelectorType, 0.0f, displ)))->unref();
 
         for (int i = 0; i < this->getLoops(); i++) {
-            drawClippedBitmap(canvas, 0, 0, paint);
+            this->drawClippedBitmap(canvas, 0, 0, paint);
         }
     }
 
@@ -158,8 +159,8 @@
         paint.setImageFilter(SkNEW_ARGS(SkDisplacementMapEffect,
             (SkDisplacementMapEffect::kR_ChannelSelectorType,
              SkDisplacementMapEffect::kB_ChannelSelectorType, 32.0f, displ)))->unref();
-        for (int i = 0; i < this->getLoops(); i++) {
-            drawClippedBitmap(canvas, 200, 0, paint);
+        for (int i = 0; i < this->getLoops(); ++i) {
+            this->drawClippedBitmap(canvas, 200, 0, paint);
         }
     }