Imported WebKit commit 68645295d2e3e09af2c942f092556f06aa5f8b0d (http://svn.webkit.org/repository/webkit/trunk@128073)

New snapshot

1 files changed, 17 insertions, 16 deletions

diff --git a/Source/WebCore/css/CSSLineBoxContainValue.cpp b/Source/WebCore/css/CSSLineBoxContainValue.cpp
index 85f385d71..24c08b400 100644
--- a/Source/WebCore/css/CSSLineBoxContainValue.cpp
+++ b/Source/WebCore/css/CSSLineBoxContainValue.cpp
@@ -27,8 +27,9 @@
 #include "CSSLineBoxContainValue.h"
 
 #include "CSSPrimitiveValue.h"
-#include "MemoryInstrumentation.h"
-#include "PlatformString.h"
+#include "WebCoreMemoryInstrumentation.h"
+#include <wtf/text/StringBuilder.h>
+#include <wtf/text/WTFString.h>
 
 namespace WebCore {
 
@@ -40,42 +41,42 @@ CSSLineBoxContainValue::CSSLineBoxContainValue(unsigned value)
 
 String CSSLineBoxContainValue::customCssText() const
 {
-    String text("");
+    StringBuilder text;
 
     if (m_value & LineBoxContainBlock)
-        text += "block";
+        text.appendLiteral("block");
     if (m_value & LineBoxContainInline) {
         if (!text.isEmpty())
-            text += " ";
-        text += "inline";
+            text.append(' ');
+        text.appendLiteral("inline");
     }
     if (m_value & LineBoxContainFont) {
         if (!text.isEmpty())
-            text += " ";
-        text += "font";
+            text.append(' ');
+        text.appendLiteral("font");
     }
     if (m_value & LineBoxContainGlyphs) {
         if (!text.isEmpty())
-            text += " ";
-        text += "glyphs";
+            text.append(' ');
+        text.appendLiteral("glyphs");
     }
     if (m_value & LineBoxContainReplaced) {
         if (!text.isEmpty())
-            text += " ";
-        text += "replaced";
+            text.append(' ');
+        text.appendLiteral("replaced");
     }
     if (m_value & LineBoxContainInlineBox) {
         if (!text.isEmpty())
-            text += " ";
-        text += "inline-box";
+            text.append(' ');
+        text.appendLiteral("inline-box");
     }
 
-    return text;
+    return text.toString();
 }
 
 void CSSLineBoxContainValue::reportDescendantMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
 {
-    MemoryClassInfo info(memoryObjectInfo, this, MemoryInstrumentation::CSS);
+    MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CSS);
 }
 
 }