| Index: public/platform/WebString.h
|
| diff --git a/public/platform/WebString.h b/public/platform/WebString.h
|
| index 1d3b4024185ed0b14e02b0b4aa86dd1b165fba68..005570bc41dc65a38d106649ec52f70a5865dfcd 100644
|
| --- a/public/platform/WebString.h
|
| +++ b/public/platform/WebString.h
|
| @@ -1,184 +1 @@
|
| -/*
|
| - * Copyright (C) 2009 Google 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:
|
| - *
|
| - * * Redistributions of source code must retain the above copyright
|
| - * notice, this list of conditions and the following disclaimer.
|
| - * * 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.
|
| - * * Neither the name of Google Inc. nor the names of its
|
| - * contributors may be used to endorse or promote products derived from
|
| - * this software without specific prior written permission.
|
| - *
|
| - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
| - * "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 THE COPYRIGHT
|
| - * OWNER 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.
|
| - */
|
| -
|
| -#ifndef WebString_h
|
| -#define WebString_h
|
| -
|
| -#include "WebCommon.h"
|
| -#include "WebPrivatePtr.h"
|
| -
|
| -#if WEBKIT_IMPLEMENTATION
|
| -#include <wtf/Forward.h>
|
| -#else
|
| -#include <base/nullable_string16.h>
|
| -#include <base/string16.h>
|
| -#include <base/strings/latin1_string_conversions.h>
|
| -#endif
|
| -
|
| -namespace WTF {
|
| -class StringImpl;
|
| -}
|
| -
|
| -namespace WebKit {
|
| -
|
| -class WebCString;
|
| -
|
| -// A UTF-16 string container. It is inexpensive to copy a WebString
|
| -// object.
|
| -//
|
| -// WARNING: It is not safe to pass a WebString across threads!!!
|
| -//
|
| -class WebString {
|
| -public:
|
| - ~WebString() { reset(); }
|
| -
|
| - WebString() { }
|
| -
|
| - WebString(const WebUChar* data, size_t len)
|
| - {
|
| - assign(data, len);
|
| - }
|
| -
|
| - WebString(const WebString& s) { assign(s); }
|
| -
|
| - WebString& operator=(const WebString& s)
|
| - {
|
| - assign(s);
|
| - return *this;
|
| - }
|
| -
|
| - WEBKIT_EXPORT void reset();
|
| - WEBKIT_EXPORT void assign(const WebString&);
|
| - WEBKIT_EXPORT void assign(const WebUChar* data, size_t len);
|
| -
|
| - WEBKIT_EXPORT bool equals(const WebString& s) const;
|
| -
|
| - WEBKIT_EXPORT size_t length() const;
|
| -
|
| - // Caller must check bounds.
|
| - WEBKIT_EXPORT WebUChar at(unsigned) const;
|
| -
|
| - bool isEmpty() const { return !length(); }
|
| - bool isNull() const { return m_private.isNull(); }
|
| -
|
| - WEBKIT_EXPORT WebCString utf8() const;
|
| -
|
| - WEBKIT_EXPORT static WebString fromUTF8(const char* data, size_t length);
|
| - WEBKIT_EXPORT static WebString fromUTF8(const char* data);
|
| -
|
| - template <int N> WebString(const char (&data)[N])
|
| - {
|
| - assign(fromUTF8(data, N - 1));
|
| - }
|
| -
|
| - template <int N> WebString& operator=(const char (&data)[N])
|
| - {
|
| - assign(fromUTF8(data, N - 1));
|
| - return *this;
|
| - }
|
| -
|
| -#if WEBKIT_IMPLEMENTATION
|
| - WebString(const WTF::String&);
|
| - WebString& operator=(const WTF::String&);
|
| - operator WTF::String() const;
|
| -
|
| - WebString(const WTF::AtomicString&);
|
| - WebString& operator=(const WTF::AtomicString&);
|
| - operator WTF::AtomicString() const;
|
| -#else
|
| -
|
| - WebString(const string16& s)
|
| - {
|
| - assign(s.data(), s.length());
|
| - }
|
| -
|
| - WebString& operator=(const string16& s)
|
| - {
|
| - assign(s.data(), s.length());
|
| - return *this;
|
| - }
|
| -
|
| - operator string16() const
|
| - {
|
| - return base::Latin1OrUTF16ToUTF16(length(), data8(), data16());
|
| - }
|
| -
|
| - WebString(const NullableString16& s)
|
| - {
|
| - if (s.is_null())
|
| - reset();
|
| - else
|
| - assign(s.string().data(), s.string().length());
|
| - }
|
| -
|
| - WebString& operator=(const NullableString16& s)
|
| - {
|
| - if (s.is_null())
|
| - reset();
|
| - else
|
| - assign(s.string().data(), s.string().length());
|
| - return *this;
|
| - }
|
| -
|
| - operator NullableString16() const
|
| - {
|
| - return NullableString16(operator string16(), m_private.isNull());
|
| - }
|
| -
|
| - template <class UTF8String>
|
| - static WebString fromUTF8(const UTF8String& s)
|
| - {
|
| - return fromUTF8(s.data(), s.length());
|
| - }
|
| -#endif
|
| -
|
| -private:
|
| - WEBKIT_EXPORT bool is8Bit() const;
|
| - WEBKIT_EXPORT const WebLChar* data8() const;
|
| - WEBKIT_EXPORT const WebUChar* data16() const;
|
| -
|
| - void assign(WTF::StringImpl*);
|
| -
|
| - WebPrivatePtr<WTF::StringImpl> m_private;
|
| -};
|
| -
|
| -inline bool operator==(const WebString& a, const WebString& b)
|
| -{
|
| - return a.equals(b);
|
| -}
|
| -
|
| -inline bool operator!=(const WebString& a, const WebString& b)
|
| -{
|
| - return !(a == b);
|
| -}
|
| -
|
| -} // namespace WebKit
|
| -
|
| -#endif
|
| +#include "../common/WebString.h"
|
|
|