Index: tests/PixelRefTest.cpp |
diff --git a/tests/PixelRefTest.cpp b/tests/PixelRefTest.cpp |
index aeb3070eac054623fc894a450873a295a7b5f4cd..d1d3026f8d6154175b46d537973b0273ce3dfe1f 100644 |
--- a/tests/PixelRefTest.cpp |
+++ b/tests/PixelRefTest.cpp |
@@ -3,40 +3,6 @@ |
#include "SkMallocPixelRef.h" |
#include "SkPixelRef.h" |
-static void test_info(skiatest::Reporter* reporter) { |
- static const struct { |
- SkBitmap::Config fConfig; |
- SkAlphaType fAlphaType; |
- SkColorType fExpectedColorType; |
- bool fExpectedSuccess; |
- } gRec[] = { |
- { SkBitmap::kNo_Config, kPremul_SkAlphaType, kPMColor_SkColorType, false }, |
- { SkBitmap::kARGB_8888_Config, kPremul_SkAlphaType, kPMColor_SkColorType, true }, |
- { SkBitmap::kARGB_8888_Config, kOpaque_SkAlphaType, kPMColor_SkColorType, true }, |
- { SkBitmap::kRGB_565_Config, kOpaque_SkAlphaType, kRGB_565_SkColorType, true }, |
- { SkBitmap::kARGB_4444_Config, kPremul_SkAlphaType, kARGB_4444_SkColorType, true }, |
- { SkBitmap::kARGB_4444_Config, kOpaque_SkAlphaType, kARGB_4444_SkColorType, true }, |
- { SkBitmap::kA8_Config, kPremul_SkAlphaType, kAlpha_8_SkColorType, true }, |
- { SkBitmap::kA8_Config, kOpaque_SkAlphaType, kAlpha_8_SkColorType, true }, |
- { SkBitmap::kIndex8_Config, kPremul_SkAlphaType, kIndex_8_SkColorType, true }, |
- { SkBitmap::kIndex8_Config, kOpaque_SkAlphaType, kIndex_8_SkColorType, true }, |
- }; |
- |
- SkBitmap bitmap; |
- SkImageInfo info; |
- |
- for (size_t i = 0; i < SK_ARRAY_COUNT(gRec); ++i) { |
- bool success = bitmap.setConfig(gRec[i].fConfig, 10, 10, 0, gRec[i].fAlphaType); |
- REPORTER_ASSERT(reporter, success); |
- success = bitmap.asImageInfo(&info); |
- REPORTER_ASSERT(reporter, success == gRec[i].fExpectedSuccess); |
- if (success && gRec[i].fExpectedSuccess) { |
- REPORTER_ASSERT(reporter, info.fAlphaType == gRec[i].fAlphaType); |
- REPORTER_ASSERT(reporter, info.fColorType == gRec[i].fExpectedColorType); |
- } |
- } |
-} |
- |
class TestListener : public SkPixelRef::GenIDChangeListener { |
public: |
explicit TestListener(int* ptr) : fPtr(ptr) {} |
@@ -77,6 +43,4 @@ DEF_TEST(PixelRef_GenIDChange, r) { |
REPORTER_ASSERT(r, 0 != pixelRef->getGenerationID()); |
pixelRef->addGenIDChangeListener(NULL); |
pixelRef->notifyPixelsChanged(); |
- |
- test_info(r); |
} |