diff options
| author | Feng Qian <fqian@google.com> | 2009-06-17 12:12:20 -0700 |
|---|---|---|
| committer | Feng Qian <fqian@google.com> | 2009-06-17 12:12:20 -0700 |
| commit | 5f1ab04193ad0130ca8204aadaceae083aca9881 (patch) | |
| tree | 5a92cd389e2cfe7fb67197ce14b38469462379f8 /WebCore/platform/text/mac | |
| parent | 194315e5a908cc8ed67d597010544803eef1ac59 (diff) | |
| download | external_webkit-5f1ab04193ad0130ca8204aadaceae083aca9881.zip external_webkit-5f1ab04193ad0130ca8204aadaceae083aca9881.tar.gz external_webkit-5f1ab04193ad0130ca8204aadaceae083aca9881.tar.bz2 | |
Get WebKit r44544.
Diffstat (limited to 'WebCore/platform/text/mac')
| -rw-r--r-- | WebCore/platform/text/mac/TextBoundaries.mm | 2 | ||||
| -rw-r--r-- | WebCore/platform/text/mac/TextCodecMac.cpp | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/WebCore/platform/text/mac/TextBoundaries.mm b/WebCore/platform/text/mac/TextBoundaries.mm index ff1dfd2..bd7ddf8 100644 --- a/WebCore/platform/text/mac/TextBoundaries.mm +++ b/WebCore/platform/text/mac/TextBoundaries.mm @@ -26,6 +26,8 @@ #import "config.h" #import "TextBoundaries.h" +using namespace WTF::Unicode; + namespace WebCore { void findWordBoundary(const UChar* chars, int len, int position, int* start, int* end) diff --git a/WebCore/platform/text/mac/TextCodecMac.cpp b/WebCore/platform/text/mac/TextCodecMac.cpp index 3baf21f..93b9da2 100644 --- a/WebCore/platform/text/mac/TextCodecMac.cpp +++ b/WebCore/platform/text/mac/TextCodecMac.cpp @@ -33,9 +33,9 @@ #include "PlatformString.h" #include "ThreadGlobalData.h" #include <wtf/Assertions.h> +#include <wtf/PassOwnPtr.h> #include <wtf/Threading.h> -using std::auto_ptr; using std::min; namespace WebCore { @@ -64,9 +64,9 @@ void TextCodecMac::registerEncodingNames(EncodingNameRegistrar registrar) } } -static auto_ptr<TextCodec> newTextCodecMac(const TextEncoding&, const void* additionalData) +static PassOwnPtr<TextCodec> newTextCodecMac(const TextEncoding&, const void* additionalData) { - return auto_ptr<TextCodec>(new TextCodecMac(*static_cast<const TECTextEncodingID*>(additionalData))); + return new TextCodecMac(*static_cast<const TECTextEncodingID*>(additionalData)); } void TextCodecMac::registerCodecs(TextCodecRegistrar registrar) |