Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(135)

Side by Side Diff: third_party/WebKit/Source/wtf/text/TextEncodingRegistry.h

Issue 2050123002: Remove OwnPtr from Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: First attempt to land. Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY 13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #ifndef TextEncodingRegistry_h 26 #ifndef TextEncodingRegistry_h
27 #define TextEncodingRegistry_h 27 #define TextEncodingRegistry_h
28 28
29 #include "wtf/PassOwnPtr.h"
30 #include "wtf/WTFExport.h" 29 #include "wtf/WTFExport.h"
31 #include "wtf/text/Unicode.h" 30 #include "wtf/text/Unicode.h"
32 #include "wtf/text/WTFString.h" 31 #include "wtf/text/WTFString.h"
32 #include <memory>
33 33
34 namespace WTF { 34 namespace WTF {
35 35
36 class TextCodec; 36 class TextCodec;
37 class TextEncoding; 37 class TextEncoding;
38 38
39 // Use TextResourceDecoder::decode to decode resources, since it handles BOMs. 39 // Use TextResourceDecoder::decode to decode resources, since it handles BOMs.
40 // Use TextEncoding::encode to encode, since it takes care of normalization. 40 // Use TextEncoding::encode to encode, since it takes care of normalization.
41 WTF_EXPORT PassOwnPtr<TextCodec> newTextCodec(const TextEncoding&); 41 WTF_EXPORT std::unique_ptr<TextCodec> newTextCodec(const TextEncoding&);
42 42
43 // Only TextEncoding should use the following functions directly. 43 // Only TextEncoding should use the following functions directly.
44 const char* atomicCanonicalTextEncodingName(const char* alias); 44 const char* atomicCanonicalTextEncodingName(const char* alias);
45 template <typename CharacterType> 45 template <typename CharacterType>
46 const char* atomicCanonicalTextEncodingName(const CharacterType*, size_t); 46 const char* atomicCanonicalTextEncodingName(const CharacterType*, size_t);
47 const char* atomicCanonicalTextEncodingName(const String&); 47 const char* atomicCanonicalTextEncodingName(const String&);
48 bool noExtendedTextEncodingNameUsed(); 48 bool noExtendedTextEncodingNameUsed();
49 bool isReplacementEncoding(const char* alias); 49 bool isReplacementEncoding(const char* alias);
50 bool isReplacementEncoding(const String& alias); 50 bool isReplacementEncoding(const String& alias);
51 51
52 #ifndef NDEBUG 52 #ifndef NDEBUG
53 void dumpTextEncodingNameMap(); 53 void dumpTextEncodingNameMap();
54 #endif 54 #endif
55 55
56 } // namespace WTF 56 } // namespace WTF
57 57
58 using WTF::newTextCodec; 58 using WTF::newTextCodec;
59 using WTF::atomicCanonicalTextEncodingName; 59 using WTF::atomicCanonicalTextEncodingName;
60 using WTF::noExtendedTextEncodingNameUsed; 60 using WTF::noExtendedTextEncodingNameUsed;
61 #ifndef NDEBUG 61 #ifndef NDEBUG
62 using WTF::dumpTextEncodingNameMap; 62 using WTF::dumpTextEncodingNameMap;
63 #endif 63 #endif
64 64
65 #endif // TextEncodingRegistry_h 65 #endif // TextEncodingRegistry_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/wtf/text/TextEncoding.cpp ('k') | third_party/WebKit/Source/wtf/text/TextEncodingRegistry.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698