AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove debug-only ref of GrEffectStage

Browse Source 
BUG=skia:2889
R=robertphillips@google.com

Author: bsalomon@google.com

Review URL: https://codereview.chromium.org/553973002
This commit is contained in:
bsalomon 2014-09-08 10:45:58 -07:00 committed by Commit bot
parent 361b8b0885
commit 18444b1649
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/gpu/GrEffectStage.h
View File

@ -82,10 +82,12 @@ public:
} }
class SavedCoordChange { class SavedCoordChange {
public:
SkDEBUGCODE(SavedCoordChange() : fEffectUniqueID(SK_InvalidUniqueID) {})
private: private:
bool fCoordChangeMatrixSet; bool fCoordChangeMatrixSet;
SkMatrix fCoordChangeMatrix; SkMatrix fCoordChangeMatrix;
SkDEBUGCODE(mutable SkAutoTUnref<const GrEffect> fEffect;) SkDEBUGCODE(mutable uint32_t fEffectUniqueID;)
friend class GrEffectStage; friend class GrEffectStage;
}; };
@ -101,9 +103,8 @@ public:
if (fCoordChangeMatrixSet) { if (fCoordChangeMatrixSet) {
savedCoordChange->fCoordChangeMatrix = fCoordChangeMatrix; savedCoordChange->fCoordChangeMatrix = fCoordChangeMatrix;
} }
SkASSERT(NULL == savedCoordChange->fEffect.get()); SkASSERT(SK_InvalidUniqueID == savedCoordChange->fEffectUniqueID);
SkDEBUGCODE(SkRef(fEffect.get());) SkDEBUGCODE(savedCoordChange->fEffectUniqueID = fEffect->getUniqueID();)
SkDEBUGCODE(savedCoordChange->fEffect.reset(fEffect.get());)
} }
/** /**
@ -114,8 +115,8 @@ public:
if (fCoordChangeMatrixSet) { if (fCoordChangeMatrixSet) {
fCoordChangeMatrix = savedCoordChange.fCoordChangeMatrix; fCoordChangeMatrix = savedCoordChange.fCoordChangeMatrix;
} }
SkASSERT(savedCoordChange.fEffect.get() == fEffect); SkASSERT(savedCoordChange.fEffectUniqueID == fEffect->getUniqueID());
SkDEBUGCODE(savedCoordChange.fEffect.reset(NULL);) SkDEBUGCODE(savedCoordChange.fEffectUniqueID = SK_InvalidUniqueID);
} }
/** /**