Changeset 239970 in webkit

Timestamp:

Jan 14, 2019 7:26:04 PM (5 years ago)

Author:

Michael Catanzaro

Message:

Use unorm2_normalize instead of precomposedStringWithCanonicalMapping in userVisibleString
​https://bugs.webkit.org/show_bug.cgi?id=192945

Reviewed by Alex Christensen.

Replace use of the nice NSString function precomposedStringWithCanonicalMapping with the ICU
API unorm2_normalize. This is to prep the code for translation to cross-platform C++. Of
course this is much worse than the preexisting code, but this is just a transitional
measure and not the final state of the code. It wouldn't make sense to do this if the code
were to remain Objective C++.

• wtf/cocoa/NSURLExtras.mm:

(WTF::toNormalizationFormC):
(WTF::userVisibleString):

Location:

trunk/Source/WTF

Files:

• ChangeLog (modified) (1 diff)
• wtf/cocoa/NSURLExtras.mm (modified) (3 diffs)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2019-01-14  Michael Catanzaro  <mcatanzaro@igalia.com>
+
+        Use unorm2_normalize instead of precomposedStringWithCanonicalMapping in userVisibleString
+        https://bugs.webkit.org/show_bug.cgi?id=192945
+
+        Reviewed by Alex Christensen.
+
+        Replace use of the nice NSString function precomposedStringWithCanonicalMapping with the ICU
+        API unorm2_normalize. This is to prep the code for translation to cross-platform C++. Of
+        course this is much worse than the preexisting code, but this is just a transitional
+        measure and not the final state of the code. It wouldn't make sense to do this if the code
+        were to remain Objective C++.
+
+        * wtf/cocoa/NSURLExtras.mm:
+        (WTF::toNormalizationFormC):
+        (WTF::userVisibleString):
+
 2019-01-14  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WTF/wtf/cocoa/NSURLExtras.mm

@@ -33 +33 @@
 #import <unicode/uchar.h>
 #import <unicode/uidna.h>
+#import <unicode/unorm.h>
 #import <unicode/uscript.h>
 #import <wtf/Function.h>
@@ -1106 +1107 @@
 }
 
+static String toNormalizationFormC(const String& string)
+{
+    auto sourceBuffer = string.charactersWithNullTermination();
+    ASSERT(sourceBuffer.last() == '\0');
+    sourceBuffer.removeLast();
+
+    String result;
+    Vector<UChar, URL_BYTES_BUFFER_LENGTH> normalizedCharacters(sourceBuffer.size());
+    UErrorCode uerror = U_ZERO_ERROR;
+    int32_t normalizedLength = 0;
+    const UNormalizer2 *normalizer = unorm2_getNFCInstance(&uerror);
+    if (!U_FAILURE(uerror)) {
+        normalizedLength = unorm2_normalize(normalizer, sourceBuffer.data(), sourceBuffer.size(), normalizedCharacters.data(), normalizedCharacters.size(), &uerror);
+        if (uerror == U_BUFFER_OVERFLOW_ERROR) {
+            uerror = U_ZERO_ERROR;
+            normalizedCharacters.resize(normalizedLength);
+            normalizedLength = unorm2_normalize(normalizer, sourceBuffer.data(), sourceBuffer.size(), normalizedCharacters.data(), normalizedLength, &uerror);
+        }
+        if (!U_FAILURE(uerror))
+            result = String(normalizedCharacters.data(), normalizedLength);
+    }
+
+    return result;
+}
+
 NSString *userVisibleString(NSURL *URL)
 {
@@ -1176 +1202 @@
     }
 
-    result = [result precomposedStringWithCanonicalMapping];
+    auto wtfString = String(result.get());
+    auto normalized = toNormalizationFormC(wtfString);
+    result = static_cast<NSString *>(normalized);
     return CFBridgingRelease(createStringWithEscapedUnsafeCharacters((__bridge CFStringRef)result.get()));
 }