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/TextCodecICU.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/TextCodecICU.cpp')
| -rw-r--r-- | WebCore/platform/text/TextCodecICU.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/WebCore/platform/text/TextCodecICU.cpp b/WebCore/platform/text/TextCodecICU.cpp index 72054fa..b8e40a9 100644 --- a/WebCore/platform/text/TextCodecICU.cpp +++ b/WebCore/platform/text/TextCodecICU.cpp @@ -34,10 +34,10 @@ #include <unicode/ucnv.h> #include <unicode/ucnv_cb.h> #include <wtf/Assertions.h> +#include <wtf/PassOwnPtr.h> #include <wtf/StringExtras.h> #include <wtf/Threading.h> -using std::auto_ptr; using std::min; namespace WebCore { @@ -55,9 +55,9 @@ static UConverter*& cachedConverterICU() return threadGlobalData().cachedConverterICU().converter; } -static auto_ptr<TextCodec> newTextCodecICU(const TextEncoding& encoding, const void*) +static PassOwnPtr<TextCodec> newTextCodecICU(const TextEncoding& encoding, const void*) { - return auto_ptr<TextCodec>(new TextCodecICU(encoding)); + return new TextCodecICU(encoding); } void TextCodecICU::registerBaseEncodingNames(EncodingNameRegistrar registrar) |