Use SkPathRef gen id for SkPath::getGenerationID

tests/PathTest.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "Test.h"
 #include "SkCanvas.h"
 #include "SkPaint.h"
@@ skipping 109 matching lines @@
 }
 
 static void test_android_specific_behavior(skiatest::Reporter* reporter) {
 #ifdef SK_BUILD_FOR_ANDROID
     // Make sure we treat fGenerationID and fSourcePath correctly for each of
     // copy, assign, rewind, reset, and swap.
     SkPath original, source, anotherSource;
     original.setSourcePath(&source);
     original.moveTo(0, 0);
     original.lineTo(1, 1);
-    REPORTER_ASSERT(reporter, original.getGenerationID() > 0);
     REPORTER_ASSERT(reporter, original.getSourcePath() == &source);
 
     uint32_t copyID, assignID;
 
     // Test copy constructor.  Copy generation ID, copy source path.
     SkPath copy(original);
     REPORTER_ASSERT(reporter, copy.getGenerationID() == original.getGenerationID());
     REPORTER_ASSERT(reporter, copy.getSourcePath() == original.getSourcePath());
 
     // Test assigment operator.  Increment generation ID, copy source path.
     SkPath assign;
     assignID = assign.getGenerationID();
     assign = original;
-    REPORTER_ASSERT(reporter, assign.getGenerationID() > assignID);
+    REPORTER_ASSERT(reporter, assign.getGenerationID() != assignID);
     REPORTER_ASSERT(reporter, assign.getSourcePath() == original.getSourcePath());
 
     // Test rewind.  Increment generation ID, don't touch source path.
     copyID = copy.getGenerationID();
     copy.rewind();
-    REPORTER_ASSERT(reporter, copy.getGenerationID() > copyID);
+    REPORTER_ASSERT(reporter, copy.getGenerationID() != copyID);
     REPORTER_ASSERT(reporter, copy.getSourcePath() == original.getSourcePath());
 
     // Test reset.  Increment generation ID, don't touch source path.

[mtklein, 2013/10/30 15:59:10]

These little comments may need an update.  Maybe just s/Increment/Change ?

[bsalomon, 2013/10/30 17:39:08]

Done.

     assignID = assign.getGenerationID();
     assign.reset();
-    REPORTER_ASSERT(reporter, assign.getGenerationID() > assignID);
+    REPORTER_ASSERT(reporter, assign.getGenerationID() != assignID);
     REPORTER_ASSERT(reporter, assign.getSourcePath() == original.getSourcePath());
 
     // Test swap.  Increment both generation IDs, swap source paths.
+    copy.reset();
+    copy.moveTo(2, 2);
     copy.setSourcePath(&anotherSource);
     copyID = copy.getGenerationID();
+    assign.moveTo(3, 3);
     assignID = assign.getGenerationID();
     copy.swap(assign);
-    REPORTER_ASSERT(reporter, copy.getGenerationID() > copyID);
-    REPORTER_ASSERT(reporter, assign.getGenerationID() > assignID);
+    REPORTER_ASSERT(reporter, copy.getGenerationID() != copyID);
+    REPORTER_ASSERT(reporter, assign.getGenerationID() != assignID);
     REPORTER_ASSERT(reporter, copy.getSourcePath() == original.getSourcePath());
     REPORTER_ASSERT(reporter, assign.getSourcePath() == &anotherSource);
 #endif
 }
 
+static void test_gen_id(skiatest::Reporter* reporter) {
+    SkPath a, b;
+    REPORTER_ASSERT(reporter, a.getGenerationID() == b.getGenerationID());
+
+    a.moveTo(0, 0);
+    uint32_t z = a.getGenerationID();

[mtklein, 2013/10/30 15:59:10]

const on v,w,x,y,z would help reading?

[bsalomon, 2013/10/30 17:39:08]

Done.

+    REPORTER_ASSERT(reporter, z != b.getGenerationID());
+
+    a.reset();
+    REPORTER_ASSERT(reporter, a.getGenerationID() == b.getGenerationID());
+
+    a.moveTo(1, 1);
+    uint32_t y = a.getGenerationID();
+    REPORTER_ASSERT(reporter, z != y);
+
+    b.moveTo(2, 2);
+    uint32_t x = b.getGenerationID();
+    REPORTER_ASSERT(reporter, x != y && x != z);
+
+    a.swap(b);
+    REPORTER_ASSERT(reporter, b.getGenerationID() == y && a.getGenerationID() == x);
+
+    b = a;
+    REPORTER_ASSERT(reporter, b.getGenerationID() == x);
+
+    SkPath c(a);
+    REPORTER_ASSERT(reporter, c.getGenerationID() == x);
+
+    c.lineTo(3, 3);
+    uint32_t w = c.getGenerationID();
+    REPORTER_ASSERT(reporter, b.getGenerationID() == x);
+    REPORTER_ASSERT(reporter, a.getGenerationID() == x);
+    REPORTER_ASSERT(reporter, w != x);
+
+#ifdef SK_BUILD_FOR_ANDROID
+    static bool kExpectGenIDToIgnoreFill = false;
+#else
+    static bool kExpectGenIDToIgnoreFill = true;
+#endif
+
+    c.toggleInverseFillType();
+    uint32_t v = c.getGenerationID();
+    REPORTER_ASSERT(reporter, (v == w) == kExpectGenIDToIgnoreFill);
+
+    c.rewind();
+    REPORTER_ASSERT(reporter, v != c.getGenerationID());
+}
+
 // This used to assert in the debug build, as the edges did not all line-up.
 static void test_bad_cubic_crbug234190() {
     SkPath path;
     path.moveTo(13.8509f, 3.16858f);
     path.cubicTo(-2.35893e+08f, -4.21044e+08f,
                  -2.38991e+08f, -4.26573e+08f,
                  -2.41016e+08f, -4.30188e+08f);
 
     SkPaint paint;
     paint.setAntiAlias(true);
@@ skipping 2432 matching lines @@
     test_isfinite_after_transform(reporter);
     test_arb_round_rect_is_convex(reporter);
     test_arb_zero_rad_round_rect_is_rect(reporter);
     test_addrect_isfinite(reporter);
     test_tricky_cubic();
     test_clipped_cubic();
     test_crbug_170666();
     test_bad_cubic_crbug229478();
     test_bad_cubic_crbug234190();
     test_android_specific_behavior(reporter);
+    test_gen_id(reporter);
     test_path_close_issue1474(reporter);
     test_path_to_region(reporter);
 }
 
 #include "TestClassDef.h"
 DEFINE_TESTCLASS("Path", PathTestClass, TestPath)