optimize circularclips to act as a bench, fix null-check bug in etcbench

bench/ETCBitmapBench.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "Benchmark.h"
 #include "Resources.h"
 #include "SkCanvas.h"
@@ skipping 192 matching lines @@
             SkASSERT(kRaster_Backend == this->backend());
             if (this->decompress()) {
                 return "etc1bitmap_upload_raster_decompressed";
             } else {
                 return "etc1bitmap_upload_raster_compressed";
             }
         }
     }
 
     virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE {
+        SkPixelRef* pr = fBitmap.pixelRef();
         for (int i = 0; i < loops; ++i) {
-            this->fBitmap.pixelRef()->notifyPixelsChanged();
+            if (pr) {
+                pr->notifyPixelsChanged();
+            }
             canvas->drawBitmap(this->fBitmap, 0, 0, NULL);
         }
     }
 
 private:
     typedef ETCBitmapBench INHERITED;
 };
 
 DEF_BENCH(return new ETCBitmapBench(false, Benchmark::kRaster_Backend);)
 DEF_BENCH(return new ETCBitmapBench(true, Benchmark::kRaster_Backend);)
 
 DEF_BENCH(return new ETCBitmapBench(false, Benchmark::kGPU_Backend);)
 DEF_BENCH(return new ETCBitmapBench(true, Benchmark::kGPU_Backend);)
 
 DEF_BENCH(return new ETCBitmapUploadBench(false, Benchmark::kRaster_Backend);)
 DEF_BENCH(return new ETCBitmapUploadBench(true, Benchmark::kRaster_Backend);)
 
 DEF_BENCH(return new ETCBitmapUploadBench(false, Benchmark::kGPU_Backend);)
 DEF_BENCH(return new ETCBitmapUploadBench(true, Benchmark::kGPU_Backend);)
 
 #endif  // SK_IGNORE_ETC1_SUPPORT