From d1290843c364dda7691817f3bb52aadee8391acf Mon Sep 17 00:00:00 2001 From: reed Date: Tue, 5 May 2015 11:36:02 -0700 Subject: remove dead code behind BOOL_ONGETINFO need this to land in chrome first https://codereview.chromium.org/1125573002 BUG=skia: TBR= Review URL: https://codereview.chromium.org/1123473004 --- tests/CachedDecodingPixelRefTest.cpp | 8 -------- tests/DrawBitmapRectTest.cpp | 6 ------ 2 files changed, 14 deletions(-) (limited to 'tests') diff --git a/tests/CachedDecodingPixelRefTest.cpp b/tests/CachedDecodingPixelRefTest.cpp index fc56edd823..670d849436 100644 --- a/tests/CachedDecodingPixelRefTest.cpp +++ b/tests/CachedDecodingPixelRefTest.cpp @@ -182,14 +182,6 @@ protected: kOpaque_SkAlphaType); } -#ifdef SK_SUPPORT_LEGACY_BOOL_ONGETINFO - bool onGetInfo(SkImageInfo* info) override { - REPORTER_ASSERT(fReporter, info); - *info = GetMyInfo(); - return true; - } -#endif - virtual Result onGetPixels(const SkImageInfo& info, void* pixels, size_t rowBytes, const Options&, SkPMColor ctable[], int* ctableCount) override { diff --git a/tests/DrawBitmapRectTest.cpp b/tests/DrawBitmapRectTest.cpp index 060e08b3a7..9c522db28e 100644 --- a/tests/DrawBitmapRectTest.cpp +++ b/tests/DrawBitmapRectTest.cpp @@ -22,12 +22,6 @@ class FailureImageGenerator : public SkImageGenerator { public: FailureImageGenerator() : SkImageGenerator(SkImageInfo::MakeN32Premul(100, 100)) {} protected: -#ifdef SK_SUPPORT_LEGACY_BOOL_ONGETINFO - bool onGetInfo(SkImageInfo* info) override { - *info = SkImageInfo::MakeN32Premul(100, 100); - return true; - } -#endif // default onGetPixels() returns kUnimplemented, which is what we want. }; -- cgit v1.2.3