| Index: tests/ImageDecodingTest.cpp
|
| diff --git a/tests/ImageDecodingTest.cpp b/tests/ImageDecodingTest.cpp
|
| index 6fcef1d31543ba782f2a77653e64a3a0e2b2bb8e..be8626f0f6beb9dcc52b6065dfb028c58788e1a2 100644
|
| --- a/tests/ImageDecodingTest.cpp
|
| +++ b/tests/ImageDecodingTest.cpp
|
| @@ -139,40 +139,6 @@ static void compare_unpremul(skiatest::Reporter* reporter, const SkString& filen
|
| }
|
| }
|
|
|
| -// Create a fake ImageDecoder to test setPrefConfigTable for
|
| -// backwards compatibility.
|
| -class PrefConfigTestingImageDecoder : public SkImageDecoder {
|
| -public:
|
| - void testPrefConfigTable(skiatest::Reporter* reporter) {
|
| - // Arbitrary list of Configs. The important thing about
|
| - // the list is that each one is different, so we can test
|
| - // to make sure the correct config is chosen.
|
| - const SkBitmap::Config configs[] = {
|
| - SkBitmap::kA8_Config,
|
| - SkBitmap::kA8_Config,
|
| - SkBitmap::kIndex8_Config,
|
| - SkBitmap::kRGB_565_Config,
|
| - SkBitmap::kARGB_4444_Config,
|
| - SkBitmap::kARGB_8888_Config,
|
| - };
|
| - this->setPrefConfigTable(configs);
|
| - REPORTER_ASSERT(reporter, configs[0] == this->getPrefConfig(kIndex_SrcDepth, false));
|
| - REPORTER_ASSERT(reporter, configs[1] == this->getPrefConfig(kIndex_SrcDepth, true));
|
| - REPORTER_ASSERT(reporter, configs[4] == this->getPrefConfig(k32Bit_SrcDepth, false));
|
| - REPORTER_ASSERT(reporter, configs[5] == this->getPrefConfig(k32Bit_SrcDepth, true));
|
| - }
|
| -
|
| -protected:
|
| - virtual bool onDecode(SkStream*, SkBitmap* bitmap, Mode) SK_OVERRIDE {
|
| - return false;
|
| - }
|
| -};
|
| -
|
| -static void test_pref_config_table(skiatest::Reporter* reporter) {
|
| - PrefConfigTestingImageDecoder decoder;
|
| - decoder.testPrefConfigTable(reporter);
|
| -}
|
| -
|
| static void test_unpremul(skiatest::Reporter* reporter) {
|
| // This test cannot run if there is no resource path.
|
| SkString resourcePath = skiatest::Test::GetResourcePath();
|
| @@ -264,7 +230,6 @@ extern void test_row_proc_choice();
|
|
|
| static void test_imageDecodingTests(skiatest::Reporter* reporter) {
|
| test_unpremul(reporter);
|
| - test_pref_config_table(reporter);
|
| #ifdef SK_DEBUG
|
| test_stream_life();
|
| test_row_proc_choice();
|
|
|