commit 624f9063c1b4bf3ee3a21b181f12bca0bfcc5696
author Brian Salomon <bsalomon@google.com> Tue Jul 02 14:23:00 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Jul 02 19:06:47 2019 +0000
tree b460ffc14f63cc250b79744f028a1268f7268e9f
parent 1d1e44f689480782ef4d3eea9582e23bd49c3c85

Be more stringent about API failure cases in AsyncReadPixels test

Bug: skia:8962
Change-Id: I636d8d5c53a653c7b02bfe315e927c1e2fbc0ddf
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/222791
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>

tests/ReadPixelsTest.cpp

diff --git a/tests/ReadPixelsTest.cpp b/tests/ReadPixelsTest.cpp
index 1c5f518..062654f 100644
--- a/tests/ReadPixelsTest.cpp
+++ b/tests/ReadPixelsTest.cpp
@@ -743,7 +743,20 @@
                         if (rect.isEmpty() || !SkIRect::MakeWH(kW, kH).contains(rect)) {
                             REPORTER_ASSERT(reporter, !context.fSuceeded);
                         }
-                        if (!context.fSuceeded) {
+                        if (context.fSuceeded) {
+                            REPORTER_ASSERT(reporter, readCT != kUnknown_SkColorType &&
+                                                      !rect.isEmpty());
+                        } else {
+                            // TODO: Support reading to kGray.
+                            auto surfBounds = SkIRect::MakeWH(surf->width(), surf->height());
+                            if (readCT != kUnknown_SkColorType && readCT != kGray_8_SkColorType &&
+                                !rect.isEmpty() && surfBounds.contains(rect)) {
+                                ERRORF(reporter,
+                                       "Async read failed. Surf Color Type: %d, Read CT: %d,"
+                                       "Rect [%d, %d, %d, %d], origin: %d, CS conversion: %d\n",
+                                       surfCT, readCT, rect.fLeft, rect.fTop, rect.fRight,
+                                       rect.fBottom, origin, (bool)readCS);
+                            }
                             continue;
                         }
                         // We use a synchronous read as the source of truth.