| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2004, 2006, 2008, 2010 Apple Inc. All rights reserved. | 2 * Copyright (C) 2004, 2006, 2008, 2010 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/TextCodecUTF16.h" | 26 #include "wtf/text/TextCodecUTF16.h" |
| 27 | 27 |
| 28 #include "wtf/PassOwnPtr.h" | 28 #include "wtf/PtrUtil.h" |
| 29 #include "wtf/text/CString.h" | 29 #include "wtf/text/CString.h" |
| 30 #include "wtf/text/CharacterNames.h" | 30 #include "wtf/text/CharacterNames.h" |
| 31 #include "wtf/text/StringBuffer.h" | 31 #include "wtf/text/StringBuffer.h" |
| 32 #include "wtf/text/WTFString.h" | 32 #include "wtf/text/WTFString.h" |
| 33 #include <memory> |
| 33 | 34 |
| 34 using namespace std; | 35 using namespace std; |
| 35 | 36 |
| 36 namespace WTF { | 37 namespace WTF { |
| 37 | 38 |
| 38 void TextCodecUTF16::registerEncodingNames(EncodingNameRegistrar registrar) | 39 void TextCodecUTF16::registerEncodingNames(EncodingNameRegistrar registrar) |
| 39 { | 40 { |
| 40 registrar("UTF-16LE", "UTF-16LE"); | 41 registrar("UTF-16LE", "UTF-16LE"); |
| 41 registrar("UTF-16BE", "UTF-16BE"); | 42 registrar("UTF-16BE", "UTF-16BE"); |
| 42 | 43 |
| 43 registrar("ISO-10646-UCS-2", "UTF-16LE"); | 44 registrar("ISO-10646-UCS-2", "UTF-16LE"); |
| 44 registrar("UCS-2", "UTF-16LE"); | 45 registrar("UCS-2", "UTF-16LE"); |
| 45 registrar("UTF-16", "UTF-16LE"); | 46 registrar("UTF-16", "UTF-16LE"); |
| 46 registrar("Unicode", "UTF-16LE"); | 47 registrar("Unicode", "UTF-16LE"); |
| 47 registrar("csUnicode", "UTF-16LE"); | 48 registrar("csUnicode", "UTF-16LE"); |
| 48 registrar("unicodeFEFF", "UTF-16LE"); | 49 registrar("unicodeFEFF", "UTF-16LE"); |
| 49 | 50 |
| 50 registrar("unicodeFFFE", "UTF-16BE"); | 51 registrar("unicodeFFFE", "UTF-16BE"); |
| 51 } | 52 } |
| 52 | 53 |
| 53 static PassOwnPtr<TextCodec> newStreamingTextDecoderUTF16LE(const TextEncoding&,
const void*) | 54 static std::unique_ptr<TextCodec> newStreamingTextDecoderUTF16LE(const TextEncod
ing&, const void*) |
| 54 { | 55 { |
| 55 return adoptPtr(new TextCodecUTF16(true)); | 56 return wrapUnique(new TextCodecUTF16(true)); |
| 56 } | 57 } |
| 57 | 58 |
| 58 static PassOwnPtr<TextCodec> newStreamingTextDecoderUTF16BE(const TextEncoding&,
const void*) | 59 static std::unique_ptr<TextCodec> newStreamingTextDecoderUTF16BE(const TextEncod
ing&, const void*) |
| 59 { | 60 { |
| 60 return adoptPtr(new TextCodecUTF16(false)); | 61 return wrapUnique(new TextCodecUTF16(false)); |
| 61 } | 62 } |
| 62 | 63 |
| 63 void TextCodecUTF16::registerCodecs(TextCodecRegistrar registrar) | 64 void TextCodecUTF16::registerCodecs(TextCodecRegistrar registrar) |
| 64 { | 65 { |
| 65 registrar("UTF-16LE", newStreamingTextDecoderUTF16LE, 0); | 66 registrar("UTF-16LE", newStreamingTextDecoderUTF16LE, 0); |
| 66 registrar("UTF-16BE", newStreamingTextDecoderUTF16BE, 0); | 67 registrar("UTF-16BE", newStreamingTextDecoderUTF16BE, 0); |
| 67 } | 68 } |
| 68 | 69 |
| 69 String TextCodecUTF16::decode(const char* bytes, size_t length, FlushBehavior fl
ush, bool, bool& sawError) | 70 String TextCodecUTF16::decode(const char* bytes, size_t length, FlushBehavior fl
ush, bool, bool& sawError) |
| 70 { | 71 { |
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 180 for (size_t i = 0; i < length; ++i) { | 181 for (size_t i = 0; i < length; ++i) { |
| 181 bytes[i * 2] = 0; | 182 bytes[i * 2] = 0; |
| 182 bytes[i * 2 + 1] = characters[i]; | 183 bytes[i * 2 + 1] = characters[i]; |
| 183 } | 184 } |
| 184 } | 185 } |
| 185 | 186 |
| 186 return result; | 187 return result; |
| 187 } | 188 } |
| 188 | 189 |
| 189 } // namespace WTF | 190 } // namespace WTF |
| OLD | NEW |