diff options
-rw-r--r-- | src/gpu/GrTessellatingPathRenderer.cpp | 3 | ||||
-rw-r--r-- | tests/ResourceCacheTest.cpp | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/gpu/GrTessellatingPathRenderer.cpp b/src/gpu/GrTessellatingPathRenderer.cpp index 5d83dd7dde..62b8f0ee48 100644 --- a/src/gpu/GrTessellatingPathRenderer.cpp +++ b/src/gpu/GrTessellatingPathRenderer.cpp @@ -1489,7 +1489,8 @@ public: TessInfo info; info.fTolerance = isLinear ? 0 : tol; info.fCount = actualCount; - key->setCustomData(SkData::NewWithCopy(&info, sizeof(info))); + SkAutoTUnref<SkData> data(SkData::NewWithCopy(&info, sizeof(info))); + key->setCustomData(data.get()); resourceProvider->assignUniqueKeyToResource(*key, vertexBuffer.get()); SkPathPriv::AddGenIDChangeListener(fPath, SkNEW(PathInvalidator(*key))); } diff --git a/tests/ResourceCacheTest.cpp b/tests/ResourceCacheTest.cpp index 571895f290..43f087004f 100644 --- a/tests/ResourceCacheTest.cpp +++ b/tests/ResourceCacheTest.cpp @@ -851,7 +851,8 @@ static void test_duplicate_unique_key(skiatest::Reporter* reporter) { make_unique_key<0>(&key2, 0); SkAutoTUnref<TestResource> d(SkNEW_ARGS(TestResource, (context->getGpu()))); int foo = 4132; - key2.setCustomData(SkData::NewWithCopy(&foo, sizeof(foo))); + SkAutoTUnref<SkData> data(SkData::NewWithCopy(&foo, sizeof(foo))); + key2.setCustomData(data.get()); d->resourcePriv().setUniqueKey(key2); } @@ -1242,7 +1243,8 @@ static void test_custom_data(skiatest::Reporter* reporter) { make_unique_key<0>(&key1, 1); make_unique_key<0>(&key2, 2); int foo = 4132; - key1.setCustomData(SkData::NewWithCopy(&foo, sizeof(foo))); + 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); |