| Index: tests/PaintTest.cpp
|
| diff --git a/tests/PaintTest.cpp b/tests/PaintTest.cpp
|
| index 9b49ec1e8517b659e7dd3d7858cc4a3239fa9a30..4c45eed7614c368e270c47f3f1249f22b1223575 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
|
|
|