<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[51707] trunk/WebCore</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/51707">51707</a></dd>
<dt>Author</dt> <dd>eric@webkit.org</dd>
<dt>Date</dt> <dd>2009-12-04 12:16:02 -0800 (Fri, 04 Dec 2009)</dd>
</dl>

<h3>Log Message</h3>
<pre>2009-12-04  Anton Muhin  &lt;antonm@chromium.org&gt;

        Reviewed by Dmitry Titov.

        Do not use WebCore::String::String(const UChar*, int length) to convert
        short v8 strings.

        Plus added string traits.
        https://bugs.webkit.org/show_bug.cgi?id=31415

        * bindings/v8/V8Binding.cpp:
        (WebCore::):
        (WebCore::v8StringToWebCoreString):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCorebindingsv8V8Bindingcpp">trunk/WebCore/bindings/v8/V8Binding.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (51706 => 51707)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2009-12-04 20:04:32 UTC (rev 51706)
+++ trunk/WebCore/ChangeLog        2009-12-04 20:16:02 UTC (rev 51707)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2009-12-04  Anton Muhin  &lt;antonm@chromium.org&gt;
+
+        Reviewed by Dmitry Titov.
+
+        Do not use WebCore::String::String(const UChar*, int length) to convert
+        short v8 strings.
+
+        Plus added string traits.
+        https://bugs.webkit.org/show_bug.cgi?id=31415
+
+        * bindings/v8/V8Binding.cpp:
+        (WebCore::):
+        (WebCore::v8StringToWebCoreString):
+
</ins><span class="cx"> 2009-12-04  Chris Fleizach  &lt;cfleizach@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Darin Adler.
</span></span></pre></div>
<a id="trunkWebCorebindingsv8V8Bindingcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/bindings/v8/V8Binding.cpp (51706 => 51707)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/bindings/v8/V8Binding.cpp        2009-12-04 20:04:32 UTC (rev 51706)
+++ trunk/WebCore/bindings/v8/V8Binding.cpp        2009-12-04 20:16:02 UTC (rev 51707)
</span><span class="lines">@@ -106,10 +106,6 @@
</span><span class="cx">         return m_atomicString;
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    // Returns right string type based on a dummy parameter.
-    String string(String) { return webcoreString(); }
-    AtomicString string(AtomicString) { return atomicString(); }
-
</del><span class="cx">     static WebCoreStringResource* toStringResource(v8::Handle&lt;v8::String&gt; v8String)
</span><span class="cx">     {
</span><span class="cx">         return static_cast&lt;WebCoreStringResource*&gt;(v8String-&gt;GetExternalStringResource());
</span><span class="lines">@@ -244,12 +240,63 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> 
</span><ins>+template &lt;class S&gt; struct StringTraits
+{
+    static S fromStringResource(WebCoreStringResource* resource);
+
+    static S fromV8String(v8::Handle&lt;v8::String&gt; v8String, int length);
+};
+
+template&lt;&gt;
+struct StringTraits&lt;String&gt;
+{
+    static String fromStringResource(WebCoreStringResource* resource)
+    {
+        return resource-&gt;webcoreString();
+    }
+
+    static String fromV8String(v8::Handle&lt;v8::String&gt; v8String, int length)
+    {
+        ASSERT(v8String-&gt;Length() == length);
+        // NOTE: as of now, String(const UChar*, int) performs String::createUninitialized
+        // anyway, so no need to optimize like we do for AtomicString below.
+        UChar* buffer;
+        String result = String::createUninitialized(length, buffer);
+        v8String-&gt;Write(reinterpret_cast&lt;uint16_t*&gt;(buffer), 0, length);
+        return result;
+    }
+};
+
+template&lt;&gt;
+struct StringTraits&lt;AtomicString&gt;
+{
+    static AtomicString fromStringResource(WebCoreStringResource* resource)
+    {
+        return resource-&gt;atomicString();
+    }
+
+    static AtomicString fromV8String(v8::Handle&lt;v8::String&gt; v8String, int length)
+    {
+        ASSERT(v8String-&gt;Length() == length);
+        static const int inlineBufferSize = 16;
+        if (length &lt;= inlineBufferSize) {
+            UChar inlineBuffer[inlineBufferSize];
+            v8String-&gt;Write(reinterpret_cast&lt;uint16_t*&gt;(inlineBuffer), 0, length);
+            return AtomicString(inlineBuffer, length);
+        }
+        UChar* buffer;
+        String tmp = String::createUninitialized(length, buffer);
+        v8String-&gt;Write(reinterpret_cast&lt;uint16_t*&gt;(buffer), 0, length);
+        return AtomicString(tmp);
+    }
+};
+
</ins><span class="cx"> template &lt;typename StringType&gt;
</span><span class="cx"> StringType v8StringToWebCoreString(v8::Handle&lt;v8::String&gt; v8String, ExternalMode external)
</span><span class="cx"> {
</span><span class="cx">     WebCoreStringResource* stringResource = WebCoreStringResource::toStringResource(v8String);
</span><span class="cx">     if (stringResource)
</span><del>-        return stringResource-&gt;string(StringType());
</del><ins>+        return StringTraits&lt;StringType&gt;::fromStringResource(stringResource);
</ins><span class="cx"> 
</span><span class="cx">     int length = v8String-&gt;Length();
</span><span class="cx">     if (!length) {
</span><span class="lines">@@ -257,18 +304,7 @@
</span><span class="cx">         return StringImpl::empty();
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    StringType result;
-    static const int inlineBufferSize = 16;
-    if (length &lt;= inlineBufferSize) {
-        UChar inlineBuffer[inlineBufferSize];
-        v8String-&gt;Write(reinterpret_cast&lt;uint16_t*&gt;(inlineBuffer), 0, length);
-        result = StringType(inlineBuffer, length);
-    } else {
-        UChar* buffer;
-        String tmp = String::createUninitialized(length, buffer);
-        v8String-&gt;Write(reinterpret_cast&lt;uint16_t*&gt;(buffer), 0, length);
-        result = StringType(tmp);
-    }
</del><ins>+    StringType result(StringTraits&lt;StringType&gt;::fromV8String(v8String, length));
</ins><span class="cx"> 
</span><span class="cx">     if (external == Externalize &amp;&amp; v8String-&gt;CanMakeExternal()) {
</span><span class="cx">         stringResource = new WebCoreStringResource(result);
</span></span></pre>
</div>
</div>

</body>
</html>