OLD | NEW |
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" |
28 #include "wtf/text/CString.h" | 29 #include "wtf/text/CString.h" |
29 #include "wtf/text/CharacterNames.h" | 30 #include "wtf/text/CharacterNames.h" |
30 #include "wtf/text/StringBuffer.h" | 31 #include "wtf/text/StringBuffer.h" |
31 #include "wtf/text/TextCodecASCIIFastPath.h" | 32 #include "wtf/text/TextCodecASCIIFastPath.h" |
| 33 #include <memory> |
32 | 34 |
33 namespace WTF { | 35 namespace WTF { |
34 | 36 |
35 using namespace WTF::Unicode; | 37 using namespace WTF::Unicode; |
36 | 38 |
37 const int nonCharacter = -1; | 39 const int nonCharacter = -1; |
38 | 40 |
39 PassOwnPtr<TextCodec> TextCodecUTF8::create(const TextEncoding&, const void*) | 41 std::unique_ptr<TextCodec> TextCodecUTF8::create(const TextEncoding&, const void
*) |
40 { | 42 { |
41 return adoptPtr(new TextCodecUTF8); | 43 return wrapUnique(new TextCodecUTF8); |
42 } | 44 } |
43 | 45 |
44 void TextCodecUTF8::registerEncodingNames(EncodingNameRegistrar registrar) | 46 void TextCodecUTF8::registerEncodingNames(EncodingNameRegistrar registrar) |
45 { | 47 { |
46 registrar("UTF-8", "UTF-8"); | 48 registrar("UTF-8", "UTF-8"); |
47 | 49 |
48 // Additional aliases that originally were present in the encoding | 50 // Additional aliases that originally were present in the encoding |
49 // table in WebKit on Macintosh, and subsequently added by | 51 // table in WebKit on Macintosh, and subsequently added by |
50 // TextCodecICU. Perhaps we can prove some are not used on the web | 52 // TextCodecICU. Perhaps we can prove some are not used on the web |
51 // and remove them. | 53 // and remove them. |
(...skipping 399 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
451 { | 453 { |
452 return encodeCommon(characters, length); | 454 return encodeCommon(characters, length); |
453 } | 455 } |
454 | 456 |
455 CString TextCodecUTF8::encode(const LChar* characters, size_t length, Unencodabl
eHandling) | 457 CString TextCodecUTF8::encode(const LChar* characters, size_t length, Unencodabl
eHandling) |
456 { | 458 { |
457 return encodeCommon(characters, length); | 459 return encodeCommon(characters, length); |
458 } | 460 } |
459 | 461 |
460 } // namespace WTF | 462 } // namespace WTF |
OLD | NEW |