diff options
| author |  Robert Phillips <robertphillips@google.com> | 2018-01-17 18:12:50 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-01-17 18:12:57 +0000 |
| commit | e201ebc995151adbe0e15cd88d7277d41c40ddbf (patch) | |
| tree | 75e1c849a0c1474c9aee0277e538bc8917614fa8 /src/gpu/GrTextureProxy.cpp | |
| parent | b1b7f70103378aff5e9a315e7788866b648ab4b1 (diff) | |
Revert "Remove GrSurfaceProxy::MakeWrapped"
This reverts commit 2ac5868f4a695b30777c7c57ffd493fed0fa597b.
Reason for revert: Breaking Android
Original change's description:
> 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>
TBR=egdaniel@google.com,robertphillips@google.com,brianosman@google.com
Change-Id: I312118106db1cf64fe959d36e65619a41d58e654
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/95860
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'src/gpu/GrTextureProxy.cpp')
| -rw-r--r-- | src/gpu/GrTextureProxy.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/gpu/GrTextureProxy.cpp b/src/gpu/GrTextureProxy.cpp index 03b810823e..9eca5d9876 100644 --- a/src/gpu/GrTextureProxy.cpp +++ b/src/gpu/GrTextureProxy.cpp @@ -131,10 +131,8 @@ void GrTextureProxy::setUniqueKey(GrProxyProvider* proxyProvider, const GrUnique SkASSERT(key.isValid()); SkASSERT(!fUniqueKey.isValid()); // proxies can only ever get one uniqueKey - if (fTarget) { - if (!fTarget->getUniqueKey().isValid()) { - fTarget->resourcePriv().setUniqueKey(key); - } + if (fTarget && !fTarget->getUniqueKey().isValid()) { + fTarget->resourcePriv().setUniqueKey(key); SkASSERT(fTarget->getUniqueKey() == key); } |