Changeset 140731 in webkit

Timestamp:

Jan 24, 2013 3:01:06 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Abstract the logic for appending a UChar32 onto StringBuilder
​https://bugs.webkit.org/show_bug.cgi?id=107505

Patch by Martin Robinson <​mrobinson@igalia.com> on 2013-01-24
Reviewed by Darin Adler.

Source/WebCore:

• css/CSSOMUtils.cpp:

(WebCore::serializeCharacter): Use the new StringBuilder append.
(WebCore::serializeIdentifier): Ditto.
(WebCore::serializeString): Ditto.

• html/parser/HTMLEntityParser.cpp:

(WebCore::HTMLEntityParser::consumeNamedEntity): Ditto.

• svg/SVGFontData.cpp:

(WebCore::SVGFontData::createStringWithMirroredCharacters): Ditto.

• xml/parser/CharacterReferenceParserInlines.h:

(WebCore::consumeCharacterReference): Ditto.

• xml/parser/XMLCharacterReferenceParser.cpp: Remove an older helper

superseded by StringBuilder::append.

Source/WTF:

• wtf/text/StringBuilder.h:

(WTF::StringBuilder::append): Added a method for appending a UChar32 to a StringBuilder.

Tools:

• TestWebKitAPI/Tests/WTF/StringBuilder.cpp:

(TestWebKitAPI::TEST): Added a simple test for appending UChar32.

Location:

trunk

Files:

• Source/WTF/ChangeLog (modified) (1 diff)
• Source/WTF/wtf/text/StringBuilder.h (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/CSSOMUtils.cpp (modified) (3 diffs)
• Source/WebCore/html/parser/HTMLEntityParser.cpp (modified) (2 diffs)
• Source/WebCore/svg/SVGFontData.cpp (modified) (1 diff)
• Source/WebCore/xml/parser/CharacterReferenceParserInlines.h (modified) (2 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WTF/StringBuilder.cpp (modified) (2 diffs)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2013-01-24  Martin Robinson  <mrobinson@igalia.com>
+
+        Abstract the logic for appending a UChar32 onto StringBuilder
+        https://bugs.webkit.org/show_bug.cgi?id=107505
+
+        Reviewed by Darin Adler.
+
+        * wtf/text/StringBuilder.h:
+        (WTF::StringBuilder::append): Added a method for appending a UChar32 to a StringBuilder.
+
 2013-01-24  Brent Fulgham  <bfulgham@webkit.org>
 

trunk/Source/WTF/wtf/text/StringBuilder.h

@@ -142 +142 @@
     }
 
+    void append(UChar32 c)
+    {
+        if (U_IS_BMP(c)) {
+            append(static_cast<UChar>(c));
+            return;
+        }
+        append(U16_LEAD(c));
+        append(U16_TRAIL(c));
+    }
+
     template<unsigned charactersCount>
     ALWAYS_INLINE void appendLiteral(const char (&characters)[charactersCount]) { append(characters, charactersCount - 1); }

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-24  Martin Robinson  <mrobinson@igalia.com>
+
+        Abstract the logic for appending a UChar32 onto StringBuilder
+        https://bugs.webkit.org/show_bug.cgi?id=107505
+
+        Reviewed by Darin Adler.
+
+        * css/CSSOMUtils.cpp:
+        (WebCore::serializeCharacter): Use the new StringBuilder append.
+        (WebCore::serializeIdentifier): Ditto.
+        (WebCore::serializeString): Ditto.
+        * html/parser/HTMLEntityParser.cpp:
+        (WebCore::HTMLEntityParser::consumeNamedEntity): Ditto.
+        * svg/SVGFontData.cpp:
+        (WebCore::SVGFontData::createStringWithMirroredCharacters): Ditto.
+        * xml/parser/CharacterReferenceParserInlines.h:
+        (WebCore::consumeCharacterReference): Ditto.
+        * xml/parser/XMLCharacterReferenceParser.cpp: Remove an older helper
+        superseded by StringBuilder::append.
+
 2013-01-24  Kentaro Hara  <haraken@chromium.org>
 

trunk/Source/WebCore/css/CSSOMUtils.cpp

@@ -37 +37 @@
 namespace WebCore {
 
-static void appendCharacter(UChar32 c, StringBuilder& appendTo)
-{
-    if (U16_LENGTH(c) == 1)
-        appendTo.append(static_cast<UChar>(c));
-    else {
-        appendTo.append(U16_LEAD(c));
-        appendTo.append(U16_TRAIL(c));
-    }
-}
-
 void serializeCharacter(UChar32 c, StringBuilder& appendTo)
 {
     appendTo.append('\\');
-    appendCharacter(c, appendTo);
+    appendTo.append(c);
 }
 
@@ -82 +72 @@
             serializeCharacter(c, appendTo);
         else if (0x80 <= c || c == 0x2d || c == 0x5f || (0x30 <= c && c <= 0x39) || (0x41 <= c && c <= 0x5a) || (0x61 <= c && c <= 0x7a))
-            appendCharacter(c, appendTo);
+            appendTo.append(c);
         else
             serializeCharacter(c, appendTo);
@@ -116 +106 @@
             serializeCharacter(c, appendTo);
         else
-            appendCharacter(c, appendTo);
+            appendTo.append(c);
     }
 

trunk/Source/WebCore/html/parser/HTMLEntityParser.cpp

@@ -69 +69 @@
     }
 
