SkString: remove fStr member

src/core/SkString.cpp

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkString.h"
@@ skipping 229 matching lines @@
     // make sure know one has written over our global
     SkASSERT(0 == gEmptyRec.fLength);
     SkASSERT(0 == gEmptyRec.fRefCnt);
     SkASSERT(0 == gEmptyRec.data()[0]);
 
     if (fRec != &gEmptyRec) {
         SkASSERT(fRec->fLength > 0);
         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() {
     this->validate();
 
     if (fRec->fLength) {
         SkASSERT(fRec->fRefCnt > 0);
         if (sk_atomic_dec(&fRec->fRefCnt) == 1) {
             sk_free(fRec);
         }
@@ skipping 37 matching lines @@
     this->validate();
 
     if (fRec->fLength) {
         SkASSERT(fRec->fRefCnt > 0);
         if (sk_atomic_dec(&fRec->fRefCnt) == 1) {
             sk_free(fRec);
         }
     }
 
     fRec = const_cast<Rec*>(&gEmptyRec);
-#ifdef SK_DEBUG
-    fStr = fRec->data();
-#endif
 }
 
 char* SkString::writable_str() {
     this->validate();
 
     if (fRec->fLength) {
         if (fRec->fRefCnt > 1) {
             Rec* rec = AllocRec(fRec->data(), fRec->fLength);
             if (sk_atomic_dec(&fRec->fRefCnt) == 1) {
                 // In this case after our check of fRecCnt > 1, we suddenly
                 // did become the only owner, so now we have two copies of the
                 // data (fRec and rec), so we need to delete one of them.
                 sk_free(fRec);
             }
             fRec = rec;
-        #ifdef SK_DEBUG
-            fStr = fRec->data();
-        #endif
         }
     }
     return fRec->data();
 }
 
 void SkString::set(const char text[]) {
     this->set(text, text ? strlen(text) : 0);
 }
 
 void SkString::set(const char text[], size_t len) {
@@ skipping 246 matching lines @@
             this->swap(tmp);
         }
     }
 }
 
 void SkString::swap(SkString& other) {
     this->validate();
     other.validate();
 
     SkTSwap<Rec*>(fRec, other.fRec);
-#ifdef SK_DEBUG
-    SkTSwap<const char*>(fStr, other.fStr);
-#endif
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 SkString SkStringPrintf(const char* format, ...) {
     SkString formattedOutput;
     char buffer[kBufferSize];
     SK_UNUSED int length;
     ARGS_TO_BUFFER(format, buffer, kBufferSize, length);
     formattedOutput.set(buffer);
     return formattedOutput;
 }
 
 void SkStrSplit(const char* str, const char* delimiters, SkTArray<SkString>* out) {
     const char* end = str + strlen(str);
     while (str != end) {
         // Find a token.
         const size_t len = strcspn(str, delimiters);
         out->push_back().set(str, len);
         str += len;
         // Skip any delimiters.
         str += strspn(str, delimiters);
     }
 }
 
 #undef VSNPRINTF
 #undef SNPRINTF