Do not normalize into NFC the values of form fields

Source/weborigin/KURL.cpp

 /*
  * Copyright (C) 2004, 2007, 2008, 2011, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2012 Research In Motion Limited. All rights reserved.
  * Copyright (C) 2008, 2009, 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
@@ skipping 82 matching lines @@
 class KURLCharsetConverter : public url_canon::CharsetConverter {
 public:
     // The encoding parameter may be 0, but in this case the object must not be called.
     explicit KURLCharsetConverter(const WTF::TextEncoding* encoding)
         : m_encoding(encoding)
     {
     }
 
     virtual void ConvertFromUTF16(const url_parse::UTF16Char* input, int inputLength, url_canon::CanonOutput* output)
     {
-        CString encoded = m_encoding->encode(String(input, inputLength), WTF::URLEncodedEntitiesForUnencodables);
+        CString encoded = m_encoding->normalizeAndEncode(String(input, inputLength), WTF::URLEncodedEntitiesForUnencodables);
         output->Append(encoded.data(), static_cast<int>(encoded.length()));
     }
 
 private:
     const WTF::TextEncoding* m_encoding;
 };
 
 } // namespace
 
 bool isValidProtocol(const String& protocol)
@@ skipping 481 matching lines @@
     // sucks, and we don't use the encoding properly, which will make some
     // obscure anchor navigations fail.
     StringUTF8Adaptor stringUTF8(string);
     url_canon::RawCanonOutputT<url_parse::UTF16Char> unescaped;
     url_util::DecodeURLEscapeSequences(stringUTF8.data(), stringUTF8.length(), &unescaped);
     return StringImpl::create8BitIfPossible(reinterpret_cast<UChar*>(unescaped.data()), unescaped.length());
 }
 
 String encodeWithURLEscapeSequences(const String& notEncodedString)
 {
-    CString utf8 = UTF8Encoding().encode(notEncodedString, WTF::URLEncodedEntitiesForUnencodables);
+    CString utf8 = UTF8Encoding().normalizeAndEncode(notEncodedString, WTF::URLEncodedEntitiesForUnencodables);
 
     url_canon::RawCanonOutputT<char> buffer;
     int inputLength = utf8.length();
     if (buffer.length() < inputLength * 3)
         buffer.Resize(inputLength * 3);
 
     url_util::EncodeURIComponent(utf8.data(), inputLength, &buffer);
     String escaped(buffer.data(), buffer.length());
     // Unescape '/'; it's safe and much prettier.
     escaped.replace("%2F", "/");
@@ skipping 221 matching lines @@
     m_string = AtomicString::fromUTF8(output.data(), output.length());
 }
 
 bool KURL::isSafeToSendToAnotherThread() const
 {
     return m_string.isSafeToSendToAnotherThread()
         && (!m_innerURL || m_innerURL->isSafeToSendToAnotherThread());
 }
 
 } // namespace WebCore