commit 6de99041f13e87ed440f7db13a07693c6c4c461a
author Robert Phillips <robertphillips@google.com> Tue Jan 31 11:31:39 2017 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Jan 31 17:22:38 2017 +0000
tree 560cfdcc0efb88cd82f04b2c9b0219f2f3d07c71
parent 6d3b7aaf79b2cbacdf00bafc15ded2dfd2fa000a

Reduce use of SkImage_Base::peekTexture

Change-Id: I079093c9706df4911d47fba04b786e59240e8cb4
Reviewed-on: https://skia-review.googlesource.com/7792
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>

tests/SpecialImageTest.cpp

diff --git a/tests/SpecialImageTest.cpp b/tests/SpecialImageTest.cpp
index 33f3948..551efff 100644
--- a/tests/SpecialImageTest.cpp
+++ b/tests/SpecialImageTest.cpp
@@ -51,7 +51,7 @@
 
 // Basic test of the SkSpecialImage public API (e.g., peekTexture, peekPixels & draw)
 static void test_image(const sk_sp<SkSpecialImage>& img, skiatest::Reporter* reporter,
-                       GrContext* context, bool peekTextureSucceeds,
+                       GrContext* context, bool isGPUBacked,
                        int offset, int size) {
     const SkIRect subset = img->subset();
     REPORTER_ASSERT(reporter, offset == subset.left());
@@ -61,7 +61,7 @@
 
     //--------------
     // Test that peekTexture reports the correct backing type
-    REPORTER_ASSERT(reporter, peekTextureSucceeds == img->isTextureBacked());
+    REPORTER_ASSERT(reporter, isGPUBacked == img->isTextureBacked());
 
 #if SK_SUPPORT_GPU
     //--------------
@@ -118,9 +118,9 @@
 
         REPORTER_ASSERT(reporter, tightImg->width() == subset.width());
         REPORTER_ASSERT(reporter, tightImg->height() == subset.height());
-        REPORTER_ASSERT(reporter, peekTextureSucceeds == !!tightImg->getTexture());
+        REPORTER_ASSERT(reporter, isGPUBacked == !!tightImg->isTextureBacked());
         SkPixmap tmpPixmap;
-        REPORTER_ASSERT(reporter, peekTextureSucceeds != !!tightImg->peekPixels(&tmpPixmap));
+        REPORTER_ASSERT(reporter, isGPUBacked != !!tightImg->peekPixels(&tmpPixmap));
     }
     {
         SkImageFilter::OutputProperties outProps(img->getColorSpace());
@@ -128,10 +128,10 @@
 
         REPORTER_ASSERT(reporter, tightSurf->width() == subset.width());
         REPORTER_ASSERT(reporter, tightSurf->height() == subset.height());
-        REPORTER_ASSERT(reporter, peekTextureSucceeds ==
+        REPORTER_ASSERT(reporter, isGPUBacked ==
                      !!tightSurf->getTextureHandle(SkSurface::kDiscardWrite_BackendHandleAccess));
         SkPixmap tmpPixmap;
-        REPORTER_ASSERT(reporter, peekTextureSucceeds != !!tightSurf->peekPixels(&tmpPixmap));
+        REPORTER_ASSERT(reporter, isGPUBacked != !!tightSurf->peekPixels(&tmpPixmap));
     }
 }