Don't compute path keys for volatile paths in GrShape.

tests/GpuDrawPathTest.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkTypes.h"
 
 #if SK_SUPPORT_GPU
@@ skipping 86 matching lines @@
     strokePaint.setStrokeWidth(10.f);
     GrStyle styles[] = {
         GrStyle::SimpleFill(),
         GrStyle::SimpleHairline(),
         GrStyle(strokePaint)
     };
 
     for (const GrStyle& style : styles) {
         // Keys should not ignore conic weights.
         SkPath path1, path2;
-        path1.setIsVolatile(true);
-        path2.setIsVolatile(true);
         SkPoint p0 = SkPoint::Make(100, 0);
         SkPoint p1 = SkPoint::Make(100, 100);
 
         path1.conicTo(p0, p1, .5f);
         path2.conicTo(p0, p1, .7f);
 
+        GrUniqueKey key1, key2;
+        // We expect these small paths to be keyed based on their data.
         bool isVolatile;
-        GrUniqueKey key1, key2;
-        // Even though the paths are marked volatile, they should have keys based on the path data
-        // because they have a small amount of data.
         GrPath::ComputeKey(GrShape(path1, GrStyle::SimpleFill()), &key1, &isVolatile);
         REPORTER_ASSERT(reporter, !isVolatile);
         REPORTER_ASSERT(reporter, key1.isValid());
         GrPath::ComputeKey(GrShape(path2, GrStyle::SimpleFill()), &key2, &isVolatile);
         REPORTER_ASSERT(reporter, !isVolatile);
         REPORTER_ASSERT(reporter, key1.isValid());
         REPORTER_ASSERT(reporter, key1 != key2);
+        {
+            GrUniqueKey tempKey;
+            path1.setIsVolatile(true);
+            GrPath::ComputeKey(GrShape(path1, style), &key1, &isVolatile);
+            REPORTER_ASSERT(reporter, isVolatile);
+            REPORTER_ASSERT(reporter, !tempKey.isValid());
+        }
 
         // Ensure that recreating the GrShape doesn't change the key.
         {
             GrUniqueKey tempKey;
-            GrPath::ComputeKey(GrShape(path1, GrStyle::SimpleFill()), &tempKey, &isVolatile);
-            REPORTER_ASSERT(reporter, key1 == tempKey);
+            GrPath::ComputeKey(GrShape(path2, GrStyle::SimpleFill()), &tempKey, &isVolatile);
+            REPORTER_ASSERT(reporter, key2 == tempKey);
         }
 
         // Try a large path that is too big to be keyed off its data.
         SkPath path3;
         SkPath path4;
         for (int i = 0; i < 1000; ++i) {
             SkScalar s = SkIntToScalar(i);
             path3.conicTo(s, 3.f * s / 4, s + 1.f, s, 0.5f + s / 2000.f);
             path4.conicTo(s, 3.f * s / 4, s + 1.f, s, 0.3f + s / 2000.f);
         }
@@ skipping 12 matching lines @@
             GrUniqueKey tempKey;
             path3.setIsVolatile(true);
             GrPath::ComputeKey(GrShape(path3, style), &key1, &isVolatile);
             REPORTER_ASSERT(reporter, isVolatile);
             REPORTER_ASSERT(reporter, !tempKey.isValid());
         }
     }
 }
 
 #endif