diff options
author | Ben Murdoch <benm@google.com> | 2011-05-24 11:24:40 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2011-06-02 09:53:15 +0100 |
commit | 81bc750723a18f21cd17d1b173cd2a4dda9cea6e (patch) | |
tree | 7a9e5ed86ff429fd347a25153107221543909b19 /Source/WebCore/platform/text/TextCodecUTF8.h | |
parent | 94088a6d336c1dd80a1e734af51e96abcbb689a7 (diff) | |
download | external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.zip external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.gz external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.bz2 |
Merge WebKit at r80534: Intial merge by Git
Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
Diffstat (limited to 'Source/WebCore/platform/text/TextCodecUTF8.h')
-rw-r--r-- | Source/WebCore/platform/text/TextCodecUTF8.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/Source/WebCore/platform/text/TextCodecUTF8.h b/Source/WebCore/platform/text/TextCodecUTF8.h index f3b6b7a..39fd753 100644 --- a/Source/WebCore/platform/text/TextCodecUTF8.h +++ b/Source/WebCore/platform/text/TextCodecUTF8.h @@ -35,15 +35,19 @@ public: static void registerEncodingNames(EncodingNameRegistrar); static void registerCodecs(TextCodecRegistrar); - virtual String decode(const char*, size_t length, bool flush, bool stopOnError, bool& sawError); - virtual CString encode(const UChar*, size_t length, UnencodableHandling); - private: static PassOwnPtr<TextCodec> create(const TextEncoding&, const void*); TextCodecUTF8() : m_partialSequenceSize(0) { } + virtual String decode(const char*, size_t length, bool flush, bool stopOnError, bool& sawError); + virtual CString encode(const UChar*, size_t length, UnencodableHandling); + + void handlePartialSequence(UChar*& destination, const uint8_t*& source, const uint8_t* end, bool flush, bool stopOnError, bool& sawError); + void handleError(UChar*& destination, bool stopOnError, bool& sawError); + void consumePartialSequenceByte(); + int m_partialSequenceSize; - char m_partialSequence[U8_MAX_LENGTH - 1]; + uint8_t m_partialSequence[U8_MAX_LENGTH]; }; |