diff options
| author |  halcanary <halcanary@google.com> | 2015-04-08 13:01:21 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-04-08 13:01:22 -0700 |
| commit | 16e833d5aac6570e134cf8e5356df635e01e092e (patch) | |
| tree | e16cf8961b814300b4c3f02551aff5cd869ffd06 /src/core/SkString.cpp | |
| parent | 502286d7b8ecf26a3a33e8098335034e21e4b082 (diff) | |
SkString: remove fStr member
Motivation: I'd like sizeof(SkString) to be the same in Debug and Release.
Review URL: https://codereview.chromium.org/1073473003
Diffstat (limited to 'src/core/SkString.cpp')
| -rw-r--r-- | src/core/SkString.cpp | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/src/core/SkString.cpp b/src/core/SkString.cpp index b43351599f..c10347dad1 100644 --- a/src/core/SkString.cpp +++ b/src/core/SkString.cpp @@ -247,48 +247,32 @@ void SkString::validate() const { SkASSERT(fRec->fRefCnt > 0); SkASSERT(0 == fRec->data()[fRec->fLength]); } - SkASSERT(fStr == c_str()); } #endif /////////////////////////////////////////////////////////////////////////////// SkString::SkString() : fRec(const_cast<Rec*>(&gEmptyRec)) { -#ifdef SK_DEBUG - fStr = fRec->data(); -#endif } SkString::SkString(size_t len) { fRec = AllocRec(NULL, len); -#ifdef SK_DEBUG - fStr = fRec->data(); -#endif } SkString::SkString(const char text[]) { size_t len = text ? strlen(text) : 0; fRec = AllocRec(text, len); -#ifdef SK_DEBUG - fStr = fRec->data(); -#endif } SkString::SkString(const char text[], size_t len) { fRec = AllocRec(text, len); -#ifdef SK_DEBUG - fStr = fRec->data(); -#endif } SkString::SkString(const SkString& src) { src.validate(); fRec = RefRec(src.fRec); -#ifdef SK_DEBUG - fStr = fRec->data(); -#endif } SkString::~SkString() { @@ -346,9 +330,6 @@ void SkString::reset() { } fRec = const_cast<Rec*>(&gEmptyRec); -#ifdef SK_DEBUG - fStr = fRec->data(); -#endif } char* SkString::writable_str() { @@ -364,9 +345,6 @@ char* SkString::writable_str() { sk_free(fRec); } fRec = rec; - #ifdef SK_DEBUG - fStr = fRec->data(); - #endif } } return fRec->data(); @@ -633,9 +611,6 @@ void SkString::swap(SkString& other) { other.validate(); SkTSwap<Rec*>(fRec, other.fRec); -#ifdef SK_DEBUG - SkTSwap<const char*>(fStr, other.fStr); -#endif } /////////////////////////////////////////////////////////////////////////////// |