hide trivial helpers on canvas

BUG=skia:

Change-Id: I42d4ca92897bde5bd8e0575a0104b12b83134cef
Reviewed-on: https://skia-review.googlesource.com/8852
Reviewed-by: Cary Clark <caryclark@google.com>
Commit-Queue: Mike Reed <reed@google.com>

7 files changed, 9 insertions, 9 deletions

diff --git a/bench/BitmapBench.cpp b/bench/BitmapBench.cpp
index f756d4ca77..8e881a665b 100644
--- a/bench/BitmapBench.cpp
+++ b/bench/BitmapBench.cpp
@@ -226,7 +226,7 @@ protected:
     }
 
     void onDraw(int loops, SkCanvas* canvas) override {
-        SkISize dim = canvas->getDeviceSize();
+        SkISize dim = canvas->getBaseLayerSize();
         if (fFlags & kScale_Flag) {
             const SkScalar x = SkIntToScalar(dim.fWidth) / 2;
             const SkScalar y = SkIntToScalar(dim.fHeight) / 2;
diff --git a/bench/ChartBench.cpp b/bench/ChartBench.cpp
index c5a3a5b3ad..71e311c2b3 100644
--- a/bench/ChartBench.cpp
+++ b/bench/ChartBench.cpp
@@ -106,8 +106,8 @@ protected:
 
     void onDraw(int loops, SkCanvas* canvas) override {
         bool sizeChanged = false;
-        if (canvas->getDeviceSize() != fSize) {
-            fSize = canvas->getDeviceSize();
+        if (canvas->getBaseLayerSize() != fSize) {
+            fSize = canvas->getBaseLayerSize();
             sizeChanged = true;
         }
 
diff --git a/bench/GameBench.cpp b/bench/GameBench.cpp
index 9b811f0e23..681b823f09 100644
--- a/bench/GameBench.cpp
+++ b/bench/GameBench.cpp
@@ -104,7 +104,7 @@ protected:
         clearPaint.setColor(0xFF000000);
         clearPaint.setAntiAlias(true);
 
-        SkISize size = canvas->getDeviceSize();
+        SkISize size = canvas->getBaseLayerSize();
 
         SkScalar maxTransX, maxTransY;
 
diff --git a/bench/GrMipMapBench.cpp b/bench/GrMipMapBench.cpp
index 2037495bc0..7b8ce3f3c9 100644
--- a/bench/GrMipMapBench.cpp
+++ b/bench/GrMipMapBench.cpp
@@ -47,10 +47,10 @@ protected:
 
         SkPaint paint;
         paint.setFilterQuality(kMedium_SkFilterQuality);
-
+        paint.setColor(SK_ColorWHITE);
         for (int i = 0; i < loops; i++) {
             // Touch surface so mips are dirtied
-            fSurface->getCanvas()->drawPoint(0, 0, SK_ColorWHITE);
+            fSurface->getCanvas()->drawPoint(0, 0, paint);
 
             // Draw reduced version of surface to original canvas, to trigger mip generation
             canvas->save();
diff --git a/bench/ReadPixBench.cpp b/bench/ReadPixBench.cpp
index b1061a1cde..ad9f747e7d 100644
--- a/bench/ReadPixBench.cpp
+++ b/bench/ReadPixBench.cpp
@@ -26,7 +26,7 @@ protected:
     void onDraw(int loops, SkCanvas* canvas) override {
         canvas->clear(SK_ColorBLACK);
 
-        SkISize size = canvas->getDeviceSize();
+        SkISize size = canvas->getBaseLayerSize();
 
         int offX = (size.width() - kWindowSize) / kNumStepsX;
         int offY = (size.height() - kWindowSize) / kNumStepsY;
diff --git a/bench/WritePixelsBench.cpp b/bench/WritePixelsBench.cpp
index d9f8eb75c4..820bb5902b 100644
--- a/bench/WritePixelsBench.cpp
+++ b/bench/WritePixelsBench.cpp
@@ -46,7 +46,7 @@ protected:
     }
 
     void onDraw(int loops, SkCanvas* canvas) override {
-        SkISize size = canvas->getDeviceSize();
+        SkISize size = canvas->getBaseLayerSize();
 
         canvas->clear(0xFFFF0000);
 
diff --git a/bench/XfermodeBench.cpp b/bench/XfermodeBench.cpp
index 605d167296..b12e458d41 100644
--- a/bench/XfermodeBench.cpp
+++ b/bench/XfermodeBench.cpp
@@ -26,7 +26,7 @@ protected:
     void onDraw(int loops, SkCanvas* canvas) override {
         const char* text = "Hamburgefons";
         size_t len = strlen(text);
-        SkISize size = canvas->getDeviceSize();
+        SkISize size = canvas->getBaseLayerSize();
         SkRandom random;
         for (int i = 0; i < loops; ++i) {
             SkPaint paint;