diff options
author | 2013-12-04 19:56:31 +0000 | |
---|---|---|
committer | 2013-12-04 19:56:31 +0000 | |
commit | a0b266d8170211d9f2a6f90ba9c889f0c1b6d1b6 (patch) | |
tree | c1bfd8c756858572eef4585dd230e319b902f95c /tests | |
parent | bdb677a277e0285da5293adc0f1d40101fad4a69 (diff) |
Remove deprecated setPrefConfigTable.
Safe once its only caller (in Android) has been updated.
BUG=skia:1874
R=reed@google.com
Review URL: https://codereview.chromium.org/99473004
git-svn-id: http://skia.googlecode.com/svn/trunk@12491 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'tests')
-rw-r--r-- | tests/ImageDecodingTest.cpp | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/tests/ImageDecodingTest.cpp b/tests/ImageDecodingTest.cpp index 6fcef1d315..be8626f0f6 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(); |