Get rid of excess cleverness in benchmark

bench/RotatedRectBench.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 "SkCanvas.h"
 #include "SkPaint.h"
@@ skipping 65 matching lines @@
 
 protected:
     const char* onGetName() SK_OVERRIDE { return fName.c_str(); }
 
     void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE {
         SkPaint paint;
         paint.setAntiAlias(fAA);
         paint.setXfermodeMode(fMode);
         SkColor color = start_color(fColorType);
 
-        int w = canvas->getBaseLayerSize().width();
-        int h = canvas->getBaseLayerSize().height();
+        int w = this->getSize().x();
+        int h = this->getSize().y();
 
         static const SkScalar kRectW = 25.1f;
         static const SkScalar kRectH = 25.9f;
 
         SkMatrix rotate;
         // This value was chosen so that we frequently hit the axis-aligned case.
         rotate.setRotate(30.f, kRectW / 2, kRectH / 2);
         SkMatrix m = rotate;
 
         SkScalar tx = 0, ty = 0;
@@ skipping 87 matching lines @@
 DEF_BENCH(return new RotRectBench(true,  kConstantTransparent_ColorType,             SkXfermode::kDarken_Mode);)
 DEF_BENCH(return new RotRectBench(true,  kChangingOpaque_ColorType,                  SkXfermode::kDarken_Mode);)
 DEF_BENCH(return new RotRectBench(true,  kChangingTransparent_ColorType,             SkXfermode::kDarken_Mode);)
 DEF_BENCH(return new RotRectBench(true,  kAlternatingOpaqueAndTransparent_ColorType, SkXfermode::kDarken_Mode);)
 
 DEF_BENCH(return new RotRectBench(false, kConstantOpaque_ColorType,                  SkXfermode::kDarken_Mode);)
 DEF_BENCH(return new RotRectBench(false, kConstantTransparent_ColorType,             SkXfermode::kDarken_Mode);)
 DEF_BENCH(return new RotRectBench(false, kChangingOpaque_ColorType,                  SkXfermode::kDarken_Mode);)
 DEF_BENCH(return new RotRectBench(false, kChangingTransparent_ColorType,             SkXfermode::kDarken_Mode);)
 DEF_BENCH(return new RotRectBench(false, kAlternatingOpaqueAndTransparent_ColorType, SkXfermode::kDarken_Mode);)