Make GrReducedClip's gen ID only apply to the element list

tests/ClipStackTest.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 "SkClipStack.h"
 #include "SkPath.h"
@@ skipping 1178 matching lines @@
     queryXform.mapRect(&queryBounds, preXformQuery);
     const GrReducedClip reduced(stack, queryBounds);
 
     SkClipStack::BoundsType stackBoundsType;
     SkRect stackBounds;
     stack.getBounds(&stackBounds, &stackBoundsType);
 
     switch (expectedMethod) {
         case ClipMethod::kSkipDraw:
             SkASSERT(0 == numExpectedElems);
+            REPORTER_ASSERT_MESSAGE(reporter, SkClipStack::kEmptyGenID == reduced.genID(),
+                                    testName.c_str());
             REPORTER_ASSERT_MESSAGE(reporter, reduced.elements().isEmpty(), testName.c_str());
             REPORTER_ASSERT_MESSAGE(reporter,
                                     GrReducedClip::InitialState::kAllOut == reduced.initialState(),
                                     testName.c_str());
             return;
         case ClipMethod::kIgnoreClip:
             SkASSERT(0 == numExpectedElems);
+            SkASSERT(SkClipStack::kWideOpenGenID == reduced.genID());
+            REPORTER_ASSERT_MESSAGE(reporter, SkClipStack::kWideOpenGenID == reduced.genID(),
+                                    testName.c_str());
             REPORTER_ASSERT_MESSAGE(reporter,
                                     !reduced.hasIBounds() ||
                                     GrClip::IsInsideClip(reduced.ibounds(), queryBounds),
                                     testName.c_str());
             REPORTER_ASSERT_MESSAGE(reporter, reduced.elements().isEmpty(), testName.c_str());
             REPORTER_ASSERT_MESSAGE(reporter,
                                     GrReducedClip::InitialState::kAllIn == reduced.initialState(),
                                     testName.c_str());
             return;
         case ClipMethod::kScissor: {
@@ skipping 160 matching lines @@
     test_path_replace(reporter);
     test_quickContains(reporter);
     test_invfill_diff_bug(reporter);
 #if SK_SUPPORT_GPU
     test_reduced_clip_stack(reporter);
     test_reduced_clip_stack_genid(reporter);
     test_reduced_clip_stack_no_aa_crash(reporter);
     test_reduced_clip_stack_aa(reporter);
 #endif
 }