diff options
| author |  cdalton <cdalton@nvidia.com> | 2014-08-11 12:43:28 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-08-11 12:43:28 -0700 |
| commit | 3f860991ade1128e770c1268372f755a397e2942 (patch) | |
| tree | 2a8968d86e014d98ddda2d009572b0460e37f950 | |
| parent | 4596c98908600408ef42c78b633ba6f678ba2177 (diff) | |
Fix crash in nvpr text after abandoning context
Don't implement GlyphPathRange::onAbandon/onRelease. Its path range is
also a GrGpuResource, registered with the gpu, and will automatically
handle abandoning and releasing the actual GL objects. Don't delete
the path range early, it is assumed to be a valid pointer throughout
the entire lifetime of GlyphPathRange.
BUG=skia:
R=bsalomon@google.com, kkinnunen@nvidia.com
Author: cdalton@nvidia.com
Review URL: https://codereview.chromium.org/452273003
| -rw-r--r-- | src/gpu/GrStencilAndCoverTextContext.cpp | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/src/gpu/GrStencilAndCoverTextContext.cpp b/src/gpu/GrStencilAndCoverTextContext.cpp index d3d711fa02..ff7c23ef23 100644 --- a/src/gpu/GrStencilAndCoverTextContext.cpp +++ b/src/gpu/GrStencilAndCoverTextContext.cpp @@ -94,18 +94,6 @@ private: SkDescriptor::Free(fDesc); } - virtual void onRelease() SK_OVERRIDE { - INHERITED::onRelease(); - fPathRange.reset(NULL); - } - - virtual void onAbandon() SK_OVERRIDE { - INHERITED::onAbandon(); - fPathRange->abandon(); - fPathRange.reset(NULL); - } - - static const int kMaxGroupCount = (kMaxGlyphCount + (kGlyphGroupSize - 1)) / kGlyphGroupSize; SkDescriptor* const fDesc; uint8_t fLoadedGlyphs[(kMaxGroupCount + 7) >> 3]; // One bit per glyph group |