diff options
Diffstat (limited to 'include/gpu/GrResourceKey.h')
| -rw-r--r-- | include/gpu/GrResourceKey.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/include/gpu/GrResourceKey.h b/include/gpu/GrResourceKey.h index c0a08f8add..ef319ad1fa 100644 --- a/include/gpu/GrResourceKey.h +++ b/include/gpu/GrResourceKey.h @@ -241,7 +241,7 @@ public: GrUniqueKey& operator=(const GrUniqueKey& that) { this->INHERITED::operator=(that); this->setCustomData(sk_ref_sp(that.getCustomData())); - SkDEBUGCODE(fTag = that.fTag;) + fTag = that.fTag; return *this; } @@ -257,14 +257,13 @@ public: return fData.get(); } - SkDEBUGCODE(const char* tag() const { return fTag.c_str(); }) + const char* tag() const { return fTag; } class Builder : public INHERITED::Builder { public: Builder(GrUniqueKey* key, Domain type, int data32Count, const char* tag = nullptr) : INHERITED::Builder(key, type, data32Count) { - SkDEBUGCODE(key->fTag = tag;) - (void) tag; // suppress unused named param warning. + key->fTag = tag; } /** Used to build a key that wraps another key and adds additional data. */ @@ -277,8 +276,7 @@ public: const uint32_t* srcData = innerKey.data(); (*innerKeyData++) = innerKey.domain(); memcpy(innerKeyData, srcData, innerKey.dataSize()); - SkDEBUGCODE(key->fTag = tag;) - (void) tag; // suppress unused named param warning. + key->fTag = tag; } private: @@ -290,7 +288,7 @@ public: private: sk_sp<SkData> fData; - SkDEBUGCODE(SkString fTag;) + const char* fTag; }; /** |