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

Side by Side Diff: third_party/WebKit/Source/wtf/text/TextCodecICU.h

Issue 2354533005: FormData should not drop ignorable code points. (Closed)
Patch Set: Created 4 years, 2 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) 2004, 2006, 2007, 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2004, 2006, 2007, 2011 Apple Inc. All rights reserved.
3 * Copyright (C) 2006 Alexey Proskuryakov <ap@nypop.com> 3 * Copyright (C) 2006 Alexey Proskuryakov <ap@nypop.com>
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
11 * notice, this list of conditions and the following disclaimer in the 11 * notice, this list of conditions and the following disclaimer in the
12 * documentation and/or other materials provided with the distribution. 12 * documentation and/or other materials provided with the distribution.
13 * 13 *
14 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY 14 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
16 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 16 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
17 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR 17 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
18 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 18 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
19 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 19 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
20 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 20 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
21 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 21 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 */ 25 */
26 26
27 #ifndef TextCodecICU_h 27 #ifndef TextCodecICU_h
28 #define TextCodecICU_h 28 #define TextCodecICU_h
29 29
30 #include "base/gtest_prod_util.h"
30 #include "wtf/text/TextCodec.h" 31 #include "wtf/text/TextCodec.h"
31 #include "wtf/text/TextEncoding.h" 32 #include "wtf/text/TextEncoding.h"
32 #include <memory> 33 #include <memory>
33 #include <unicode/utypes.h> 34 #include <unicode/utypes.h>
34 35
35 typedef struct UConverter UConverter; 36 typedef struct UConverter UConverter;
36 37
37 namespace WTF { 38 namespace WTF {
38 39
39 class TextCodecInput; 40 class TextCodecInput;
40 41
41 class TextCodecICU final : public TextCodec { 42 class TextCodecICU final : public TextCodec {
42 public: 43 public:
43 static void registerEncodingNames(EncodingNameRegistrar); 44 static void registerEncodingNames(EncodingNameRegistrar);
44 static void registerCodecs(TextCodecRegistrar); 45 static void registerCodecs(TextCodecRegistrar);
45 46
46 ~TextCodecICU() override; 47 ~TextCodecICU() override;
47 48
48 private: 49 private:
49 TextCodecICU(const TextEncoding&); 50 TextCodecICU(const TextEncoding&);
50 static std::unique_ptr<TextCodec> create(const TextEncoding&, const void*); 51 WTF_EXPORT static std::unique_ptr<TextCodec> create(const TextEncoding&, con st void*);
51 52
52 String decode(const char*, size_t length, FlushBehavior, bool stopOnError, b ool& sawError) override; 53 String decode(const char*, size_t length, FlushBehavior, bool stopOnError, b ool& sawError) override;
53 CString encode(const UChar*, size_t length, UnencodableHandling) override; 54 CString encode(const UChar*, size_t length, UnencodableHandling) override;
54 CString encode(const LChar*, size_t length, UnencodableHandling) override; 55 CString encode(const LChar*, size_t length, UnencodableHandling) override;
55 56
56 template<typename CharType> 57 template<typename CharType>
57 CString encodeCommon(const CharType*, size_t length, UnencodableHandling); 58 CString encodeCommon(const CharType*, size_t length, UnencodableHandling);
58 CString encodeInternal(const TextCodecInput&, UnencodableHandling); 59 CString encodeInternal(const TextCodecInput&, UnencodableHandling);
59 60
60 void createICUConverter() const; 61 void createICUConverter() const;
61 void releaseICUConverter() const; 62 void releaseICUConverter() const;
62 #if defined(USING_SYSTEM_ICU) 63 #if defined(USING_SYSTEM_ICU)
63 bool needsGBKFallbacks() const { return m_needsGBKFallbacks; } 64 bool needsGBKFallbacks() const { return m_needsGBKFallbacks; }
64 void setNeedsGBKFallbacks(bool needsFallbacks) { m_needsGBKFallbacks = needs Fallbacks; } 65 void setNeedsGBKFallbacks(bool needsFallbacks) { m_needsGBKFallbacks = needs Fallbacks; }
65 #endif 66 #endif
66 67
67 int decodeToBuffer(UChar* buffer, UChar* bufferLimit, const char*& source, 68 int decodeToBuffer(UChar* buffer, UChar* bufferLimit, const char*& source,
68 const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode&); 69 const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode&);
69 70
70 TextEncoding m_encoding; 71 TextEncoding m_encoding;
71 mutable UConverter* m_converterICU; 72 mutable UConverter* m_converterICU;
72 #if defined(USING_SYSTEM_ICU) 73 #if defined(USING_SYSTEM_ICU)
73 mutable bool m_needsGBKFallbacks; 74 mutable bool m_needsGBKFallbacks;
74 #endif 75 #endif
76
77 FRIEND_TEST_ALL_PREFIXES(TextCodecICUTest, IgnorableCodePoint);
75 }; 78 };
76 79
77 struct ICUConverterWrapper { 80 struct ICUConverterWrapper {
78 WTF_MAKE_NONCOPYABLE(ICUConverterWrapper); USING_FAST_MALLOC(ICUConverterWra pper); 81 WTF_MAKE_NONCOPYABLE(ICUConverterWrapper); USING_FAST_MALLOC(ICUConverterWra pper);
79 public: 82 public:
80 ICUConverterWrapper() : converter(0) { } 83 ICUConverterWrapper() : converter(0) { }
81 ~ICUConverterWrapper(); 84 ~ICUConverterWrapper();
82 85
83 UConverter* converter; 86 UConverter* converter;
84 }; 87 };
85 88
86 } // namespace WTF 89 } // namespace WTF
87 90
88 #endif // TextCodecICU_h 91 #endif // TextCodecICU_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/wtf/BUILD.gn ('k') | third_party/WebKit/Source/wtf/text/TextCodecICU.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698