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

Side by Side Diff: third_party/WebKit/Source/wtf/text/TextEncoding.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, 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2004, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
3 * Copyright (C) 2006 Alexey Proskuryakov <ap@nypop.com> 3 * Copyright (C) 2006 Alexey Proskuryakov <ap@nypop.com>
4 * Copyright (C) 2007-2009 Torch Mobile, Inc. 4 * Copyright (C) 2007-2009 Torch Mobile, Inc.
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions 7 * modification, are permitted provided that the following conditions
8 * are met: 8 * are met:
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
11 * 2. Redistributions in binary form must reproduce the above copyright 11 * 2. Redistributions in binary form must reproduce the above copyright
12 * notice, this list of conditions and the following disclaimer in the 12 * notice, this list of conditions and the following disclaimer in the
13 * documentation and/or other materials provided with the distribution. 13 * documentation and/or other materials provided with the distribution.
14 * 14 *
15 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY 15 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
16 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 16 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
17 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 17 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
18 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR 18 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
19 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 19 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
20 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 20 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
22 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 22 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
23 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 23 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
25 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28 #include "wtf/text/TextEncoding.h" 28 #include "wtf/text/TextEncoding.h"
29 29
30 #include "wtf/OwnPtr.h"
31 #include "wtf/StdLibExtras.h" 30 #include "wtf/StdLibExtras.h"
32 #include "wtf/Threading.h" 31 #include "wtf/Threading.h"
33 #include "wtf/text/CString.h" 32 #include "wtf/text/CString.h"
34 #include "wtf/text/TextEncodingRegistry.h" 33 #include "wtf/text/TextEncodingRegistry.h"
35 #include "wtf/text/WTFString.h" 34 #include "wtf/text/WTFString.h"
35 #include <memory>
36 36
37 namespace WTF { 37 namespace WTF {
38 38
39 static const TextEncoding& UTF7Encoding() 39 static const TextEncoding& UTF7Encoding()
40 { 40 {
41 DEFINE_THREAD_SAFE_STATIC_LOCAL(const TextEncoding, globalUTF7Encoding, new TextEncoding("UTF-7")); 41 DEFINE_THREAD_SAFE_STATIC_LOCAL(const TextEncoding, globalUTF7Encoding, new TextEncoding("UTF-7"));
42 return globalUTF7Encoding; 42 return globalUTF7Encoding;
43 } 43 }
44 44
45 TextEncoding::TextEncoding(const char* name) 45 TextEncoding::TextEncoding(const char* name)
(...skipping 21 matching lines...) Expand all
67 } 67 }
68 68
69 CString TextEncoding::encode(const String& string, UnencodableHandling handling) const 69 CString TextEncoding::encode(const String& string, UnencodableHandling handling) const
70 { 70 {
71 if (!m_name) 71 if (!m_name)
72 return CString(); 72 return CString();
73 73
74 if (string.isEmpty()) 74 if (string.isEmpty())
75 return ""; 75 return "";
76 76
77 OwnPtr<TextCodec> textCodec = newTextCodec(*this); 77 std::unique_ptr<TextCodec> textCodec = newTextCodec(*this);
78 CString encodedString; 78 CString encodedString;
79 if (string.is8Bit()) 79 if (string.is8Bit())
80 encodedString = textCodec->encode(string.characters8(), string.length(), handling); 80 encodedString = textCodec->encode(string.characters8(), string.length(), handling);
81 else 81 else
82 encodedString = textCodec->encode(string.characters16(), string.length() , handling); 82 encodedString = textCodec->encode(string.characters16(), string.length() , handling);
83 return encodedString; 83 return encodedString;
84 } 84 }
85 85
86 bool TextEncoding::usesVisualOrdering() const 86 bool TextEncoding::usesVisualOrdering() const
87 { 87 {
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 return globalUTF8Encoding; 175 return globalUTF8Encoding;
176 } 176 }
177 177
178 const TextEncoding& WindowsLatin1Encoding() 178 const TextEncoding& WindowsLatin1Encoding()
179 { 179 {
180 DEFINE_THREAD_SAFE_STATIC_LOCAL(const TextEncoding, globalWindowsLatin1Encod ing, new TextEncoding("WinLatin1")); 180 DEFINE_THREAD_SAFE_STATIC_LOCAL(const TextEncoding, globalWindowsLatin1Encod ing, new TextEncoding("WinLatin1"));
181 return globalWindowsLatin1Encoding; 181 return globalWindowsLatin1Encoding;
182 } 182 }
183 183
184 } // namespace WTF 184 } // namespace WTF
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/wtf/text/TextCodecUserDefined.cpp ('k') | third_party/WebKit/Source/wtf/text/TextEncodingRegistry.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698