diff options
| author | Feng Qian <fqian@google.com> | 2009-06-18 18:20:56 -0700 |
|---|---|---|
| committer | Feng Qian <fqian@google.com> | 2009-06-18 18:20:56 -0700 |
| commit | 1edef79f87f9c52c21d69c87c19f8e2b140a9119 (patch) | |
| tree | cad337ef493b0d9710bf3ae478cb87cb534f598d /WebCore/platform/text/TextCodecUTF16.cpp | |
| parent | b83fc086000e27bc227580bd0e35b9d7bee1179a (diff) | |
| parent | c9c4d65c1547996ed3748026904d6e7f09aec2b4 (diff) | |
| download | external_webkit-1edef79f87f9c52c21d69c87c19f8e2b140a9119.zip external_webkit-1edef79f87f9c52c21d69c87c19f8e2b140a9119.tar.gz external_webkit-1edef79f87f9c52c21d69c87c19f8e2b140a9119.tar.bz2 | |
Merge commit 'goog/master-webkit-merge' into webkit-merge-44544
Diffstat (limited to 'WebCore/platform/text/TextCodecUTF16.cpp')
| -rw-r--r-- | WebCore/platform/text/TextCodecUTF16.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/WebCore/platform/text/TextCodecUTF16.cpp b/WebCore/platform/text/TextCodecUTF16.cpp index a4d0d28..db77000 100644 --- a/WebCore/platform/text/TextCodecUTF16.cpp +++ b/WebCore/platform/text/TextCodecUTF16.cpp @@ -29,8 +29,7 @@ #include "CString.h" #include "PlatformString.h" #include "StringBuffer.h" - -using std::auto_ptr; +#include <wtf/PassOwnPtr.h> namespace WebCore { @@ -49,14 +48,14 @@ void TextCodecUTF16::registerEncodingNames(EncodingNameRegistrar registrar) registrar("unicodeFFFE", "UTF-16BE"); } -static auto_ptr<TextCodec> newStreamingTextDecoderUTF16LE(const TextEncoding&, const void*) +static PassOwnPtr<TextCodec> newStreamingTextDecoderUTF16LE(const TextEncoding&, const void*) { - return auto_ptr<TextCodec>(new TextCodecUTF16(true)); + return new TextCodecUTF16(true); } -static auto_ptr<TextCodec> newStreamingTextDecoderUTF16BE(const TextEncoding&, const void*) +static PassOwnPtr<TextCodec> newStreamingTextDecoderUTF16BE(const TextEncoding&, const void*) { - return auto_ptr<TextCodec>(new TextCodecUTF16(false)); + return new TextCodecUTF16(false); } void TextCodecUTF16::registerCodecs(TextCodecRegistrar registrar) |