Title: [128014] trunk/Source
Revision
128014
Author
[email protected]
Date
2012-09-09 21:19:34 -0700 (Sun, 09 Sep 2012)

Log Message

Add StringBuilder::appendNumber() and use it
https://bugs.webkit.org/show_bug.cgi?id=96030

Reviewed by Eric Seidel.

Also fix a bunch of append() vs. appendLiteral() issues in the surrounding code.

Source/_javascript_Core:

* API/JSContextRef.cpp:
(JSContextCreateBacktrace):
* _javascript_Core.vcproj/_javascript_Core/_javascript_Core.def:
* interpreter/Interpreter.h:
(JSC::StackFrame::toString):

Source/WebCore:

* Modules/websockets/WebSocketHandshake.cpp:
(WebCore::hostName):
* bindings/v8/ScriptController.cpp:
(WebCore::resourceString):
* css/FontFeatureValue.cpp:
(WebCore::FontFeatureValue::customCssText):
* dom/Position.cpp:
(WebCore::Position::formatForDebugger):
* dom/Range.cpp:
(WebCore::Range::formatForDebugger):
* html/FormController.cpp:
(WebCore::FormKeyGenerator::formKey):
* html/HTMLAnchorElement.cpp:
(WebCore::appendServerMapMousePosition):
* html/canvas/CanvasRenderingContext2D.cpp:
(WebCore::CanvasRenderingContext2D::font):
* inspector/IdentifiersFactory.cpp:
(WebCore::IdentifiersFactory::addProcessIdPrefixTo):
* page/FrameTree.cpp:
(WebCore::FrameTree::uniqueChildName):
* page/SecurityOrigin.cpp:
(WebCore::SecurityOrigin::toRawString):
* platform/Decimal.cpp:
(WebCore::Decimal::toString):
* platform/network/ProxyServer.cpp:
(WebCore::appendProxyServerString):
* platform/text/TextStream.cpp:
(WebCore::TextStream::operator<<):
* platform/text/TextStream.h:
* rendering/RenderTreeAsText.cpp:
(WebCore::nodePosition):
* xml/XMLErrors.cpp:
(WebCore::XMLErrors::appendErrorMessage):

Source/WTF:

* wtf/DateMath.cpp:
(WTF::makeRFC2822DateString):
* wtf/text/StringBuilder.cpp:
(WTF::StringBuilder::appendNumber):
* wtf/text/StringBuilder.h:
(StringBuilder):

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/API/JSContextRef.cpp (128013 => 128014)


--- trunk/Source/_javascript_Core/API/JSContextRef.cpp	2012-09-10 03:34:30 UTC (rev 128013)
+++ trunk/Source/_javascript_Core/API/JSContextRef.cpp	2012-09-10 04:19:34 UTC (rev 128014)
@@ -200,15 +200,15 @@
         }
         unsigned lineNumber = signedLineNumber >= 0 ? signedLineNumber : 0;
         if (!builder.isEmpty())
-            builder.append("\n");
-        builder.append("#");
+            builder.append('\n');
+        builder.append('#');
         builder.append(levelStr);
-        builder.append(" ");
+        builder.append(' ');
         builder.append(functionName);
-        builder.append("() at ");
+        builder.appendLiteral("() at ");
         builder.append(urlString);
-        builder.append(":");
-        builder.append(String::number(lineNumber));
+        builder.append(':');
+        builder.appendNumber(lineNumber);
         if (!function || ++count == maxStackSize)
             break;
         callFrame = callFrame->callerFrame();

Modified: trunk/Source/_javascript_Core/ChangeLog (128013 => 128014)


--- trunk/Source/_javascript_Core/ChangeLog	2012-09-10 03:34:30 UTC (rev 128013)
+++ trunk/Source/_javascript_Core/ChangeLog	2012-09-10 04:19:34 UTC (rev 128014)
@@ -1,5 +1,20 @@
 2012-09-09  Patrick Gansterer  <[email protected]>
 
