Changeset 275084 in webkit

Timestamp:

Mar 26, 2021, 2:25:21 AM (5 years ago)

Author:

ysuzuki@apple.com

Message:

Use ICUDeleter to encode ucnv_close/uenum_close call into type of deleter of std::unique_ptr
​https://bugs.webkit.org/show_bug.cgi?id=223503

Reviewed by Alex Christensen.

Use ICUDeleter<ucnv_close> instead of holding ucnv_close pointer in ICUConverterPtr.
This deleter encodes ucnv_close calls into type so that we do not need to hold a pointer
to ucnv_close.

We also use ICUDeleter<uenum_close> in place where we use UEnumeration.

• Modules/applepay/PaymentRequestValidator.mm:

(WebCore::validateCurrencyCode):

• platform/text/EncodingTables.cpp:

(WebCore::jis0208):
(WebCore::jis0212):
(WebCore::big5):
(WebCore::eucKR):
(WebCore::gb18030):

• platform/text/TextCodecICU.cpp:

(WebCore::TextCodecICU::createICUConverter const):

• platform/text/TextCodecICU.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/applepay/PaymentRequestValidator.mm (modified) (2 diffs)
• platform/text/EncodingTables.cpp (modified) (5 diffs)
• platform/text/TextCodecICU.cpp (modified) (1 diff)
• platform/text/TextCodecICU.h (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-03-26  Yusuke Suzuki  <ysuzuki@apple.com>
+
+        Use ICUDeleter to encode ucnv_close/uenum_close call into type of deleter of std::unique_ptr
+        https://bugs.webkit.org/show_bug.cgi?id=223503
+
+        Reviewed by Alex Christensen.
+
+        Use ICUDeleter<ucnv_close> instead of holding ucnv_close pointer in ICUConverterPtr.
+        This deleter encodes ucnv_close calls into type so that we do not need to hold a pointer
+        to ucnv_close.
+
+        We also use ICUDeleter<uenum_close> in place where we use UEnumeration.
+
+        * Modules/applepay/PaymentRequestValidator.mm:
+        (WebCore::validateCurrencyCode):
+        * platform/text/EncodingTables.cpp:
+        (WebCore::jis0208):
+        (WebCore::jis0212):
+        (WebCore::big5):
+        (WebCore::eucKR):
+        (WebCore::gb18030):
+        * platform/text/TextCodecICU.cpp:
+        (WebCore::TextCodecICU::createICUConverter const):
+        * platform/text/TextCodecICU.h:
+
 2021-03-26  Jessie Berlin  <jberlin@webkit.org>
 

trunk/Source/WebCore/Modules/applepay/PaymentRequestValidator.mm

@@ -33 +33 @@
 #import <unicode/ucurr.h>
 #import <unicode/uloc.h>
+#import <wtf/unicode/icu/ICUHelpers.h>
 
 namespace WebCore {
@@ -116 +117 @@
 
     UErrorCode errorCode = U_ZERO_ERROR;
-    auto currencyCodes = std::unique_ptr<UEnumeration, void (*)(UEnumeration*)>(ucurr_openISOCurrencies(UCURR_ALL, &errorCode), uenum_close);
+    auto currencyCodes = std::unique_ptr<UEnumeration, ICUDeleter<uenum_close>>(ucurr_openISOCurrencies(UCURR_ALL, &errorCode));
 
     int32_t length;

trunk/Source/WebCore/platform/text/EncodingTables.cpp

@@ -1067 +1067 @@
         
         UErrorCode error = U_ZERO_ERROR;
-        auto icuConverter = ICUConverterPtr { ucnv_open("EUC-JP", &error), ucnv_close };
+        auto icuConverter = ICUConverterPtr { ucnv_open("EUC-JP", &error) };
         ASSERT(!error);
 
@@ -1872 +1872 @@
         
         UErrorCode error = U_ZERO_ERROR;
-        auto icuConverter = ICUConverterPtr { ucnv_open("EUC-JP", &error), ucnv_close };
+        auto icuConverter = ICUConverterPtr { ucnv_open("EUC-JP", &error) };
         ASSERT(!error);
 
@@ -4883 +4883 @@
         
         UErrorCode error = U_ZERO_ERROR;
-        auto icuConverter = ICUConverterPtr { ucnv_open("Big-5", &error), ucnv_close };
+        auto icuConverter = ICUConverterPtr { ucnv_open("Big-5", &error) };
         ASSERT(!error);
 
@@ -7073 +7073 @@
         array = new std::array<std::pair<uint16_t, UChar>, 17048>;
         UErrorCode error = U_ZERO_ERROR;
-        auto icuConverter = ICUConverterPtr { ucnv_open("windows-949", &error), ucnv_close };
+        auto icuConverter = ICUConverterPtr { ucnv_open("windows-949", &error) };
         ASSERT(U_SUCCESS(error));
         auto getPair = [icuConverter = WTFMove(icuConverter)] (uint16_t pointer) -> Optional<std::pair<uint16_t, UChar>> {
@@ -8612 +8612 @@
         array = new std::array<UChar, 23940>;
         UErrorCode error = U_ZERO_ERROR;
-        auto icuConverter = ICUConverterPtr { ucnv_open("gb18030", &error), ucnv_close };
+        auto icuConverter = ICUConverterPtr { ucnv_open("gb18030", &error) };
         for (size_t pointer = 0; pointer < 23940; pointer++) {
             uint8_t icuInput[2];

trunk/Source/WebCore/platform/text/TextCodecICU.cpp

@@ -187 +187 @@
 
     UErrorCode error = U_ZERO_ERROR;
-    m_converter = ICUConverterPtr { ucnv_open(m_canonicalConverterName, &error), ucnv_close };
+    m_converter = ICUConverterPtr { ucnv_open(m_canonicalConverterName, &error) };
     if (m_converter)
         ucnv_setFallback(m_converter.get(), true);

trunk/Source/WebCore/platform/text/TextCodecICU.h

@@ -29 +29 @@
 #include "TextCodec.h"
 #include <unicode/ucnv.h>
+#include <wtf/unicode/icu/ICUHelpers.h>
 
 namespace WebCore {
 
-using ICUConverterPtr = std::unique_ptr<UConverter, void (*)(UConverter*)>;
+using ICUConverterPtr = std::unique_ptr<UConverter, ICUDeleter<ucnv_close>>;
 
 class TextCodecICU final : public TextCodec {
@@ -53 +54 @@
     const char* const m_encodingName;
     const char* const m_canonicalConverterName;
-    mutable ICUConverterPtr m_converter { nullptr, ucnv_close };
+    mutable ICUConverterPtr m_converter;
 };
 
@@ -59 +60 @@
     WTF_MAKE_STRUCT_FAST_ALLOCATED;
 
-    ICUConverterPtr converter { nullptr, ucnv_close };
+    ICUConverterPtr converter;
 };