From e3aee8fb7b041b3949fc912ef21b2e44650b7ee9 Mon Sep 17 00:00:00 2001 From: djsollen Date: Thu, 23 Oct 2014 10:23:07 -0700 Subject: Remove android specific genID from SkPaint. Review URL: https://codereview.chromium.org/677453002 --- tests/PaintTest.cpp | 25 ------------------------- 1 file changed, 25 deletions(-) (limited to 'tests/PaintTest.cpp') diff --git a/tests/PaintTest.cpp b/tests/PaintTest.cpp index 9b49ec1e85..4c45eed761 100644 --- a/tests/PaintTest.cpp +++ b/tests/PaintTest.cpp @@ -158,41 +158,16 @@ DEF_TEST(Paint_copy, reporter) { SkPaint copiedPaint = paint; REPORTER_ASSERT(reporter, paint == copiedPaint); -#ifdef SK_BUILD_FOR_ANDROID - // the copy constructor should preserve the Generation ID - uint32_t paintGenID = paint.getGenerationID(); - uint32_t copiedPaintGenID = copiedPaint.getGenerationID(); - REPORTER_ASSERT(reporter, paintGenID == copiedPaintGenID); - REPORTER_ASSERT(reporter, paint == copiedPaint); -#endif - // copy the paint using the equal operator and check they are the same copiedPaint = paint; REPORTER_ASSERT(reporter, paint == copiedPaint); -#ifdef SK_BUILD_FOR_ANDROID - // the equals operator should increment the Generation ID - REPORTER_ASSERT(reporter, paint.getGenerationID() == paintGenID); - REPORTER_ASSERT(reporter, copiedPaint.getGenerationID() != copiedPaintGenID); - copiedPaintGenID = copiedPaint.getGenerationID(); // reset to the new value - REPORTER_ASSERT(reporter, paint == copiedPaint); // operator== ignores fGenerationID -#endif - // clean the paint and check they are back to their initial states SkPaint cleanPaint; paint.reset(); copiedPaint.reset(); REPORTER_ASSERT(reporter, cleanPaint == paint); REPORTER_ASSERT(reporter, cleanPaint == copiedPaint); - -#ifdef SK_BUILD_FOR_ANDROID - // the reset function should increment the Generation ID - REPORTER_ASSERT(reporter, paint.getGenerationID() != paintGenID); - REPORTER_ASSERT(reporter, copiedPaint.getGenerationID() != copiedPaintGenID); - // operator== ignores fGenerationID - REPORTER_ASSERT(reporter, cleanPaint == paint); - REPORTER_ASSERT(reporter, cleanPaint == copiedPaint); -#endif } // found and fixed for webkit: mishandling when we hit recursion limit on -- cgit v1.2.3