Index: third_party/WebKit/Source/wtf/text/StringUTF8Adaptor.h |
diff --git a/third_party/WebKit/Source/wtf/text/StringUTF8Adaptor.h b/third_party/WebKit/Source/wtf/text/StringUTF8Adaptor.h |
index 07f2825bbb247d97da69ae3a8d5c6b540692d85a..567bb995d67b9eda9f0bc6849e168c447299dfba 100644 |
--- a/third_party/WebKit/Source/wtf/text/StringUTF8Adaptor.h |
+++ b/third_party/WebKit/Source/wtf/text/StringUTF8Adaptor.h |
@@ -42,12 +42,7 @@ namespace WTF { |
// contain only ASCII characters. |
class StringUTF8Adaptor { |
public: |
- enum ShouldNormalize { |
- DoNotNormalize, |
- Normalize |
- }; |
- |
- explicit StringUTF8Adaptor(const String& string, ShouldNormalize normalize = DoNotNormalize, UnencodableHandling handling = EntitiesForUnencodables) |
+ explicit StringUTF8Adaptor(const String& string) |
: m_data(0) |
, m_length(0) |
{ |
@@ -61,10 +56,7 @@ public: |
m_data = reinterpret_cast<const char*>(string.characters8()); |
m_length = string.length(); |
} else { |
- if (normalize == Normalize) |
- m_utf8Buffer = UTF8Encoding().normalizeAndEncode(string, handling); |
- else |
- m_utf8Buffer = string.utf8(); |
+ m_utf8Buffer = string.utf8(); |
m_data = m_utf8Buffer.data(); |
m_length = m_utf8Buffer.length(); |
} |