aboutsummaryrefslogtreecommitdiffhomepage
path: root/include
diff options
context:
space:
mode:
authorGravatar Robert Phillips <robertphillips@google.com>2017-07-21 12:15:05 +0000
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-07-21 12:15:14 +0000
commit39f1a9589bf4e0818aaeaa9c2fc4ecbe1e2ec23e (patch)
tree6bdef7dba2a0a741ce767274554c54327d7ca0e1 /include
parent650ced07d9660e74eb34ddff79293583f7b70837 (diff)
Revert "Add initial version of GrResourceAllocator's free pool"
This reverts commit 6ec9a4ffe43910551d15ddc95150472aabbc8b74. Reason for revert: Maybe breaking iOS bots Original change's description: > Add initial version of GrResourceAllocator's free pool > > Change-Id: Ibd60303ffb1d3ea814dad0cee3a521f94da63ca8 > Reviewed-on: https://skia-review.googlesource.com/24262 > Reviewed-by: Brian Salomon <bsalomon@google.com> > Commit-Queue: Robert Phillips <robertphillips@google.com> TBR=bsalomon@google.com,robertphillips@google.com Change-Id: I0195f64503a6f2f7b416f75b57fb9141e5b9f796 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/25540 Reviewed-by: Robert Phillips <robertphillips@google.com> Commit-Queue: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'include')
-rw-r--r--include/private/GrSurfaceProxy.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/private/GrSurfaceProxy.h b/include/private/GrSurfaceProxy.h
index 71eaf138bf..f899f75abf 100644
--- a/include/private/GrSurfaceProxy.h
+++ b/include/private/GrSurfaceProxy.h
@@ -329,6 +329,7 @@ public:
bool isWrapped_ForTesting() const;
+ SkDEBUGCODE(bool isInstantiated() const { return SkToBool(fTarget); })
SkDEBUGCODE(void validate(GrContext*) const;)
// Provides access to functions that aren't part of the public API.
@@ -367,8 +368,6 @@ protected:
return this->internalHasPendingWrite();
}
- void computeScratchKey(GrScratchKey*) const;
-
virtual sk_sp<GrSurface> createSurface(GrResourceProvider*) const = 0;
void assign(sk_sp<GrSurface> surface);