Fix build with icu 65.1
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 4 Oct 2019 21:51:37 +0000 (21:51 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 4 Oct 2019 21:51:37 +0000 (21:51 +0000)
https://bugs.webkit.org/show_bug.cgi?id=202600

Patch by Heiko Becker <heirecka@exherbo.org> on 2019-10-04
Reviewed by Konstantin Tokarev.

Source/WebCore:

* dom/Document.cpp:
(WebCore::isValidNameNonASCII):
(WebCore::Document::parseQualifiedName):

Source/WTF:

* wtf/URLHelpers.cpp:
(WTF::URLHelpers::allCharactersInIDNScriptWhiteList):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@250747 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WTF/ChangeLog
Source/WTF/wtf/URLHelpers.cpp
Source/WebCore/ChangeLog
Source/WebCore/dom/Document.cpp

index 6f18fde..f67f313 100644 (file)
@@ -1,3 +1,13 @@
+2019-10-04  Heiko Becker  <heirecka@exherbo.org>
+
+        Fix build with icu 65.1
+        https://bugs.webkit.org/show_bug.cgi?id=202600
+
+        Reviewed by Konstantin Tokarev.
+
+        * wtf/URLHelpers.cpp:
+        (WTF::URLHelpers::allCharactersInIDNScriptWhiteList):
+
 2019-10-04  Truitt Savell  <tsavell@apple.com>
 
         Unreviewed, rolling out r250583.
index 18e7f13..c584f1a 100644 (file)
@@ -301,7 +301,7 @@ static bool allCharactersInIDNScriptWhiteList(const UChar* buffer, int32_t lengt
     Optional<UChar32> previousCodePoint;
     while (i < length) {
         UChar32 c;
-        U16_NEXT(buffer, i, length, c)
+        U16_NEXT(buffer, i, length, c);
         UErrorCode error = U_ZERO_ERROR;
         UScriptCode script = uscript_getScript(c, &error);
         if (error != U_ZERO_ERROR) {
index 1495719..8631d07 100644 (file)
@@ -1,3 +1,14 @@
+2019-10-04  Heiko Becker  <heirecka@exherbo.org>
+
+        Fix build with icu 65.1
+        https://bugs.webkit.org/show_bug.cgi?id=202600
+
+        Reviewed by Konstantin Tokarev.
+
+        * dom/Document.cpp:
+        (WebCore::isValidNameNonASCII):
+        (WebCore::Document::parseQualifiedName):
+
 2019-10-04  James Darpinian  <jdarpinian@chromium.org>
 
         Allow using WebGL 2 when USE_ANGLE=1
index 2443e24..1fbb3a7 100644 (file)
@@ -4954,12 +4954,12 @@ static bool isValidNameNonASCII(const UChar* characters, unsigned length)
     unsigned i = 0;
 
     UChar32 c;
-    U16_NEXT(characters, i, length, c)
+    U16_NEXT(characters, i, length, c);
     if (!isValidNameStart(c))
         return false;
 
     while (i < length) {
-        U16_NEXT(characters, i, length, c)
+        U16_NEXT(characters, i, length, c);
         if (!isValidNamePart(c))
             return false;
     }
@@ -5019,7 +5019,7 @@ ExceptionOr<std::pair<AtomString, AtomString>> Document::parseQualifiedName(cons
 
     for (unsigned i = 0; i < length; ) {
         UChar32 c;
-        U16_NEXT(qualifiedName, i, length, c)
+        U16_NEXT(qualifiedName, i, length, c);
         if (c == ':') {
             if (sawColon)
                 return Exception { InvalidCharacterError };