Index: Source/wtf/text/StringImpl.h |
diff --git a/Source/wtf/text/StringImpl.h b/Source/wtf/text/StringImpl.h |
index fbb8921b08b69ebe1228c56aa5c5b10d95c5b300..935b053a5d71e1ec0500fe849d5e67ebba3d7e20 100644 |
--- a/Source/wtf/text/StringImpl.h |
+++ b/Source/wtf/text/StringImpl.h |
@@ -46,7 +46,6 @@ template<typename CharacterType> struct HashAndCharactersTranslator; |
struct HashAndUTF8CharactersTranslator; |
struct LCharBufferTranslator; |
struct CharBufferFromLiteralDataTranslator; |
-class MemoryObjectInfo; |
struct SubstringTranslator; |
struct UCharBufferTranslator; |
template<typename> class RetainPtr; |
@@ -410,9 +409,6 @@ public: |
unsigned length() const { return m_length; } |
bool is8Bit() const { return m_hashAndFlags & s_hashFlag8BitBuffer; } |
- bool hasInternalBuffer() const { return bufferOwnership() == BufferInternal; } |
- bool hasOwnedBuffer() const { return bufferOwnership() == BufferOwned; } |
- StringImpl* baseString() const { return bufferOwnership() == BufferSubstring ? m_substringBuffer : 0; } |
// FIXME: Remove all unnecessary usages of characters() |
ALWAYS_INLINE const LChar* characters8() const { ASSERT(is8Bit()); return m_data8; } |
@@ -682,7 +678,7 @@ private: |
bool isASCIILiteral() const |
{ |
- return is8Bit() && hasInternalBuffer() && reinterpret_cast<const void*>(m_data8) != reinterpret_cast<const void*>(this + 1); |
+ return is8Bit() && bufferOwnership() == BufferInternal && reinterpret_cast<const void*>(m_data8) != reinterpret_cast<const void*>(this + 1); |
} |
// This number must be at least 2 to avoid sharing empty, null as well as 1 character strings from SmallStrings. |