commit | 6d0872d9bd97de5301214a258e141dd5fbeecffc | [log] [tgz] |
---|---|---|
author | joshualitt <joshualitt@google.com> | Mon Jan 11 08:27:48 2016 -0800 |
committer | Commit bot <commit-bot@chromium.org> | Mon Jan 11 08:27:48 2016 -0800 |
tree | 5fd61d616d646098dfacfaef56c5c5f70c74f32b | |
parent | 7cf12ddb8c1c2cf7a0eec63439148cc6b2bc104a [diff] [blame] |
Reland of Add guards to GrTextureProvider (patchset #1 id:1 of https://codereview.chromium.org/1565313003/ ) Reason for revert: should be fixed Original issue's description: > Revert of Add guards to GrTextureProvider (patchset #5 id:80001 of https://codereview.chromium.org/1567983002/ ) > > Reason for revert: > breaking asan bot > > Original issue's description: > > Add guards to GrTextureProvider > > > > TBR=bsalomon@google.com > > BUG=skia: > > GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1567983002 > > > > Committed: https://skia.googlesource.com/skia/+/b30dd1db1d914b85a691b4724713ba1b0f16cd6c > > TBR=robertphillips@google.com,joshualitt@chromium.org > # Skipping CQ checks because original CL landed less than 1 days ago. > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > BUG=skia: > > Committed: https://skia.googlesource.com/skia/+/9a9515e081c54efdd5a0b0 f662c013cbeef6d63f TBR=bsalomon@google.com TBR=robertphillips@google.com,joshualitt@chromium.org # Not skipping CQ checks because original CL landed more than 1 days ago. BUG=skia: Review URL: https://codereview.chromium.org/1575093002
diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp index 2bf887c..c37f31c 100644 --- a/src/gpu/GrContext.cpp +++ b/src/gpu/GrContext.cpp
@@ -85,7 +85,7 @@ fCaps = SkRef(fGpu->caps()); fResourceCache = new GrResourceCache(fCaps); fResourceCache->setOverBudgetCallback(OverBudgetCB, this); - fResourceProvider = new GrResourceProvider(fGpu, fResourceCache); + fResourceProvider = new GrResourceProvider(fGpu, fResourceCache, &fSingleOwner); fLayerCache.reset(new GrLayerCache(this));