-    inline static void convertToUTF16(UChar32 value, StringBuilder& decodedEntity)
-    {
-        if (U_IS_BMP(value)) {
-            UChar character = static_cast<UChar>(value);
-            ASSERT(character == value);
-            decodedEntity.append(character);
-            return;
-        }
-        decodedEntity.append(U16_LEAD(value));
-        decodedEntity.append(U16_TRAIL(value));
-    }
-
     inline static bool acceptMalformed() { return true; }
 
@@ -126 +114 @@
             || !additionalAllowedCharacter
             || !(isAlphaNumeric(cc) || cc == '=')) {
-            convertToUTF16(entitySearch.mostRecentMatch()->firstValue, decodedEntity);
+            decodedEntity.append(entitySearch.mostRecentMatch()->firstValue);
             if (entitySearch.mostRecentMatch()->secondValue)
-                convertToUTF16(entitySearch.mostRecentMatch()->secondValue, decodedEntity);
+                decodedEntity.append(entitySearch.mostRecentMatch()->secondValue);
             return true;
         }

trunk/Source/WebCore/svg/SVGFontData.cpp

@@ -292 +292 @@
     mirroredCharacters.reserveCapacity(length);
 
-    UChar32 character;
     unsigned i = 0;
     while (i < length) {
+        UChar32 character;
         U16_NEXT(characters, i, length, character);
-        character = mirroredChar(character);
-
-        if (U16_LENGTH(character) == 1)
-            mirroredCharacters.append(static_cast<UChar>(character));
-        else {
-            mirroredCharacters.append(U16_LEAD(character));
-            mirroredCharacters.append(U16_TRAIL(character));
-        }
+        mirroredCharacters.append(mirroredChar(character));
     }
 

trunk/Source/WebCore/xml/parser/CharacterReferenceParserInlines.h

@@ -129 +129 @@
             else if (cc == ';') {
                 source.advanceAndASSERT(cc);
-                ParserFunctions::convertToUTF16(ParserFunctions::legalEntityFor(result), decodedCharacter);
+                decodedCharacter.append(ParserFunctions::legalEntityFor(result));
                 return true;
             } else if (ParserFunctions::acceptMalformed()) {
-                ParserFunctions::convertToUTF16(ParserFunctions::legalEntityFor(result), decodedCharacter);
+                decodedCharacter.append(ParserFunctions::legalEntityFor(result));
                 return true;
             } else {
@@ -145 +145 @@
             else if (cc == ';') {
                 source.advanceAndASSERT(cc);
-                ParserFunctions::convertToUTF16(ParserFunctions::legalEntityFor(result), decodedCharacter);
+                decodedCharacter.append(ParserFunctions::legalEntityFor(result));
                 return true;
             } else if (ParserFunctions::acceptMalformed()) {
-                ParserFunctions::convertToUTF16(ParserFunctions::legalEntityFor(result), decodedCharacter);
+                decodedCharacter.append(ParserFunctions::legalEntityFor(result));
                 return true;
             } else {

trunk/Tools/ChangeLog

@@ +1 @@
+2013-01-24  Martin Robinson  <mrobinson@igalia.com>
+
+        Abstract the logic for appending a UChar32 onto StringBuilder
+        https://bugs.webkit.org/show_bug.cgi?id=107505
+
+        Reviewed by Darin Adler.
+
+        * TestWebKitAPI/Tests/WTF/StringBuilder.cpp:
+        (TestWebKitAPI::TEST): Added a simple test for appending UChar32.
+
 2013-01-24  Erik Arvidsson  <arv@chromium.org>
 

trunk/Tools/TestWebKitAPI/Tests/WTF/StringBuilder.cpp

@@ -34 +34 @@
 namespace TestWebKitAPI {
 
-void expectBuilderContent(const char* expected, const StringBuilder& builder)
+static void expectBuilderContent(const String& expected, const StringBuilder& builder)
 {
     // Not using builder.toString() or builder.toStringPreserveCapacity() because they all
     // change internal state of builder.
-    EXPECT_EQ(String(expected), String(builder.characters(), builder.length()));
+    EXPECT_EQ(expected, String(builder.characters(), builder.length()));
 }
 
@@ -86 +86 @@
     builder2.append("abcd");
     ASSERT_EQ(characters, builder2.characters());
+
+    // Test appending UChar32 characters to StringBuilder.
+    StringBuilder builderForUChar32Append;
+    UChar32 frakturAChar = 0x1D504;
+    builderForUChar32Append.append(frakturAChar); // The fraktur A is not in the BMP, so it's two UTF-16 code units long.
+    ASSERT_EQ(2U, builderForUChar32Append.length());
+    builderForUChar32Append.append(static_cast<UChar32>('A'));
+    ASSERT_EQ(3U, builderForUChar32Append.length());
+    const UChar resultArray[] = { U16_LEAD(frakturAChar), U16_TRAIL(frakturAChar), 'A' };
+    expectBuilderContent(String(resultArray, WTF_ARRAY_LENGTH(resultArray)), builderForUChar32Append);
 }