Revert "Implement caching of filled paths in the tessellated path renderer."

tests/ResourceCacheTest.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 here to ensure SK_SUPPORT_GPU is set correctly before it is examined.
 #include "SkTypes.h"
 
@@ skipping 827 matching lines @@
     REPORTER_ASSERT(reporter, c->gpuMemorySize() == cache->getResourceBytes());
     REPORTER_ASSERT(reporter, 1 == TestResource::NumAlive());
 
     // Verify that we can find c, then remove its unique key. It should get purged immediately.
     REPORTER_ASSERT(reporter, c == cache->findAndRefUniqueResource(key));
     c->resourcePriv().removeUniqueKey();
     c->unref();
     REPORTER_ASSERT(reporter, 0 == cache->getResourceCount());
     REPORTER_ASSERT(reporter, 0 == cache->getResourceBytes());
     REPORTER_ASSERT(reporter, 0 == TestResource::NumAlive());
-
-    {
-        GrUniqueKey key2;
-        make_unique_key<0>(&key2, 0);
-        SkAutoTUnref<TestResource> d(SkNEW_ARGS(TestResource, (context->getGpu())));
-        int foo = 4132;
-        SkAutoTUnref<SkData> data(SkData::NewWithCopy(&foo, sizeof(foo)));
-        key2.setCustomData(data.get());
-        d->resourcePriv().setUniqueKey(key2);
-    }
-
-    GrUniqueKey key3;
-    make_unique_key<0>(&key3, 0);
-    SkAutoTUnref<GrGpuResource> d2(cache->findAndRefUniqueResource(key3));
-    REPORTER_ASSERT(reporter, *(int*) d2->getUniqueKey().getCustomData()->data() == 4132);
 }
 
 static void test_purge_invalidated(skiatest::Reporter* reporter) {
     Mock mock(5, 30000);
     GrContext* context = mock.context();
     GrResourceCache* cache = mock.cache();
 
     GrUniqueKey key1, key2, key3;
     make_unique_key<0>(&key1, 1);
     make_unique_key<0>(&key2, 2);
@@ skipping 358 matching lines @@
     for (int i = 0; i < kResourceCnt; ++i) {
         GrUniqueKey key1, key2;
         make_unique_key<1>(&key1, i);
         make_unique_key<2>(&key2, i);
 
         REPORTER_ASSERT(reporter, !cache->hasUniqueKey(key1));
         REPORTER_ASSERT(reporter, !cache->hasUniqueKey(key2));
     }
 }
 
-static void test_custom_data(skiatest::Reporter* reporter) {
-    GrUniqueKey key1, key2;
-    make_unique_key<0>(&key1, 1);
-    make_unique_key<0>(&key2, 2);
-    int foo = 4132;
-    SkAutoTUnref<SkData> data(SkData::NewWithCopy(&foo, sizeof(foo)));
-    key1.setCustomData(data.get());
-    REPORTER_ASSERT(reporter, *(int*) key1.getCustomData()->data() == 4132);
-    REPORTER_ASSERT(reporter, key2.getCustomData() == nullptr);
-
-    // Test that copying a key also takes a ref on its custom data.
-    GrUniqueKey key3 = key1;
-    REPORTER_ASSERT(reporter, *(int*) key3.getCustomData()->data() == 4132);
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 DEF_GPUTEST(ResourceCache, reporter, factory) {
     for (int type = 0; type < GrContextFactory::kLastGLContextType; ++type) {
         GrContextFactory::GLContextType glType = static_cast<GrContextFactory::GLContextType>(type);
         if (!GrContextFactory::IsRenderingGLContext(glType)) {
             continue;
         }
         GrContext* context = factory->get(glType);
         if (NULL == context) {
             continue;
@@ skipping 19 matching lines @@
     test_duplicate_unique_key(reporter);
     test_duplicate_scratch_key(reporter);
     test_remove_scratch_key(reporter);
     test_scratch_key_consistency(reporter);
     test_purge_invalidated(reporter);
     test_cache_chained_purge(reporter);
     test_resource_size_changed(reporter);
     test_timestamp_wrap(reporter);
     test_flush(reporter);
     test_large_resource_count(reporter);
-    test_custom_data(reporter);
 }
 
 #endif