diff options
| author |  Robert Phillips <robertphillips@google.com> | 2018-01-17 12:13:11 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-01-17 17:40:47 +0000 |
| commit | 2ac5868f4a695b30777c7c57ffd493fed0fa597b (patch) | |
| tree | 2453c3317a488f28a163640eef06f2f44997dac2 /src/gpu/GrTextureProxy.cpp | |
| parent | 8008df1080f5623bf1cf13c713082c2b732d4eb2 (diff) | |
Remove GrSurfaceProxy::MakeWrapped
Change-Id: Ic44cf1745dc3be21cbbaa1dc4ac85c8b1b21c6bb
Reviewed-on: https://skia-review.googlesource.com/94101
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>
Diffstat (limited to 'src/gpu/GrTextureProxy.cpp')
| -rw-r--r-- | src/gpu/GrTextureProxy.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gpu/GrTextureProxy.cpp b/src/gpu/GrTextureProxy.cpp index 9eca5d9876..03b810823e 100644 --- a/src/gpu/GrTextureProxy.cpp +++ b/src/gpu/GrTextureProxy.cpp @@ -131,8 +131,10 @@ void GrTextureProxy::setUniqueKey(GrProxyProvider* proxyProvider, const GrUnique SkASSERT(key.isValid()); SkASSERT(!fUniqueKey.isValid()); // proxies can only ever get one uniqueKey - if (fTarget && !fTarget->getUniqueKey().isValid()) { - fTarget->resourcePriv().setUniqueKey(key); + if (fTarget) { + if (!fTarget->getUniqueKey().isValid()) { + fTarget->resourcePriv().setUniqueKey(key); + } SkASSERT(fTarget->getUniqueKey() == key); } |