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

Side by Side Diff: third_party/WebKit/Source/wtf/text/TextCodecUTF8.cpp

Issue 2080623002: Revert "Remove OwnPtr from Blink." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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) 2004, 2006, 2008, 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2004, 2006, 2008, 2011 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 #include "wtf/text/TextCodecUTF8.h" 26 #include "wtf/text/TextCodecUTF8.h"
27 27
28 #include "wtf/PtrUtil.h"
29 #include "wtf/text/CString.h" 28 #include "wtf/text/CString.h"
30 #include "wtf/text/CharacterNames.h" 29 #include "wtf/text/CharacterNames.h"
31 #include "wtf/text/StringBuffer.h" 30 #include "wtf/text/StringBuffer.h"
32 #include "wtf/text/TextCodecASCIIFastPath.h" 31 #include "wtf/text/TextCodecASCIIFastPath.h"
33 #include <memory>
34 32
35 namespace WTF { 33 namespace WTF {
36 34
37 using namespace WTF::Unicode; 35 using namespace WTF::Unicode;
38 36
39 const int nonCharacter = -1; 37 const int nonCharacter = -1;
40 38
41 std::unique_ptr<TextCodec> TextCodecUTF8::create(const TextEncoding&, const void *) 39 PassOwnPtr<TextCodec> TextCodecUTF8::create(const TextEncoding&, const void*)
42 { 40 {
43 return wrapUnique(new TextCodecUTF8); 41 return adoptPtr(new TextCodecUTF8);
44 } 42 }
45 43
46 void TextCodecUTF8::registerEncodingNames(EncodingNameRegistrar registrar) 44 void TextCodecUTF8::registerEncodingNames(EncodingNameRegistrar registrar)
47 { 45 {
48 registrar("UTF-8", "UTF-8"); 46 registrar("UTF-8", "UTF-8");
49 47
50 // Additional aliases that originally were present in the encoding 48 // Additional aliases that originally were present in the encoding
51 // table in WebKit on Macintosh, and subsequently added by 49 // table in WebKit on Macintosh, and subsequently added by
52 // TextCodecICU. Perhaps we can prove some are not used on the web 50 // TextCodecICU. Perhaps we can prove some are not used on the web
53 // and remove them. 51 // and remove them.
(...skipping 399 matching lines...) Expand 10 before | Expand all | Expand 10 after
453 { 451 {
454 return encodeCommon(characters, length); 452 return encodeCommon(characters, length);
455 } 453 }
456 454
457 CString TextCodecUTF8::encode(const LChar* characters, size_t length, Unencodabl eHandling) 455 CString TextCodecUTF8::encode(const LChar* characters, size_t length, Unencodabl eHandling)
458 { 456 {
459 return encodeCommon(characters, length); 457 return encodeCommon(characters, length);
460 } 458 }
461 459
462 } // namespace WTF 460 } // namespace WTF
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/wtf/text/TextCodecUTF8.h ('k') | third_party/WebKit/Source/wtf/text/TextCodecUTF8Test.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698