Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(226)

Issue 1262623008: Revert of Fix SkData leaks at GrResourceKey::setCustomData() call sites. (Closed)

Created:
5 years, 4 months ago by mtklein_C
Modified:
5 years, 4 months ago
CC:
reviews_skia.org
Base URL:
https://skia.googlesource.com/skia.git@master
Target Ref:
refs/heads/master
Project:
skia
Visibility:
Public.

Description

Revert of Fix SkData leaks at GrResourceKey::setCustomData() call sites. (patchset #1 id:1 of https://codereview.chromium.org/1270103003/ ) Reason for revert: reverting this chain, lots of big diffs Original issue's description: > Fix SkData leaks at GrResourceKey::setCustomData() call sites. > > BUG=skia: > TBR=bsalomon@google.com > > Committed: https://skia.googlesource.com/skia/+/c369348aa596d7be05c9ce0ca5d349e5d1903789 TBR=bsalomon@google.com,senorblanco@chromium.org,senorblanco@google.com NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia:

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+3 lines, -6 lines) Patch
M src/gpu/GrTessellatingPathRenderer.cpp View 1 chunk +1 line, -2 lines 0 comments Download
M tests/ResourceCacheTest.cpp View 2 chunks +2 lines, -4 lines 0 comments Download

Messages

Total messages: 4 (1 generated)
mtklein_C
Created Revert of Fix SkData leaks at GrResourceKey::setCustomData() call sites.
5 years, 4 months ago (2015-08-04 15:17:50 UTC) #1
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1262623008/1 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1262623008/1
5 years, 4 months ago (2015-08-04 15:17:57 UTC) #2
commit-bot: I haz the power
5 years, 4 months ago (2015-08-04 15:18:02 UTC) #4
Failed to apply patch for tests/ResourceCacheTest.cpp:
While running git apply --index -3 -p1;
  error: patch failed: tests/ResourceCacheTest.cpp:1241
  error: repository lacks the necessary blob to fall back on 3-way merge.
  error: tests/ResourceCacheTest.cpp: patch does not apply

Patch:       tests/ResourceCacheTest.cpp
Index: tests/ResourceCacheTest.cpp
diff --git a/tests/ResourceCacheTest.cpp b/tests/ResourceCacheTest.cpp
index
a4acab86a19a968fa97a229602420cfcfec0301a..65b7b7ca2de630613aedd57873427d470ffa7562
100644
--- a/tests/ResourceCacheTest.cpp
+++ b/tests/ResourceCacheTest.cpp
@@ -851,8 +851,7 @@
         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());
+        key2.setCustomData(SkData::NewWithCopy(&foo, sizeof(foo)));
         d->resourcePriv().setUniqueKey(key2);
     }
 
@@ -1241,8 +1240,7 @@
 static void test_custom_data(skiatest::Reporter* reporter) {
     GrUniqueKey key1, key2;
     int foo = 4132;
-    SkAutoTUnref<SkData> data(SkData::NewWithCopy(&foo, sizeof(foo)));
-    key1.setCustomData(data.get());
+    key1.setCustomData(SkData::NewWithCopy(&foo, sizeof(foo)));
     REPORTER_ASSERT(reporter, *(int*) key1.getCustomData()->data() == 4132);
     REPORTER_ASSERT(reporter, key2.getCustomData() == nullptr);

Powered by Google App Engine
This is Rietveld 408576698