Changeset 127392 in webkit

Timestamp:

Sep 2, 2012 1:26:26 PM (12 years ago)

Author:

benjamin@webkit.org

Message:

Improve the way we use convertedSpaceString() in convertHTMLTextToInterchangeFormat()
​https://bugs.webkit.org/show_bug.cgi?id=95301

Patch by Benjamin Poulain <​bpoulain@apple.com> on 2012-09-02
Reviewed by Darin Adler.

The static string convertedSpaceString() had a couple of annoying side effects:
-The string was 16bits due to noBreakSpace, which forced any input to be converted to 16bits.
-The string was kept in the heap for no particular reason.

This patch redefines convertedSpaceString as a constant literal so that we can use it efficiently.

The patch also make the binary a tiny bit smaller (700 bytes).

• editing/HTMLInterchange.cpp:

(WebCore::convertHTMLTextToInterchangeFormat):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• editing/HTMLInterchange.cpp (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-09-02  Benjamin Poulain  <bpoulain@apple.com>
+
+        Improve the way we use convertedSpaceString() in convertHTMLTextToInterchangeFormat()
+        https://bugs.webkit.org/show_bug.cgi?id=95301
+
+        Reviewed by Darin Adler.
+
+        The static string convertedSpaceString() had a couple of annoying side effects:
+        -The string was 16bits due to noBreakSpace, which forced any input to be converted to 16bits.
+        -The string was kept in the heap for no particular reason.
+
+        This patch redefines convertedSpaceString as a constant literal so that we can use it efficiently.
+
+        The patch also make the binary a tiny bit smaller (700 bytes).
+
+        * editing/HTMLInterchange.cpp:
+        (WebCore::convertHTMLTextToInterchangeFormat):
+
 2012-09-02  Mike West  <mkwst@chromium.org>
 

trunk/Source/WebCore/editing/HTMLInterchange.cpp

@@ -36 +36 @@
 namespace WebCore {
 
-static String convertedSpaceString()
-{
-    DEFINE_STATIC_LOCAL(String, convertedSpaceString, (String(ASCIILiteral("<span class=\"" AppleConvertedSpace "\">")) + noBreakSpace + "</span>"));
-    return convertedSpaceString;
-}
-
 String convertHTMLTextToInterchangeFormat(const String& in, const Text* node)
 {
@@ -47 +41 @@
     if (node->renderer() && node->renderer()->style()->preserveNewline())
         return in;
+
+    const char convertedSpaceString[] = "<span class=\"" AppleConvertedSpace "\">\xA0</span>";
+    COMPILE_ASSERT((static_cast<unsigned char>('\xA0') == noBreakSpace), ConvertedSpaceStringSpaceIsNoBreakSpace);
 
     StringBuilder s;
@@ -65 +62 @@
                 switch (add) {
                     case 0:
-                        s.append(convertedSpaceString());
+                        s.appendLiteral(convertedSpaceString);
                         s.append(' ');
-                        s.append(convertedSpaceString());
+                        s.appendLiteral(convertedSpaceString);
                         add = 3;
                         break;
                     case 1:
                         if (i == 0 || i + 1 == in.length()) // at start or end of string
-                            s.append(convertedSpaceString());
+                            s.appendLiteral(convertedSpaceString);
                         else
                             s.append(' ');
@@ -79 +76 @@
                         if (i == 0) {
                              // at start of string
-                            s.append(convertedSpaceString());
+                            s.appendLiteral(convertedSpaceString);
                             s.append(' ');
                         } else if (i + 2 == in.length()) {
                              // at end of string
-                            s.append(convertedSpaceString());
-                            s.append(convertedSpaceString());
+                            s.appendLiteral(convertedSpaceString);
+                            s.appendLiteral(convertedSpaceString);
                         } else {
-                            s.append(convertedSpaceString());
+                            s.appendLiteral(convertedSpaceString);
                             s.append(' ');
                         }