<!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>[149854] trunk/Source/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/149854">149854</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2013-05-09 16:41:26 -0700 (Thu, 09 May 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>Clean up SecurityOrigin::databaseIdentifier
https://bugs.webkit.org/show_bug.cgi?id=115882

Reviewed by Beth Dakin.

Remove m_encodedHost and just call encodeHost from databaseIdentifier().
Also, use a StringBuilder when constructing the database identifier to avoid allocating
temporary String objects over and over.

* page/SecurityOrigin.cpp:
(WebCore::SecurityOrigin::SecurityOrigin):
(WebCore):
(WebCore::SecurityOrigin::createFromDatabaseIdentifier):
(WebCore::SecurityOrigin::databaseIdentifier):
* page/SecurityOrigin.h:
(SecurityOrigin):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageSecurityOrigincpp">trunk/Source/WebCore/page/SecurityOrigin.cpp</a></li>
<li><a href="#trunkSourceWebCorepageSecurityOriginh">trunk/Source/WebCore/page/SecurityOrigin.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (149853 => 149854)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2013-05-09 23:21:25 UTC (rev 149853)
+++ trunk/Source/WebCore/ChangeLog        2013-05-09 23:41:26 UTC (rev 149854)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2013-05-09  Anders Carlsson  &lt;andersca@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Clean up SecurityOrigin::databaseIdentifier
+        https://bugs.webkit.org/show_bug.cgi?id=115882
+
+        Reviewed by Beth Dakin.
+
+        Remove m_encodedHost and just call encodeHost from databaseIdentifier().
+        Also, use a StringBuilder when constructing the database identifier to avoid allocating
+        temporary String objects over and over.
+
+        * page/SecurityOrigin.cpp:
+        (WebCore::SecurityOrigin::SecurityOrigin):
+        (WebCore):
+        (WebCore::SecurityOrigin::createFromDatabaseIdentifier):
+        (WebCore::SecurityOrigin::databaseIdentifier):
+        * page/SecurityOrigin.h:
+        (SecurityOrigin):
+
+2013-05-09  Anders Carlsson  &lt;andersca@apple.com&gt;
+
</ins><span class="cx">         Remove m_securityOrigin from XMLHttpRequest
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=115881
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorepageSecurityOrigincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/SecurityOrigin.cpp (149853 => 149854)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/SecurityOrigin.cpp        2013-05-09 23:21:25 UTC (rev 149853)
+++ trunk/Source/WebCore/page/SecurityOrigin.cpp        2013-05-09 23:41:26 UTC (rev 149854)
</span><span class="lines">@@ -159,7 +159,6 @@
</span><span class="cx"> SecurityOrigin::SecurityOrigin(const SecurityOrigin* other)
</span><span class="cx">     : m_protocol(other-&gt;m_protocol.isolatedCopy())
</span><span class="cx">     , m_host(other-&gt;m_host.isolatedCopy())
</span><del>-    , m_encodedHost(other-&gt;m_encodedHost.isolatedCopy())
</del><span class="cx">     , m_domain(other-&gt;m_domain.isolatedCopy())
</span><span class="cx">     , m_filePath(other-&gt;m_filePath.isolatedCopy())
</span><span class="cx">     , m_port(other-&gt;m_port)
</span><span class="lines">@@ -497,17 +496,17 @@
</span><span class="cx">     return SecurityOrigin::create(KURL(KURL(), originString));
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-static const char SeparatorCharacter = '_';
</del><ins>+static const char separatorCharacter = '_';
</ins><span class="cx"> 
</span><span class="cx"> PassRefPtr&lt;SecurityOrigin&gt; SecurityOrigin::createFromDatabaseIdentifier(const String&amp; databaseIdentifier)
</span><span class="cx"> { 
</span><span class="cx">     // Make sure there's a first separator
</span><del>-    size_t separator1 = databaseIdentifier.find(SeparatorCharacter);
</del><ins>+    size_t separator1 = databaseIdentifier.find(separatorCharacter);
</ins><span class="cx">     if (separator1 == notFound)
</span><span class="cx">         return create(KURL());
</span><span class="cx">         
</span><span class="cx">     // Make sure there's a second separator
</span><del>-    size_t separator2 = databaseIdentifier.reverseFind(SeparatorCharacter);
</del><ins>+    size_t separator2 = databaseIdentifier.reverseFind(separatorCharacter);
</ins><span class="cx">     if (separator2 == notFound)
</span><span class="cx">         return create(KURL());
</span><span class="cx">         
</span><span class="lines">@@ -552,12 +551,14 @@
</span><span class="cx">     if (m_needsDatabaseIdentifierQuirkForFiles)
</span><span class="cx">         return &quot;file__0&quot;;
</span><span class="cx"> 
</span><del>-    String separatorString(&amp;SeparatorCharacter, 1);
</del><ins>+    StringBuilder stringBuilder;
+    stringBuilder.append(m_protocol);
+    stringBuilder.append(separatorCharacter);
+    stringBuilder.append(encodeForFileName(m_host));
+    stringBuilder.append(separatorCharacter);
+    stringBuilder.appendNumber(m_port);
</ins><span class="cx"> 
</span><del>-    if (m_encodedHost.isEmpty())
-        m_encodedHost = encodeForFileName(m_host);
-
-    return m_protocol + separatorString + m_encodedHost + separatorString + String::number(m_port); 
</del><ins>+    return stringBuilder.toString();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> bool SecurityOrigin::equal(const SecurityOrigin* other) const 
</span></span></pre></div>
<a id="trunkSourceWebCorepageSecurityOriginh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/SecurityOrigin.h (149853 => 149854)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/SecurityOrigin.h        2013-05-09 23:21:25 UTC (rev 149853)
+++ trunk/Source/WebCore/page/SecurityOrigin.h        2013-05-09 23:41:26 UTC (rev 149854)
</span><span class="lines">@@ -223,7 +223,6 @@
</span><span class="cx"> 
</span><span class="cx">     String m_protocol;
</span><span class="cx">     String m_host;
</span><del>-    mutable String m_encodedHost;
</del><span class="cx">     String m_domain;
</span><span class="cx">     String m_filePath;
</span><span class="cx">     unsigned short m_port;
</span></span></pre>
</div>
</div>

</body>
</html>