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

Side by Side Diff: third_party/WebKit/Source/wtf/text/TextCodecUserDefined.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) 2007, 2008 Apple, Inc. All rights reserved. 2 * Copyright (C) 2007, 2008 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/TextCodecUserDefined.h" 26 #include "wtf/text/TextCodecUserDefined.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/StringBuffer.h" 30 #include "wtf/text/StringBuffer.h"
31 #include "wtf/text/StringBuilder.h" 31 #include "wtf/text/StringBuilder.h"
32 #include "wtf/text/WTFString.h" 32 #include "wtf/text/WTFString.h"
33 #include <memory>
33 34
34 namespace WTF { 35 namespace WTF {
35 36
36 void TextCodecUserDefined::registerEncodingNames(EncodingNameRegistrar registrar ) 37 void TextCodecUserDefined::registerEncodingNames(EncodingNameRegistrar registrar )
37 { 38 {
38 registrar("x-user-defined", "x-user-defined"); 39 registrar("x-user-defined", "x-user-defined");
39 } 40 }
40 41
41 static PassOwnPtr<TextCodec> newStreamingTextDecoderUserDefined(const TextEncodi ng&, const void*) 42 static std::unique_ptr<TextCodec> newStreamingTextDecoderUserDefined(const TextE ncoding&, const void*)
42 { 43 {
43 return adoptPtr(new TextCodecUserDefined); 44 return wrapUnique(new TextCodecUserDefined);
44 } 45 }
45 46
46 void TextCodecUserDefined::registerCodecs(TextCodecRegistrar registrar) 47 void TextCodecUserDefined::registerCodecs(TextCodecRegistrar registrar)
47 { 48 {
48 registrar("x-user-defined", newStreamingTextDecoderUserDefined, 0); 49 registrar("x-user-defined", newStreamingTextDecoderUserDefined, 0);
49 } 50 }
50 51
51 String TextCodecUserDefined::decode(const char* bytes, size_t length, FlushBehav ior, bool, bool&) 52 String TextCodecUserDefined::decode(const char* bytes, size_t length, FlushBehav ior, bool, bool&)
52 { 53 {
53 StringBuilder result; 54 StringBuilder result;
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 { 114 {
114 return encodeCommon(characters, length, handling); 115 return encodeCommon(characters, length, handling);
115 } 116 }
116 117
117 CString TextCodecUserDefined::encode(const LChar* characters, size_t length, Une ncodableHandling handling) 118 CString TextCodecUserDefined::encode(const LChar* characters, size_t length, Une ncodableHandling handling)
118 { 119 {
119 return encodeCommon(characters, length, handling); 120 return encodeCommon(characters, length, handling);
120 } 121 }
121 122
122 } // namespace WTF 123 } // namespace WTF
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/wtf/text/TextCodecUTF8Test.cpp ('k') | third_party/WebKit/Source/wtf/text/TextEncoding.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698