diff options
| author |  bsalomon <bsalomon@google.com> | 2014-09-08 10:45:58 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-09-08 10:45:58 -0700 |
| commit | 18444b1649562c45e5496507cfdc10a796525d67 (patch) | |
| tree | 3934bfc789da53d9ca97550e1c7b419cf8ed8e7e | |
| parent | 361b8b088589748e4b29895a4ebc5316e881e219 (diff) | |
Remove debug-only ref of GrEffectStage
BUG=skia:2889
R=robertphillips@google.com
Author: bsalomon@google.com
Review URL: https://codereview.chromium.org/553973002
| -rw-r--r-- | include/gpu/GrEffectStage.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/include/gpu/GrEffectStage.h b/include/gpu/GrEffectStage.h index a3ae9a8c51..ba4d95d337 100644 --- a/include/gpu/GrEffectStage.h +++ b/include/gpu/GrEffectStage.h @@ -82,10 +82,12 @@ public: } class SavedCoordChange { + public: + SkDEBUGCODE(SavedCoordChange() : fEffectUniqueID(SK_InvalidUniqueID) {}) private: bool fCoordChangeMatrixSet; SkMatrix fCoordChangeMatrix; - SkDEBUGCODE(mutable SkAutoTUnref<const GrEffect> fEffect;) + SkDEBUGCODE(mutable uint32_t fEffectUniqueID;) friend class GrEffectStage; }; @@ -101,9 +103,8 @@ public: if (fCoordChangeMatrixSet) { savedCoordChange->fCoordChangeMatrix = fCoordChangeMatrix; } - SkASSERT(NULL == savedCoordChange->fEffect.get()); - SkDEBUGCODE(SkRef(fEffect.get());) - SkDEBUGCODE(savedCoordChange->fEffect.reset(fEffect.get());) + SkASSERT(SK_InvalidUniqueID == savedCoordChange->fEffectUniqueID); + SkDEBUGCODE(savedCoordChange->fEffectUniqueID = fEffect->getUniqueID();) } /** @@ -114,8 +115,8 @@ public: if (fCoordChangeMatrixSet) { fCoordChangeMatrix = savedCoordChange.fCoordChangeMatrix; } - SkASSERT(savedCoordChange.fEffect.get() == fEffect); - SkDEBUGCODE(savedCoordChange.fEffect.reset(NULL);) + SkASSERT(savedCoordChange.fEffectUniqueID == fEffect->getUniqueID()); + SkDEBUGCODE(savedCoordChange.fEffectUniqueID = SK_InvalidUniqueID); } /** |