+        Add StringBuilder::appendNumber() and use it
+        https://bugs.webkit.org/show_bug.cgi?id=96030
+
+        Reviewed by Eric Seidel.
+
+        Also fix a bunch of append() vs. appendLiteral() issues in the surrounding code.
+
+        * API/JSContextRef.cpp:
+        (JSContextCreateBacktrace):
+        * _javascript_Core.vcproj/_javascript_Core/_javascript_Core.def:
+        * interpreter/Interpreter.h:
+        (JSC::StackFrame::toString):
+
+2012-09-09  Patrick Gansterer  <[email protected]>
+
         Make the String initialization on the function side of String::number()
         https://bugs.webkit.org/show_bug.cgi?id=95940
 

Modified: trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_Core.def (128013 => 128014)


--- trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_Core.def	2012-09-10 03:34:30 UTC (rev 128013)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_Core.def	2012-09-10 04:19:34 UTC (rev 128014)
@@ -66,6 +66,12 @@
     ?allocateSlowCase@MarkedAllocator@JSC@@AAEPAXXZ
     ?append@StringBuilder@WTF@@QAEXPBEI@Z
     ?append@StringBuilder@WTF@@QAEXPB_WI@Z
+    ?appendNumber@StringBuilder@WTF@@QAEXH@Z
+    ?appendNumber@StringBuilder@WTF@@QAEXI@Z
+    ?appendNumber@StringBuilder@WTF@@QAEXJ@Z
+    ?appendNumber@StringBuilder@WTF@@QAEXK@Z
+    ?appendNumber@StringBuilder@WTF@@QAEX_J@Z
+    ?appendNumber@StringBuilder@WTF@@QAEX_K@Z
     ?attach@Debugger@JSC@@QAEXPAVJSGlobalObject@2@@Z
     ?base64Decode@WTF@@YA_NABVString@1@AAV?$Vector@D$0A@@1@W4Base64DecodePolicy@1@@Z
     ?base64Encode@WTF@@YA?AVString@1@PBDIW4Base64EncodePolicy@1@@Z

Modified: trunk/Source/_javascript_Core/interpreter/Interpreter.h (128013 => 128014)


--- trunk/Source/_javascript_Core/interpreter/Interpreter.h	2012-09-10 03:34:30 UTC (rev 128013)
+++ trunk/Source/_javascript_Core/interpreter/Interpreter.h	2012-09-10 04:19:34 UTC (rev 128014)
@@ -92,7 +92,7 @@
                 traceBuild.append(sourceURL);
                 if (line > -1) {
                     traceBuild.append(':');
-                    traceBuild.append(String::number(line));
+                    traceBuild.appendNumber(line);
                 }
             }
             return traceBuild.toString().impl();

Modified: trunk/Source/WTF/ChangeLog (128013 => 128014)


--- trunk/Source/WTF/ChangeLog	2012-09-10 03:34:30 UTC (rev 128013)
+++ trunk/Source/WTF/ChangeLog	2012-09-10 04:19:34 UTC (rev 128014)
@@ -1,5 +1,21 @@
 2012-09-09  Patrick Gansterer  <[email protected]>
 
+        Add StringBuilder::appendNumber() and use it
+        https://bugs.webkit.org/show_bug.cgi?id=96030
+
+        Reviewed by Eric Seidel.
+
+        Also fix a bunch of append() vs. appendLiteral() issues in the surrounding code.
+
+        * wtf/DateMath.cpp:
+        (WTF::makeRFC2822DateString):
+        * wtf/text/StringBuilder.cpp:
+        (WTF::StringBuilder::appendNumber):
+        * wtf/text/StringBuilder.h:
+        (StringBuilder):
+
+2012-09-09  Patrick Gansterer  <[email protected]>
+
         Make the String initialization on the function side of String::number()
         https://bugs.webkit.org/show_bug.cgi?id=95940
 

Modified: trunk/Source/WTF/wtf/DateMath.cpp (128013 => 128014)


