commit 3500b77f7d08dbe4c17811733cc3e4dbab889f0a
author Robert Phillips <robertphillips@google.com> Fri Jan 27 10:11:42 2017 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Jan 27 15:52:20 2017 +0000
tree e9e7582c09ddd926d9486a1e5a0497e8cb0831b6
parent 052fd5158f7f85e478a9f87c45fecaacf7d0f5f3

Consolidate read/write-Pixels testing code - take 2

Change-Id: I0de058a9eec749a7086138ac2eb79732f06ce55e
Reviewed-on: https://skia-review.googlesource.com/7650
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>

tests/ImageTest.cpp

diff --git a/tests/ImageTest.cpp b/tests/ImageTest.cpp
index 4f9d944..66f19fa 100644
--- a/tests/ImageTest.cpp
+++ b/tests/ImageTest.cpp
@@ -541,7 +541,7 @@
     return true;
 }
 
-static void test_read_pixels(skiatest::Reporter* reporter, SkImage* image) {
+static void image_test_read_pixels(skiatest::Reporter* reporter, SkImage* image) {
     if (!image) {
         ERRORF(reporter, "Failed to create image!");
         return;
@@ -591,23 +591,23 @@
 }
 DEF_TEST(ImageReadPixels, reporter) {
     sk_sp<SkImage> image(create_image());
-    test_read_pixels(reporter, image.get());
+    image_test_read_pixels(reporter, image.get());
 
     image = create_data_image();
-    test_read_pixels(reporter, image.get());
+    image_test_read_pixels(reporter, image.get());
 
     RasterDataHolder dataHolder;
     image = create_rasterproc_image(&dataHolder);
-    test_read_pixels(reporter, image.get());
+    image_test_read_pixels(reporter, image.get());
     image.reset();
     REPORTER_ASSERT(reporter, 1 == dataHolder.fReleaseCount);
 
     image = create_codec_image();
-    test_read_pixels(reporter, image.get());
+    image_test_read_pixels(reporter, image.get());
 }
 #if SK_SUPPORT_GPU
 DEF_GPUTEST_FOR_RENDERING_CONTEXTS(ImageReadPixels_Gpu, reporter, ctxInfo) {
-    test_read_pixels(reporter, create_gpu_image(ctxInfo.grContext()).get());
+    image_test_read_pixels(reporter, create_gpu_image(ctxInfo.grContext()).get());
 }
 #endif