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

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

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) 2004, 2006, 2007, 2008, 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2004, 2006, 2007, 2008, 2011 Apple Inc. All rights reserved.
3 * Copyright (C) 2006 Alexey Proskuryakov <ap@nypop.com> 3 * Copyright (C) 2006 Alexey Proskuryakov <ap@nypop.com>
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
11 * notice, this list of conditions and the following disclaimer in the 11 * notice, this list of conditions and the following disclaimer in the
12 * documentation and/or other materials provided with the distribution. 12 * documentation and/or other materials provided with the distribution.
13 * 13 *
14 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY 14 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
16 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 16 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
17 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR 17 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
18 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 18 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
19 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 19 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
20 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 20 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
21 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 21 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 */ 25 */
26 26
27 #include "wtf/text/TextCodecICU.h" 27 #include "wtf/text/TextCodecICU.h"
28 28
29 #include "wtf/Assertions.h" 29 #include "wtf/Assertions.h"
30 #include "wtf/PtrUtil.h"
30 #include "wtf/StringExtras.h" 31 #include "wtf/StringExtras.h"
31 #include "wtf/Threading.h" 32 #include "wtf/Threading.h"
32 #include "wtf/WTFThreadData.h" 33 #include "wtf/WTFThreadData.h"
33 #include "wtf/text/CString.h" 34 #include "wtf/text/CString.h"
34 #include "wtf/text/CharacterNames.h" 35 #include "wtf/text/CharacterNames.h"
35 #include "wtf/text/StringBuilder.h" 36 #include "wtf/text/StringBuilder.h"
37 #include <memory>
36 #include <unicode/ucnv.h> 38 #include <unicode/ucnv.h>
37 #include <unicode/ucnv_cb.h> 39 #include <unicode/ucnv_cb.h>
38 40
39 namespace WTF { 41 namespace WTF {
40 42
41 const size_t ConversionBufferSize = 16384; 43 const size_t ConversionBufferSize = 16384;
42 44
43 ICUConverterWrapper::~ICUConverterWrapper() 45 ICUConverterWrapper::~ICUConverterWrapper()
44 { 46 {
45 if (converter) 47 if (converter)
46 ucnv_close(converter); 48 ucnv_close(converter);
47 } 49 }
48 50
49 static UConverter*& cachedConverterICU() 51 static UConverter*& cachedConverterICU()
50 { 52 {
51 return wtfThreadData().cachedConverterICU().converter; 53 return wtfThreadData().cachedConverterICU().converter;
52 } 54 }
53 55
54 PassOwnPtr<TextCodec> TextCodecICU::create(const TextEncoding& encoding, const v oid*) 56 std::unique_ptr<TextCodec> TextCodecICU::create(const TextEncoding& encoding, co nst void*)
55 { 57 {
56 return adoptPtr(new TextCodecICU(encoding)); 58 return wrapUnique(new TextCodecICU(encoding));
57 } 59 }
58 60
59 void TextCodecICU::registerEncodingNames(EncodingNameRegistrar registrar) 61 void TextCodecICU::registerEncodingNames(EncodingNameRegistrar registrar)
60 { 62 {
61 // We register Hebrew with logical ordering using a separate name. 63 // We register Hebrew with logical ordering using a separate name.
62 // Otherwise, this would share the same canonical name as the 64 // Otherwise, this would share the same canonical name as the
63 // visual ordering case, and then TextEncoding could not tell them 65 // visual ordering case, and then TextEncoding could not tell them
64 // apart; ICU treats these names as synonyms. 66 // apart; ICU treats these names as synonyms.
65 registrar("ISO-8859-8-I", "ISO-8859-8-I"); 67 registrar("ISO-8859-8-I", "ISO-8859-8-I");
66 68
(...skipping 541 matching lines...) Expand 10 before | Expand all | Expand 10 after
608 { 610 {
609 return encodeCommon(characters, length, handling); 611 return encodeCommon(characters, length, handling);
610 } 612 }
611 613
612 CString TextCodecICU::encode(const LChar* characters, size_t length, Unencodable Handling handling) 614 CString TextCodecICU::encode(const LChar* characters, size_t length, Unencodable Handling handling)
613 { 615 {
614 return encodeCommon(characters, length, handling); 616 return encodeCommon(characters, length, handling);
615 } 617 }
616 618
617 } // namespace WTF 619 } // namespace WTF
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/wtf/text/TextCodecICU.h ('k') | third_party/WebKit/Source/wtf/text/TextCodecLatin1.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698