| Index: third_party/WebKit/Source/wtf/text/TextEncoding.h
|
| diff --git a/third_party/WebKit/Source/wtf/text/TextEncoding.h b/third_party/WebKit/Source/wtf/text/TextEncoding.h
|
| index f7285959d6f448ef41f092f9b5ba05e3f75aedfb..119a51f3dfc49915a9fe62b0a3484a7fb7d9e887 100644
|
| --- a/third_party/WebKit/Source/wtf/text/TextEncoding.h
|
| +++ b/third_party/WebKit/Source/wtf/text/TextEncoding.h
|
| @@ -1,99 +1,9 @@
|
| -/*
|
| - * Copyright (C) 2004, 2006, 2007, 2008, 2009 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 TextEncoding_h
|
| -#define TextEncoding_h
|
| +#include "platform/wtf/text/TextEncoding.h"
|
|
|
| -#include "wtf/Allocator.h"
|
| -#include "wtf/Forward.h"
|
| -#include "wtf/WTFExport.h"
|
| -#include "wtf/text/TextCodec.h"
|
| -#include "wtf/text/Unicode.h"
|
| -
|
| -namespace WTF {
|
| -
|
| -class WTF_EXPORT TextEncoding final {
|
| - USING_FAST_MALLOC(TextEncoding);
|
| -
|
| - public:
|
| - TextEncoding() : m_name(0) {}
|
| - TextEncoding(const char* name);
|
| - TextEncoding(const String& name);
|
| -
|
| - bool isValid() const { return m_name; }
|
| - const char* name() const { return m_name; }
|
| - bool usesVisualOrdering() const;
|
| - const TextEncoding& closestByteBasedEquivalent() const;
|
| - const TextEncoding& encodingForFormSubmission() const;
|
| -
|
| - String decode(const char* str, size_t length) const {
|
| - bool ignored;
|
| - return decode(str, length, false, ignored);
|
| - }
|
| - String decode(const char*,
|
| - size_t length,
|
| - bool stopOnError,
|
| - bool& sawError) const;
|
| -
|
| - CString encode(const String&, UnencodableHandling) const;
|
| -
|
| - bool isNonByteBasedEncoding() const;
|
| -
|
| - private:
|
| - bool isUTF7Encoding() const;
|
| -
|
| - const char* m_name;
|
| -};
|
| -
|
| -inline bool operator==(const TextEncoding& a, const TextEncoding& b) {
|
| - return a.name() == b.name();
|
| -}
|
| -inline bool operator!=(const TextEncoding& a, const TextEncoding& b) {
|
| - return a.name() != b.name();
|
| -}
|
| -
|
| -WTF_EXPORT const TextEncoding& ASCIIEncoding();
|
| -WTF_EXPORT const TextEncoding& Latin1Encoding();
|
| -WTF_EXPORT const TextEncoding& UTF16BigEndianEncoding();
|
| -WTF_EXPORT const TextEncoding& UTF16LittleEndianEncoding();
|
| -WTF_EXPORT const TextEncoding& UTF32Encoding();
|
| -WTF_EXPORT const TextEncoding& UTF32BigEndianEncoding();
|
| -WTF_EXPORT const TextEncoding& UTF32LittleEndianEncoding();
|
| -WTF_EXPORT const TextEncoding& UTF8Encoding();
|
| -WTF_EXPORT const TextEncoding& WindowsLatin1Encoding();
|
| -
|
| -} // namespace WTF
|
| -
|
| -using WTF::ASCIIEncoding;
|
| -using WTF::Latin1Encoding;
|
| -using WTF::UTF16BigEndianEncoding;
|
| -using WTF::UTF16LittleEndianEncoding;
|
| -using WTF::UTF32Encoding;
|
| -using WTF::UTF32BigEndianEncoding;
|
| -using WTF::UTF32LittleEndianEncoding;
|
| -using WTF::UTF8Encoding;
|
| -using WTF::WindowsLatin1Encoding;
|
| -
|
| -#endif // TextEncoding_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
|
|
|