Changeset 125990 in webkit

Timestamp:

Aug 19, 2012 8:39:59 PM (12 years ago)

Author:

benjamin@webkit.org

Message:

Remove the static Strings used for outputting values of CSS_ATTR, CSS_COUNTER, CSS_RECT
​https://bugs.webkit.org/show_bug.cgi?id=94420

Reviewed by Kentaro Hara.

Use the new StringBuilder::appendLiteral() instead of keeping some WTF::String in
memory.

The patch reduces memory usage.
It also reduces the binary size (-1672 bytes on x86_64).
I did not measure any difference in performance.

• css/CSSPrimitiveValue.cpp:

(WebCore::CSSPrimitiveValue::customCssText):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/CSSPrimitiveValue.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-08-19  Benjamin Poulain  <benjamin@webkit.org>
+
+        Remove the static Strings used for outputting values of CSS_ATTR, CSS_COUNTER, CSS_RECT
+        https://bugs.webkit.org/show_bug.cgi?id=94420
+
+        Reviewed by Kentaro Hara.
+
+        Use the new StringBuilder::appendLiteral() instead of keeping some WTF::String in
+        memory.
+
+        The patch reduces memory usage.
+        It also reduces the binary size (-1672 bytes on x86_64).
+        I did not measure any difference in performance.
+
+        * css/CSSPrimitiveValue.cpp:
+        (WebCore::CSSPrimitiveValue::customCssText):
+
 2012-08-19  Rik Cabanier  <cabanier@adobe.com>
 

trunk/Source/WebCore/css/CSSPrimitiveValue.cpp

@@ -938 +938 @@
             break;
         case CSS_ATTR: {
-            DEFINE_STATIC_LOCAL(const String, attrParen, ("attr("));
-
             StringBuilder result;
             result.reserveCapacity(6 + m_value.string->length());
-
-            result.append(attrParen);
+            result.appendLiteral("attr(");
             result.append(m_value.string);
             result.append(')');
@@ -956 +953 @@
             break;
         case CSS_COUNTER: {
-            DEFINE_STATIC_LOCAL(const String, counterParen, ("counter("));
-            DEFINE_STATIC_LOCAL(const String, countersParen, ("counters("));
-            DEFINE_STATIC_LOCAL(const String, commaSpace, (", "));
-
             StringBuilder result;
             String separator = m_value.counter->separator();
-            result.append(separator.isEmpty() ? counterParen : countersParen);
+            if (separator.isEmpty())
+                result.appendLiteral("counter(");
+            else
+                result.appendLiteral("counters(");
 
             result.append(m_value.counter->identifier());
             if (!separator.isEmpty()) {
-                result.append(commaSpace);
+                result.appendLiteral(", ");
                 result.append(quoteCSSStringIfNeeded(separator));
             }
             String listStyle = m_value.counter->listStyle();
             if (!listStyle.isEmpty()) {
-                result.append(commaSpace);
+                result.appendLiteral(", ");
                 result.append(listStyle);
             }
@@ -980 +976 @@
         }
         case CSS_RECT: {
-            DEFINE_STATIC_LOCAL(const String, rectParen, ("rect("));
-
             Rect* rectVal = getRectValue();
-            StringBuilder result;
-            result.reserveCapacity(32);
-            result.append(rectParen);
-
-            result.append(rectVal->top()->cssText());
-            result.append(' ');
-
-            result.append(rectVal->right()->cssText());
-            result.append(' ');
-
-            result.append(rectVal->bottom()->cssText());
-            result.append(' ');
-
-            result.append(rectVal->left()->cssText());
-            result.append(')');
-
-            text = result.toString();
+            text = "rect(" + rectVal->top()->cssText() + ' ' + rectVal->right()->cssText() + ' ' + rectVal->bottom()->cssText() + ' ' + rectVal->left()->cssText() + ')';
             break;
         }