Remove unused support for NFC normalization during text encoding

third_party/WebKit/Source/wtf/text/TextEncoding.cpp

 /*
  * Copyright (C) 2004, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2006 Alexey Proskuryakov <ap@nypop.com>
  * Copyright (C) 2007-2009 Torch Mobile, Inc.
  *
  * 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 16 matching lines @@
 
 #include "config.h"
 #include "wtf/text/TextEncoding.h"
 
 #include "wtf/OwnPtr.h"
 #include "wtf/StdLibExtras.h"
 #include "wtf/Threading.h"
 #include "wtf/text/CString.h"
 #include "wtf/text/TextEncodingRegistry.h"
 #include "wtf/text/WTFString.h"
-#include <unicode/unorm.h>
 
 namespace WTF {
 
 static const TextEncoding& UTF7Encoding()
 {
     AtomicallyInitializedStaticReference(const TextEncoding, globalUTF7Encoding, new TextEncoding("UTF-7"));
     return globalUTF7Encoding;
 }
 
 TextEncoding::TextEncoding(const char* name)
@@ skipping 30 matching lines @@
 
     OwnPtr<TextCodec> textCodec = newTextCodec(*this);
     CString encodedString;
     if (string.is8Bit())
         encodedString = textCodec->encode(string.characters8(), string.length(), handling);
     else
         encodedString = textCodec->encode(string.characters16(), string.length(), handling);
     return encodedString;
 }
 
-CString TextEncoding::normalizeAndEncode(const String& string, UnencodableHandling handling) const
-{
-    if (!m_name)
-        return CString();
-
-    if (string.isEmpty())
-        return "";
-
-    // Text exclusively containing Latin-1 characters (U+0000..U+00FF) is left
-    // unaffected by NFC. This is effectively the same as saying that all
-    // Latin-1 text is already normalized to NFC.
-    // Source: http://unicode.org/reports/tr15/
-    if (string.is8Bit())
-        return newTextCodec(*this)->encode(string.characters8(), string.length(), handling);
-
-    const UChar* source = string.characters16();
-    size_t length = string.length();
-
-    Vector<UChar> normalizedCharacters;
-
-    UErrorCode err = U_ZERO_ERROR;
-    if (unorm_quickCheck(source, length, UNORM_NFC, &err) != UNORM_YES) {
-        // First try using the length of the original string, since normalization to NFC rarely increases length.
-        normalizedCharacters.grow(length);
-        int32_t normalizedLength = unorm_normalize(source, length, UNORM_NFC, 0, normalizedCharacters.data(), length, &err);
-        if (err == U_BUFFER_OVERFLOW_ERROR) {
-            err = U_ZERO_ERROR;
-            normalizedCharacters.resize(normalizedLength);
-            normalizedLength = unorm_normalize(source, length, UNORM_NFC, 0, normalizedCharacters.data(), normalizedLength, &err);
-        }
-        ASSERT(U_SUCCESS(err));
-
-        source = normalizedCharacters.data();
-        length = normalizedLength;
-    }
-
-    return newTextCodec(*this)->encode(source, length, handling);
-}
-
 bool TextEncoding::usesVisualOrdering() const
 {
     if (noExtendedTextEncodingNameUsed())
         return false;
 
     static const char* const a = atomicCanonicalTextEncodingName("ISO-8859-8");
     return m_name == a;
 }
 
 bool TextEncoding::isNonByteBasedEncoding() const
@@ skipping 79 matching lines @@
     return globalUTF8Encoding;
 }
 
 const TextEncoding& WindowsLatin1Encoding()
 {
     AtomicallyInitializedStaticReference(const TextEncoding, globalWindowsLatin1Encoding, new TextEncoding("WinLatin1"));
     return globalWindowsLatin1Encoding;
 }
 
 } // namespace WTF