--- trunk/Source/WTF/wtf/DateMath.cpp	2012-09-10 03:34:30 UTC (rev 128013)
+++ trunk/Source/WTF/wtf/DateMath.cpp	2012-09-10 04:19:34 UTC (rev 128014)
@@ -1072,13 +1072,13 @@
 {
     StringBuilder stringBuilder;
     stringBuilder.append(weekdayName[dayOfWeek]);
-    stringBuilder.append(", ");
-    stringBuilder.append(String::number(day));
-    stringBuilder.append(" ");
+    stringBuilder.appendLiteral(", ");
+    stringBuilder.appendNumber(day);
+    stringBuilder.append(' ');
     stringBuilder.append(monthName[month]);
-    stringBuilder.append(" ");
-    stringBuilder.append(String::number(year));
-    stringBuilder.append(" ");
+    stringBuilder.append(' ');
+    stringBuilder.appendNumber(year);
+    stringBuilder.append(' ');
 
     stringBuilder.append(twoDigitStringFromNumber(hours));
     stringBuilder.append(':');
@@ -1087,7 +1087,7 @@
     stringBuilder.append(twoDigitStringFromNumber(seconds));
     stringBuilder.append(' ');
 
-    stringBuilder.append(utcOffset > 0 ? "+" : "-");
+    stringBuilder.append(utcOffset > 0 ? '+' : '-');
     int absoluteUTCOffset = abs(utcOffset);
     stringBuilder.append(twoDigitStringFromNumber(absoluteUTCOffset / 60));
     stringBuilder.append(twoDigitStringFromNumber(absoluteUTCOffset % 60));

Modified: trunk/Source/WTF/wtf/text/StringBuilder.cpp (128013 => 128014)


--- trunk/Source/WTF/wtf/text/StringBuilder.cpp	2012-09-10 03:34:30 UTC (rev 128013)
+++ trunk/Source/WTF/wtf/text/StringBuilder.cpp	2012-09-10 04:19:34 UTC (rev 128014)
@@ -27,6 +27,7 @@
 #include "config.h"
 #include "StringBuilder.h"
 
+#include "IntegerToStringConversion.h"
 #include "WTFString.h"
 
 namespace WTF {
@@ -286,6 +287,36 @@
     }
 }
 
+void StringBuilder::appendNumber(int number)
+{
+    numberToStringSigned<StringBuilder>(number, this);
+}
+
+void StringBuilder::appendNumber(unsigned int number)
+{
+    numberToStringUnsigned<StringBuilder>(number, this);
+}
+
+void StringBuilder::appendNumber(long number)
+{
+    numberToStringSigned<StringBuilder>(number, this);
+}
+
+void StringBuilder::appendNumber(unsigned long number)
+{
+    numberToStringUnsigned<StringBuilder>(number, this);
+}
+
+void StringBuilder::appendNumber(long long number)
+{
+    numberToStringSigned<StringBuilder>(number, this);
+}
+
+void StringBuilder::appendNumber(unsigned long long number)
+{
+    numberToStringUnsigned<StringBuilder>(number, this);
+}
+
 bool StringBuilder::canShrink() const
 {
     // Only shrink the buffer if it's less than 80% full. Need to tune this heuristic!

Modified: trunk/Source/WTF/wtf/text/StringBuilder.h (128013 => 128014)


--- trunk/Source/WTF/wtf/text/StringBuilder.h	2012-09-10 03:34:30 UTC (rev 128013)
+++ trunk/Source/WTF/wtf/text/StringBuilder.h	2012-09-10 04:19:34 UTC (rev 128014)
@@ -124,7 +124,7 @@
         } else
             append(&c, 1);
     }
