| Index: third_party/WebKit/Source/wtf/text/CString.cpp
|
| diff --git a/third_party/WebKit/Source/wtf/text/CString.cpp b/third_party/WebKit/Source/wtf/text/CString.cpp
|
| index b3af14ce55f0cb51aa25b849372a2e52cf6b0d87..2e949a2d63a3c2b00fe983dd3e5f89a61f2fa735 100644
|
| --- a/third_party/WebKit/Source/wtf/text/CString.cpp
|
| +++ b/third_party/WebKit/Source/wtf/text/CString.cpp
|
| @@ -23,7 +23,6 @@
|
| * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| */
|
|
|
| -
|
| #include "wtf/text/CString.h"
|
|
|
| #include "wtf/PartitionAlloc.h"
|
| @@ -34,98 +33,90 @@ using namespace std;
|
|
|
| namespace WTF {
|
|
|
| -PassRefPtr<CStringBuffer> CStringBuffer::createUninitialized(size_t length)
|
| -{
|
| - RELEASE_ASSERT(length < (numeric_limits<unsigned>::max() - sizeof(CStringBuffer)));
|
| +PassRefPtr<CStringBuffer> CStringBuffer::createUninitialized(size_t length) {
|
| + RELEASE_ASSERT(length <
|
| + (numeric_limits<unsigned>::max() - sizeof(CStringBuffer)));
|
|
|
| - // The +1 is for the terminating NUL character.
|
| - size_t size = sizeof(CStringBuffer) + length + 1;
|
| - CStringBuffer* stringBuffer = static_cast<CStringBuffer*>(Partitions::bufferMalloc(size, WTF_HEAP_PROFILER_TYPE_NAME(CStringBuffer)));
|
| - return adoptRef(new (stringBuffer) CStringBuffer(length));
|
| + // The +1 is for the terminating NUL character.
|
| + size_t size = sizeof(CStringBuffer) + length + 1;
|
| + CStringBuffer* stringBuffer =
|
| + static_cast<CStringBuffer*>(Partitions::bufferMalloc(
|
| + size, WTF_HEAP_PROFILER_TYPE_NAME(CStringBuffer)));
|
| + return adoptRef(new (stringBuffer) CStringBuffer(length));
|
| }
|
|
|
| -void CStringBuffer::operator delete(void* ptr)
|
| -{
|
| - Partitions::bufferFree(ptr);
|
| +void CStringBuffer::operator delete(void* ptr) {
|
| + Partitions::bufferFree(ptr);
|
| }
|
|
|
| -CString::CString(const char* str)
|
| -{
|
| - if (!str)
|
| - return;
|
| +CString::CString(const char* str) {
|
| + if (!str)
|
| + return;
|
|
|
| - init(str, strlen(str));
|
| + init(str, strlen(str));
|
| }
|
|
|
| -CString::CString(const char* str, size_t length)
|
| -{
|
| - if (!str) {
|
| - ASSERT(!length);
|
| - return;
|
| - }
|
| +CString::CString(const char* str, size_t length) {
|
| + if (!str) {
|
| + ASSERT(!length);
|
| + return;
|
| + }
|
|
|
| - init(str, length);
|
| + init(str, length);
|
| }
|
|
|
| -void CString::init(const char* str, size_t length)
|
| -{
|
| - ASSERT(str);
|
| +void CString::init(const char* str, size_t length) {
|
| + ASSERT(str);
|
|
|
| - m_buffer = CStringBuffer::createUninitialized(length);
|
| - memcpy(m_buffer->mutableData(), str, length);
|
| - m_buffer->mutableData()[length] = '\0';
|
| + m_buffer = CStringBuffer::createUninitialized(length);
|
| + memcpy(m_buffer->mutableData(), str, length);
|
| + m_buffer->mutableData()[length] = '\0';
|
| }
|
|
|
| -char* CString::mutableData()
|
| -{
|
| - copyBufferIfNeeded();
|
| - if (!m_buffer)
|
| - return 0;
|
| - return m_buffer->mutableData();
|
| +char* CString::mutableData() {
|
| + copyBufferIfNeeded();
|
| + if (!m_buffer)
|
| + return 0;
|
| + return m_buffer->mutableData();
|
| }
|
|
|
| -CString CString::newUninitialized(size_t length, char*& characterBuffer)
|
| -{
|
| - CString result;
|
| - result.m_buffer = CStringBuffer::createUninitialized(length);
|
| - char* bytes = result.m_buffer->mutableData();
|
| - bytes[length] = '\0';
|
| - characterBuffer = bytes;
|
| - return result;
|
| +CString CString::newUninitialized(size_t length, char*& characterBuffer) {
|
| + CString result;
|
| + result.m_buffer = CStringBuffer::createUninitialized(length);
|
| + char* bytes = result.m_buffer->mutableData();
|
| + bytes[length] = '\0';
|
| + characterBuffer = bytes;
|
| + return result;
|
| }
|
|
|
| -void CString::copyBufferIfNeeded()
|
| -{
|
| - if (!m_buffer || m_buffer->hasOneRef())
|
| - return;
|
| +void CString::copyBufferIfNeeded() {
|
| + if (!m_buffer || m_buffer->hasOneRef())
|
| + return;
|
|
|
| - RefPtr<CStringBuffer> buffer = m_buffer.release();
|
| - size_t length = buffer->length();
|
| - m_buffer = CStringBuffer::createUninitialized(length);
|
| - memcpy(m_buffer->mutableData(), buffer->data(), length + 1);
|
| + RefPtr<CStringBuffer> buffer = m_buffer.release();
|
| + size_t length = buffer->length();
|
| + m_buffer = CStringBuffer::createUninitialized(length);
|
| + memcpy(m_buffer->mutableData(), buffer->data(), length + 1);
|
| }
|
|
|
| -bool CString::isSafeToSendToAnotherThread() const
|
| -{
|
| - return !m_buffer || m_buffer->hasOneRef();
|
| +bool CString::isSafeToSendToAnotherThread() const {
|
| + return !m_buffer || m_buffer->hasOneRef();
|
| }
|
|
|
| -bool operator==(const CString& a, const CString& b)
|
| -{
|
| - if (a.isNull() != b.isNull())
|
| - return false;
|
| - if (a.length() != b.length())
|
| - return false;
|
| - return !memcmp(a.data(), b.data(), a.length());
|
| +bool operator==(const CString& a, const CString& b) {
|
| + if (a.isNull() != b.isNull())
|
| + return false;
|
| + if (a.length() != b.length())
|
| + return false;
|
| + return !memcmp(a.data(), b.data(), a.length());
|
| }
|
|
|
| -bool operator==(const CString& a, const char* b)
|
| -{
|
| - if (a.isNull() != !b)
|
| - return false;
|
| - if (!b)
|
| - return true;
|
| - return !strcmp(a.data(), b);
|
| +bool operator==(const CString& a, const char* b) {
|
| + if (a.isNull() != !b)
|
| + return false;
|
| + if (!b)
|
| + return true;
|
| + return !strcmp(a.data(), b);
|
| }
|
|
|
| -} // namespace WTF
|
| +} // namespace WTF
|
|
|