<!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>[47659] 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/47659">47659</a></dd>
<dt>Author</dt> <dd>dimich@chromium.org</dd>
<dt>Date</dt> <dd>2009-08-21 19:06:45 -0700 (Fri, 21 Aug 2009)</dd>
</dl>

<h3>Log Message</h3>
<pre>Remove cross-thread code from CrossOriginPreflightResultCache.
Removed mutexes, atomic initializer and string copy.
https://bugs.webkit.org/show_bug.cgi?id=28650

Reviewed by David Levin.

No new tests, the worker tests cover this.

* loader/CrossOriginPreflightResultCache.cpp:
(WebCore::addToAccessControlAllowList):
(WebCore::CrossOriginPreflightResultCache::shared):
(WebCore::CrossOriginPreflightResultCache::appendEntry):
(WebCore::CrossOriginPreflightResultCache::canSkipPreflight):
(WebCore::CrossOriginPreflightResultCache::empty):
* loader/CrossOriginPreflightResultCache.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCoreloaderCrossOriginPreflightResultCachecpp">trunk/WebCore/loader/CrossOriginPreflightResultCache.cpp</a></li>
<li><a href="#trunkWebCoreloaderCrossOriginPreflightResultCacheh">trunk/WebCore/loader/CrossOriginPreflightResultCache.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (47658 => 47659)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2009-08-22 02:02:52 UTC (rev 47658)
+++ trunk/WebCore/ChangeLog        2009-08-22 02:06:45 UTC (rev 47659)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2009-08-21  Dmitry Titov  &lt;dimich@chromium.org&gt;
+
+        Reviewed by David Levin.
+
+        https://bugs.webkit.org/show_bug.cgi?id=28650
+        Remove cross-thread code from CrossOriginPreflightResultCache.
+        Removed mutexes, atomic initializer and string copy.
+
+        No new tests, the worker tests cover this.
+
+        * loader/CrossOriginPreflightResultCache.cpp:
+        (WebCore::addToAccessControlAllowList):
+        (WebCore::CrossOriginPreflightResultCache::shared):
+        (WebCore::CrossOriginPreflightResultCache::appendEntry):
+        (WebCore::CrossOriginPreflightResultCache::canSkipPreflight):
+        (WebCore::CrossOriginPreflightResultCache::empty):
+        * loader/CrossOriginPreflightResultCache.h:
+
</ins><span class="cx"> 2009-08-21  Michelangelo De Simone  &lt;micdesim@gmail.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Jan Alonzo.
</span></span></pre></div>
<a id="trunkWebCoreloaderCrossOriginPreflightResultCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/loader/CrossOriginPreflightResultCache.cpp (47658 => 47659)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/loader/CrossOriginPreflightResultCache.cpp        2009-08-22 02:02:52 UTC (rev 47658)
+++ trunk/WebCore/loader/CrossOriginPreflightResultCache.cpp        2009-08-22 02:06:45 UTC (rev 47659)
</span><span class="lines">@@ -30,6 +30,8 @@
</span><span class="cx"> #include &quot;CrossOriginAccessControl.h&quot;
</span><span class="cx"> #include &quot;ResourceResponse.h&quot;
</span><span class="cx"> #include &lt;wtf/CurrentTime.h&gt;
</span><ins>+#include &lt;wtf/StdLibExtras.h&gt;
+#include &lt;wtf/Threading.h&gt;
</ins><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><span class="lines">@@ -64,8 +66,7 @@
</span><span class="cx">     while (end &amp;&amp; isSpaceOrNewline((*stringImpl)[end]))
</span><span class="cx">         --end;
</span><span class="cx"> 
</span><del>-    // substringCopy() is called on the strings because the cache is accessed on multiple threads.
-    set.add(string.substringCopy(start, end - start + 1));
</del><ins>+    set.add(string.substring(start, end - start + 1));
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> template&lt;class HashType&gt;
</span><span class="lines">@@ -137,20 +138,20 @@
</span><span class="cx"> 
</span><span class="cx"> CrossOriginPreflightResultCache&amp; CrossOriginPreflightResultCache::shared()
</span><span class="cx"> {
</span><del>-    AtomicallyInitializedStatic(CrossOriginPreflightResultCache&amp;, cache = *new CrossOriginPreflightResultCache);
</del><ins>+    DEFINE_STATIC_LOCAL(CrossOriginPreflightResultCache, cache, ());
+    ASSERT(isMainThread());
</ins><span class="cx">     return cache;
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void CrossOriginPreflightResultCache::appendEntry(const String&amp; origin, const KURL&amp; url, CrossOriginPreflightResultCacheItem* preflightResult)
</span><span class="cx"> {
</span><del>-    MutexLocker lock(m_mutex);
-    // Note that the entry may already be present in the HashMap if another thread is accessing the same location.
-    m_preflightHashMap.set(std::make_pair(origin.copy(), url.copy()), preflightResult);
</del><ins>+    ASSERT(isMainThread());
+    m_preflightHashMap.set(std::make_pair(origin, url), preflightResult);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> bool CrossOriginPreflightResultCache::canSkipPreflight(const String&amp; origin, const KURL&amp; url, bool includeCredentials, const String&amp; method, const HTTPHeaderMap&amp; requestHeaders)
</span><span class="cx"> {
</span><del>-    MutexLocker lock(m_mutex);
</del><ins>+    ASSERT(isMainThread());
</ins><span class="cx">     CrossOriginPreflightResultHashMap::iterator cacheIt = m_preflightHashMap.find(std::make_pair(origin, url));
</span><span class="cx">     if (cacheIt == m_preflightHashMap.end())
</span><span class="cx">         return false;
</span><span class="lines">@@ -165,7 +166,7 @@
</span><span class="cx"> 
</span><span class="cx"> void CrossOriginPreflightResultCache::empty()
</span><span class="cx"> {
</span><del>-    MutexLocker lock(m_mutex);
</del><ins>+    ASSERT(isMainThread());
</ins><span class="cx">     deleteAllValues(m_preflightHashMap);
</span><span class="cx">     m_preflightHashMap.clear();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkWebCoreloaderCrossOriginPreflightResultCacheh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/loader/CrossOriginPreflightResultCache.h (47658 => 47659)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/loader/CrossOriginPreflightResultCache.h        2009-08-22 02:02:52 UTC (rev 47658)
+++ trunk/WebCore/loader/CrossOriginPreflightResultCache.h        2009-08-22 02:06:45 UTC (rev 47659)
</span><span class="lines">@@ -72,7 +72,6 @@
</span><span class="cx">         typedef HashMap&lt;std::pair&lt;String, KURL&gt;, CrossOriginPreflightResultCacheItem*&gt; CrossOriginPreflightResultHashMap;
</span><span class="cx"> 
</span><span class="cx">         CrossOriginPreflightResultHashMap m_preflightHashMap;
</span><del>-        Mutex m_mutex;
</del><span class="cx">     };
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebCore
</span></span></pre>
</div>
</div>

</body>
</html>