-    
+
     void append(char c)
     {
         append(static_cast<LChar>(c));
@@ -133,6 +133,13 @@
     template<unsigned charactersCount>
     ALWAYS_INLINE void appendLiteral(const char (&characters)[charactersCount]) { append(characters, charactersCount - 1); }
 
+    WTF_EXPORT_PRIVATE void appendNumber(int);
+    WTF_EXPORT_PRIVATE void appendNumber(unsigned int);
+    WTF_EXPORT_PRIVATE void appendNumber(long);
+    WTF_EXPORT_PRIVATE void appendNumber(unsigned long);
+    WTF_EXPORT_PRIVATE void appendNumber(long long);
+    WTF_EXPORT_PRIVATE void appendNumber(unsigned long long);
+
     String toString()
     {
         shrinkToFit();

Modified: trunk/Source/WebCore/ChangeLog (128013 => 128014)


--- trunk/Source/WebCore/ChangeLog	2012-09-10 03:34:30 UTC (rev 128013)
+++ trunk/Source/WebCore/ChangeLog	2012-09-10 04:19:34 UTC (rev 128014)
@@ -1,3 +1,46 @@
+2012-09-09  Patrick Gansterer  <[email protected]>
+
+        Add StringBuilder::appendNumber() and use it
+        https://bugs.webkit.org/show_bug.cgi?id=96030
+
+        Reviewed by Eric Seidel.
+
+        Also fix a bunch of append() vs. appendLiteral() issues in the surrounding code.
+
+        * Modules/websockets/WebSocketHandshake.cpp:
+        (WebCore::hostName):
+        * bindings/v8/ScriptController.cpp:
+        (WebCore::resourceString):
+        * css/FontFeatureValue.cpp:
+        (WebCore::FontFeatureValue::customCssText):
+        * dom/Position.cpp:
+        (WebCore::Position::formatForDebugger):
+        * dom/Range.cpp:
+        (WebCore::Range::formatForDebugger):
+        * html/FormController.cpp:
+        (WebCore::FormKeyGenerator::formKey):
+        * html/HTMLAnchorElement.cpp:
+        (WebCore::appendServerMapMousePosition):
+        * html/canvas/CanvasRenderingContext2D.cpp:
+        (WebCore::CanvasRenderingContext2D::font):
+        * inspector/IdentifiersFactory.cpp:
+        (WebCore::IdentifiersFactory::addProcessIdPrefixTo):
+        * page/FrameTree.cpp:
+        (WebCore::FrameTree::uniqueChildName):
+        * page/SecurityOrigin.cpp:
+        (WebCore::SecurityOrigin::toRawString):
+        * platform/Decimal.cpp:
+        (WebCore::Decimal::toString):
+        * platform/network/ProxyServer.cpp:
+        (WebCore::appendProxyServerString):
+        * platform/text/TextStream.cpp:
+        (WebCore::TextStream::operator<<):
+        * platform/text/TextStream.h:
+        * rendering/RenderTreeAsText.cpp:
+        (WebCore::nodePosition):
+        * xml/XMLErrors.cpp:
+        (WebCore::XMLErrors::appendErrorMessage):
+
 2012-09-09  KyungTae Kim  <[email protected]>
 
         [EFL] Wrong rendering results for square-button-appearance.html

Modified: trunk/Source/WebCore/Modules/websockets/WebSocketHandshake.cpp (128013 => 128014)


--- trunk/Source/WebCore/Modules/websockets/WebSocketHandshake.cpp	2012-09-10 03:34:30 UTC (rev 128013)
+++ trunk/Source/WebCore/Modules/websockets/WebSocketHandshake.cpp	2012-09-10 04:19:34 UTC (rev 128014)
@@ -85,7 +85,7 @@
     builder.append(url.host().lower());
     if (url.port() && ((!secure && url.port() != 80) || (secure && url.port() != 443))) {
         builder.append(':');
-        builder.append(String::number(url.port()));
+        builder.appendNumber(url.port());
     }
     return builder.toString();
 }

Modified: trunk/Source/WebCore/bindings/v8/ScriptController.cpp (128013 => 128014)


--- trunk/Source/WebCore/bindings/v8/ScriptController.cpp	2012-09-10 03:34:30 UTC (rev 128013)
+++ trunk/Source/WebCore/bindings/v8/ScriptController.cpp	2012-09-10 04:19:34 UTC (rev 128014)
@@ -220,7 +220,7 @@
     StringBuilder builder;
     builder.append(resourceName);
     builder.append(':');
-    builder.append(String::number(lineNumber));
+    builder.appendNumber(lineNumber);
     return builder.toString();
 }
 

Modified: trunk/Source/WebCore/css/FontFeatureValue.cpp (128013 => 128014)


--- trunk/Source/WebCore/css/FontFeatureValue.cpp	2012-09-10 03:34:30 UTC (rev 128013)
+++ trunk/Source/WebCore/css/FontFeatureValue.cpp	2012-09-10 04:19:34 UTC (rev 128014)
@@ -43,10 +43,10 @@
 String FontFeatureValue::customCssText() const
 {
     StringBuilder builder;
-    builder.append("'");
+    builder.append('\'');
     builder.append(m_tag);
-    builder.append("' ");
-    builder.append(String::number(m_value));
+    builder.appendLiteral("' ");
+    builder.appendNumber(m_value);
     return builder.toString();
 }
 

