| Index: third_party/WebKit/Source/wtf/text/CString.h
|
| diff --git a/third_party/WebKit/Source/wtf/text/CString.h b/third_party/WebKit/Source/wtf/text/CString.h
|
| index aeebe0f66e3065e018071bb021782e9780f3f021..39f5aa1c3546641d03273ecb8a97224b74320cb4 100644
|
| --- a/third_party/WebKit/Source/wtf/text/CString.h
|
| +++ b/third_party/WebKit/Source/wtf/text/CString.h
|
| @@ -1,118 +1,9 @@
|
| -/*
|
| - * Copyright (C) 2003, 2006, 2008, 2009, 2010, 2012 Apple Inc. All rights
|
| - * reserved.
|
| - *
|
| - * Redistribution and use in source and binary forms, with or without
|
| - * modification, are permitted provided that the following conditions
|
| - * are met:
|
| - * 1. Redistributions of source code must retain the above copyright
|
| - * notice, this list of conditions and the following disclaimer.
|
| - * 2. Redistributions in binary form must reproduce the above copyright
|
| - * notice, this list of conditions and the following disclaimer in the
|
| - * documentation and/or other materials provided with the distribution.
|
| - *
|
| - * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
|
| - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
| - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
| - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
|
| - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
|
| - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
| - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
|
| - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
|
| - * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
| - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
| - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| - */
|
| +// Copyright 2017 The Chromium Authors. All rights reserved.
|
| +// Use of this source code is governed by a BSD-style license that can be
|
| +// found in the LICENSE file.
|
|
|
| -#ifndef CString_h
|
| -#define CString_h
|
| +#include "platform/wtf/text/CString.h"
|
|
|
| -#include "wtf/Allocator.h"
|
| -#include "wtf/RefCounted.h"
|
| -#include "wtf/RefPtr.h"
|
| -#include "wtf/WTFExport.h"
|
| -#include "wtf/allocator/PartitionAllocator.h"
|
| -#include <string.h>
|
| -
|
| -namespace WTF {
|
| -
|
| -// CStringImpl is an immutable ref-counted storage for the characters in a
|
| -// CString. It's analogous to a StringImpl but may contain any arbitrary
|
| -// sequence of bytes. The data is always allocated 1 longer than length() and is
|
| -// null terminated.
|
| -class WTF_EXPORT CStringImpl : public RefCounted<CStringImpl> {
|
| - WTF_MAKE_NONCOPYABLE(CStringImpl);
|
| -
|
| - public:
|
| - // CStringImpls are allocated out of the WTF buffer partition.
|
| - void* operator new(size_t, void* ptr) { return ptr; }
|
| - void operator delete(void*);
|
| -
|
| - static PassRefPtr<CStringImpl> createUninitialized(size_t length,
|
| - char*& data);
|
| -
|
| - const char* data() const { return reinterpret_cast<const char*>(this + 1); }
|
| - size_t length() const { return m_length; }
|
| -
|
| - private:
|
| - explicit CStringImpl(size_t length) : m_length(length) {}
|
| -
|
| - const unsigned m_length;
|
| -};
|
| -
|
| -// A container for an immutable ref-counted null-terminated char array. This is
|
| -// analogous to a WTF::String but does not require the contained bytes to be
|
| -// valid Latin1 or UTF-16. Instead a CString can contain any arbitrary bytes.
|
| -class WTF_EXPORT CString {
|
| - USING_FAST_MALLOC(CString);
|
| -
|
| - public:
|
| - // Construct a null string, distinguishable from an empty string.
|
| - CString() {}
|
| -
|
| - // Construct a string from arbitrary bytes.
|
| - CString(const char* chars) : CString(chars, chars ? strlen(chars) : 0) {}
|
| - CString(const char*, size_t length);
|
| -
|
| - // Construct a string referencing an existing buffer.
|
| - CString(CStringImpl* buffer) : m_buffer(buffer) {}
|
| - CString(PassRefPtr<CStringImpl> buffer) : m_buffer(std::move(buffer)) {}
|
| -
|
| - static CString createUninitialized(size_t length, char*& data) {
|
| - return CStringImpl::createUninitialized(length, data);
|
| - }
|
| -
|
| - // The bytes of the string, always NUL terminated. May be null.
|
| - const char* data() const { return m_buffer ? m_buffer->data() : 0; }
|
| -
|
| - // The length of the data(), *not* including the NUL terminator.
|
| - size_t length() const { return m_buffer ? m_buffer->length() : 0; }
|
| -
|
| - bool isNull() const { return !m_buffer; }
|
| -
|
| - bool isSafeToSendToAnotherThread() const;
|
| -
|
| - CStringImpl* impl() const { return m_buffer.get(); }
|
| -
|
| - private:
|
| - RefPtr<CStringImpl> m_buffer;
|
| -};
|
| -
|
| -WTF_EXPORT bool operator==(const CString& a, const CString& b);
|
| -inline bool operator!=(const CString& a, const CString& b) {
|
| - return !(a == b);
|
| -}
|
| -WTF_EXPORT bool operator==(const CString& a, const char* b);
|
| -inline bool operator!=(const CString& a, const char* b) {
|
| - return !(a == b);
|
| -}
|
| -
|
| -// Pretty printer for gtest and base/logging.*. It prepends and appends
|
| -// double-quotes, and escapes characters other than ASCII printables.
|
| -WTF_EXPORT std::ostream& operator<<(std::ostream&, const CString&);
|
| -
|
| -} // namespace WTF
|
| -
|
| -using WTF::CString;
|
| -
|
| -#endif // CString_h
|
| +// The contents of this header was moved to platform/wtf as part of
|
| +// WTF migration project. See the following post for details:
|
| +// https://groups.google.com/a/chromium.org/d/msg/blink-dev/tLdAZCTlcAA/bYXVT8gYCAAJ
|
|
|