Modified: trunk/Source/WebCore/dom/Position.cpp (128013 => 128014)


--- trunk/Source/WebCore/dom/Position.cpp	2012-09-10 03:34:30 UTC (rev 128013)
+++ trunk/Source/WebCore/dom/Position.cpp	2012-09-10 04:19:34 UTC (rev 128014)
@@ -1321,7 +1321,7 @@
     else {
         char s[1024];
         result.appendLiteral("offset ");
-        result.append(String::number(m_offset));
+        result.appendNumber(m_offset);
         result.appendLiteral(" of ");
         deprecatedNode()->formatForDebugger(s, sizeof(s));
         result.append(s);

Modified: trunk/Source/WebCore/dom/Range.cpp (128013 => 128014)


--- trunk/Source/WebCore/dom/Range.cpp	2012-09-10 03:34:30 UTC (rev 128013)
+++ trunk/Source/WebCore/dom/Range.cpp	2012-09-10 04:19:34 UTC (rev 128014)
@@ -1663,12 +1663,12 @@
         const int FormatBufferSize = 1024;
         char s[FormatBufferSize];
         result.appendLiteral("from offset ");
-        result.append(String::number(m_start.offset()));
+        result.appendNumber(m_start.offset());
         result.appendLiteral(" of ");
         m_start.container()->formatForDebugger(s, FormatBufferSize);
         result.append(s);
         result.appendLiteral(" to offset ");
-        result.append(String::number(m_end.offset()));
+        result.appendNumber(m_end.offset());
         result.appendLiteral(" of ");
         m_end.container()->formatForDebugger(s, FormatBufferSize);
         result.append(s);

Modified: trunk/Source/WebCore/html/FormController.cpp (128013 => 128014)


--- trunk/Source/WebCore/html/FormController.cpp	2012-09-10 03:34:30 UTC (rev 128013)
+++ trunk/Source/WebCore/html/FormController.cpp	2012-09-10 04:19:34 UTC (rev 128014)
@@ -358,8 +358,8 @@
 
     StringBuilder builder;
     builder.append(signature);
-    builder.append(" #");
-    builder.append(String::number(nextIndex));
+    builder.appendLiteral(" #");
+    builder.appendNumber(nextIndex);
     AtomicString formKey = builder.toAtomicString();
     m_formToKeyMap.add(form, formKey);
     return formKey;

Modified: trunk/Source/WebCore/html/HTMLAnchorElement.cpp (128013 => 128014)


--- trunk/Source/WebCore/html/HTMLAnchorElement.cpp	2012-09-10 03:34:30 UTC (rev 128013)
+++ trunk/Source/WebCore/html/HTMLAnchorElement.cpp	2012-09-10 04:19:34 UTC (rev 128014)
@@ -145,9 +145,9 @@
     int x = absolutePosition.x();
     int y = absolutePosition.y();
     url.append('?');
-    url.append(String::number(x));
+    url.appendNumber(x);
     url.append(',');
-    url.append(String::number(y));
+    url.appendNumber(y);
 }
 
 void HTMLAnchorElement::defaultEventHandler(Event* event)

Modified: trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp (128013 => 128014)


--- trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp	2012-09-10 03:34:30 UTC (rev 128013)
+++ trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp	2012-09-10 04:19:34 UTC (rev 128014)
@@ -2001,7 +2001,7 @@
     if (fontDescription.smallCaps() == FontSmallCapsOn)
         serializedFont.appendLiteral("small-caps ");
 
-    serializedFont.append(String::number(fontDescription.computedPixelSize()));
+    serializedFont.appendNumber(fontDescription.computedPixelSize());
     serializedFont.appendLiteral("px");
 
     const FontFamily& firstFontFamily = fontDescription.family();

Modified: trunk/Source/WebCore/inspector/IdentifiersFactory.cpp (128013 => 128014)


--- trunk/Source/WebCore/inspector/IdentifiersFactory.cpp	2012-09-10 03:34:30 UTC (rev 128013)
+++ trunk/Source/WebCore/inspector/IdentifiersFactory.cpp	2012-09-10 04:19:34 UTC (rev 128014)
@@ -56,8 +56,8 @@
 String IdentifiersFactory::addProcessIdPrefixTo(const String& id)
 {
     StringBuilder builder;
-    builder.append(String::number(s_processId));
-    builder.append(".");
+    builder.appendNumber(s_processId);
+    builder.append('.');
     builder.append(id);
     return builder.toString();
 }

Modified: trunk/Source/WebCore/page/FrameTree.cpp (128013 => 128014)


--- trunk/Source/WebCore/page/FrameTree.cpp	2012-09-10 03:34:30 UTC (rev 128013)
+++ trunk/Source/WebCore/page/FrameTree.cpp	2012-09-10 04:19:34 UTC (rev 128014)
@@ -164,7 +164,7 @@
     }
 
     name.appendLiteral("/<!--frame");
-    name.append(String::number(childCount()));
+    name.appendNumber(childCount());
     name.appendLiteral("-->-->");
 
     return name.toAtomicString();

Modified: trunk/Source/WebCore/page/SecurityOrigin.cpp (128013 => 128014)


--- trunk/Source/WebCore/page/SecurityOrigin.cpp	2012-09-10 03:34:30 UTC (rev 128013)
+++ trunk/Source/WebCore/page/SecurityOrigin.cpp	2012-09-10 04:19:34 UTC (rev 128014)
@@ -472,8 +472,8 @@
     result.append(m_host);
 
     if (m_port) {
-        result.append(":");
-        result.append(String::number(m_port));
+        result.append(':');
+        result.appendNumber(m_port);
     }
 
     return result.toString();

Modified: trunk/Source/WebCore/platform/Decimal.cpp (128013 => 128014)


--- trunk/Source/WebCore/platform/Decimal.cpp	2012-09-10 03:34:30 UTC (rev 128013)
+++ trunk/Source/WebCore/platform/Decimal.cpp	2012-09-10 04:19:34 UTC (rev 128014)
@@ -1002,7 +1002,7 @@
             return builder.toString();
         }
 
-        builder.append("0.");
+        builder.appendLiteral("0.");
         for (int i = adjustedExponent + 1; i < 0; ++i)
             builder.append('0');
 
@@ -1020,7 +1020,7 @@
 
         if (adjustedExponent) {
             builder.append(adjustedExponent < 0 ? "e" : "e+");
-            builder.append(String::number(adjustedExponent));
+            builder.appendNumber(adjustedExponent);
         }
     }
     return builder.toString();

Modified: trunk/Source/WebCore/platform/network/ProxyServer.cpp (128013 => 128014)


--- trunk/Source/WebCore/platform/network/ProxyServer.cpp	2012-09-10 03:34:30 UTC (rev 128013)
+++ trunk/Source/WebCore/platform/network/ProxyServer.cpp	2012-09-10 04:19:34 UTC (rev 128014)
@@ -52,7 +52,7 @@
 
     builder.append(':');
     ASSERT(proxyServer.port() != -1);
-    builder.append(String::number(proxyServer.port()));
+    builder.appendNumber(proxyServer.port());
 }
 
 String toString(const Vector<ProxyServer>& proxyServers)

Modified: trunk/Source/WebCore/platform/text/TextStream.cpp (128013 => 128014)


--- trunk/Source/WebCore/platform/text/TextStream.cpp	2012-09-10 03:34:30 UTC (rev 128013)
+++ trunk/Source/WebCore/platform/text/TextStream.cpp	2012-09-10 04:19:34 UTC (rev 128014)
@@ -42,28 +42,40 @@
 
 TextStream& TextStream::operator<<(int i)
 {
-    m_text.append(String::number(i));
+    m_text.appendNumber(i);
     return *this;
 }
 
 TextStream& TextStream::operator<<(unsigned i)
 {
-    m_text.append(String::number(i));
+    m_text.appendNumber(i);
     return *this;
 }
 
 TextStream& TextStream::operator<<(long i)
 {
-    m_text.append(String::number(i));
+    m_text.appendNumber(i);
     return *this;
 }
 
 TextStream& TextStream::operator<<(unsigned long i)
 {
-    m_text.append(String::number(i));
+    m_text.appendNumber(i);
     return *this;
 }
 
+TextStream& TextStream::operator<<(long long i)
+{
+    m_text.appendNumber(i);
+    return *this;
+}
+
+TextStream& TextStream::operator<<(unsigned long long i)
+{
+    m_text.appendNumber(i);
+    return *this;
+}
+
 TextStream& TextStream::operator<<(float f)
 {
     m_text.append(String::number(f, ShouldRoundDecimalPlaces, 2));
@@ -102,19 +114,4 @@
     return result;
 }
 
-#if OS(WINDOWS) && CPU(X86_64)
-TextStream& TextStream::operator<<(__int64 i)
-{
-    char buffer[printBufferSize];
-    snprintf(buffer, sizeof(buffer) - 1, "%I64i", i);
-    return *this << buffer;
 }
-TextStream& TextStream::operator<<(unsigned __int64 i)
-{
-    char buffer[printBufferSize];
-    snprintf(buffer, sizeof(buffer) - 1, "%I64u", i);
-    return *this << buffer;
-}
-#endif
-
-}

Modified: trunk/Source/WebCore/platform/text/TextStream.h (128013 => 128014)


--- trunk/Source/WebCore/platform/text/TextStream.h	2012-09-10 03:34:30 UTC (rev 128013)
+++ trunk/Source/WebCore/platform/text/TextStream.h	2012-09-10 04:19:34 UTC (rev 128014)
@@ -39,15 +39,13 @@
     TextStream& operator<<(unsigned);
     TextStream& operator<<(long);
     TextStream& operator<<(unsigned long);
+    TextStream& operator<<(long long);
+    TextStream& operator<<(unsigned long long);
     TextStream& operator<<(float);
     TextStream& operator<<(double);
     TextStream& operator<<(const char*);
     TextStream& operator<<(const void*);
     TextStream& operator<<(const String&);
-#if OS(WINDOWS) && CPU(X86_64)
-    TextStream& operator<<(unsigned __int64);
-    TextStream& operator<<(__int64);
-#endif
 
     String release();
 

Modified: trunk/Source/WebCore/rendering/RenderTreeAsText.cpp (128013 => 128014)


--- trunk/Source/WebCore/rendering/RenderTreeAsText.cpp	2012-09-10 03:34:30 UTC (rev 128013)
+++ trunk/Source/WebCore/rendering/RenderTreeAsText.cpp	2012-09-10 04:19:34 UTC (rev 128014)
@@ -809,7 +809,7 @@
                 result.append('}');
             } else {
                 result.appendLiteral("child ");
-                result.append(String::number(n->nodeIndex()));
+                result.appendNumber(n->nodeIndex());
                 result.appendLiteral(" {");
                 result.append(getTagName(n));
                 result.append('}');

Modified: trunk/Source/WebCore/xml/XMLErrors.cpp (128013 => 128014)


--- trunk/Source/WebCore/xml/XMLErrors.cpp	2012-09-10 03:34:30 UTC (rev 128013)
+++ trunk/Source/WebCore/xml/XMLErrors.cpp	2012-09-10 04:19:34 UTC (rev 128014)
@@ -79,11 +79,11 @@
 {
     // <typeString> on line <lineNumber> at column <columnNumber>: <message>
     m_errorMessages.append(typeString);
-    m_errorMessages.append(" on line ");
-    m_errorMessages.append(String::number(position.m_line.oneBasedInt()));
-    m_errorMessages.append(" at column ");
-    m_errorMessages.append(String::number(position.m_column.oneBasedInt()));
-    m_errorMessages.append(": ");
+    m_errorMessages.appendLiteral(" on line ");
+    m_errorMessages.appendNumber(position.m_line.oneBasedInt());
+    m_errorMessages.appendLiteral(" at column ");
+    m_errorMessages.appendNumber(position.m_column.oneBasedInt());
+    m_errorMessages.appendLiteral(": ");
     m_errorMessages.append(message);
 }
 
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to