<!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>[161801] trunk/Source</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/161801">161801</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-01-11 22:30:10 -0800 (Sat, 11 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use std::call_once instead of AtomicallyInitializedStatic when creating a HTTP header set
https://bugs.webkit.org/show_bug.cgi?id=126837
Reviewed by Sam Weinig.
Source/WebCore:
Use std::call_once when constructing the HTTPHeaderSet.
* loader/CrossOriginAccessControl.cpp:
(WebCore::isOnAccessControlResponseHeaderWhitelist):
Source/WTF:
* wtf/HashSet.h:
(WTF::HashSet::HashSet):
Add a HashSet constructor that takes an initializer list.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfHashSeth">trunk/Source/WTF/wtf/HashSet.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloaderCrossOriginAccessControlcpp">trunk/Source/WebCore/loader/CrossOriginAccessControl.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (161800 => 161801)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog        2014-01-12 05:59:44 UTC (rev 161800)
+++ trunk/Source/WTF/ChangeLog        2014-01-12 06:30:10 UTC (rev 161801)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-01-11 Anders Carlsson <andersca@apple.com>
+
+ Use std::call_once instead of AtomicallyInitializedStatic when creating a HTTP header set
+ https://bugs.webkit.org/show_bug.cgi?id=126837
+
+ Reviewed by Sam Weinig.
+
+ * wtf/HashSet.h:
+ (WTF::HashSet::HashSet):
+ Add a HashSet constructor that takes an initializer list.
+
</ins><span class="cx"> 2014-01-11 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> Fix the EFL build.
</span></span></pre></div>
<a id="trunkSourceWTFwtfHashSeth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/HashSet.h (161800 => 161801)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/HashSet.h        2014-01-12 05:59:44 UTC (rev 161800)
+++ trunk/Source/WTF/wtf/HashSet.h        2014-01-12 06:30:10 UTC (rev 161801)
</span><span class="lines">@@ -21,6 +21,7 @@
</span><span class="cx"> #ifndef WTF_HashSet_h
</span><span class="cx"> #define WTF_HashSet_h
</span><span class="cx">
</span><ins>+#include <initializer_list>
</ins><span class="cx"> #include <wtf/FastMalloc.h>
</span><span class="cx"> #include <wtf/HashTable.h>
</span><span class="cx">
</span><span class="lines">@@ -49,6 +50,16 @@
</span><span class="cx"> typedef HashTableConstIteratorAdapter<HashTableType, ValueType> const_iterator;
</span><span class="cx"> typedef typename HashTableType::AddResult AddResult;
</span><span class="cx">
</span><ins>+ HashSet()
+ {
+ }
+
+ HashSet(std::initializer_list<ValueArg> initializerList)
+ {
+ for (const auto& value : initializerList)
+ add(value);
+ }
+
</ins><span class="cx"> void swap(HashSet&);
</span><span class="cx">
</span><span class="cx"> int size() const;
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161800 => 161801)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2014-01-12 05:59:44 UTC (rev 161800)
+++ trunk/Source/WebCore/ChangeLog        2014-01-12 06:30:10 UTC (rev 161801)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-01-11 Anders Carlsson <andersca@apple.com>
+
+ Use std::call_once instead of AtomicallyInitializedStatic when creating a HTTP header set
+ https://bugs.webkit.org/show_bug.cgi?id=126837
+
+ Reviewed by Sam Weinig.
+
+ Use std::call_once when constructing the HTTPHeaderSet.
+
+ * loader/CrossOriginAccessControl.cpp:
+ (WebCore::isOnAccessControlResponseHeaderWhitelist):
+
</ins><span class="cx"> 2014-01-11 David Kilzer <ddkilzer@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Do not link to ApplicationServices.framework for iOS
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderCrossOriginAccessControlcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/CrossOriginAccessControl.cpp (161800 => 161801)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/CrossOriginAccessControl.cpp        2014-01-12 05:59:44 UTC (rev 161800)
+++ trunk/Source/WebCore/loader/CrossOriginAccessControl.cpp        2014-01-12 06:30:10 UTC (rev 161801)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> #include "ResourceRequest.h"
</span><span class="cx"> #include "ResourceResponse.h"
</span><span class="cx"> #include "SecurityOrigin.h"
</span><del>-#include <wtf/Threading.h>
</del><ins>+#include <mutex>
</ins><span class="cx"> #include <wtf/text/AtomicString.h>
</span><span class="cx"> #include <wtf/text/StringBuilder.h>
</span><span class="cx">
</span><span class="lines">@@ -76,24 +76,22 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static PassOwnPtr<HTTPHeaderSet> createAllowedCrossOriginResponseHeadersSet()
-{
- OwnPtr<HTTPHeaderSet> headerSet = adoptPtr(new HashSet<String, CaseFoldingHash>);
-
- headerSet->add("cache-control");
- headerSet->add("content-language");
- headerSet->add("content-type");
- headerSet->add("expires");
- headerSet->add("last-modified");
- headerSet->add("pragma");
-
- return headerSet.release();
-}
-
</del><span class="cx"> bool isOnAccessControlResponseHeaderWhitelist(const String& name)
</span><span class="cx"> {
</span><del>- AtomicallyInitializedStatic(HTTPHeaderSet*, allowedCrossOriginResponseHeaders = createAllowedCrossOriginResponseHeadersSet().leakPtr());
</del><ins>+ static std::once_flag onceFlag;
+ static HTTPHeaderSet* allowedCrossOriginResponseHeaders;
</ins><span class="cx">
</span><ins>+ std::call_once(onceFlag, []{
+ allowedCrossOriginResponseHeaders = std::make_unique<HTTPHeaderSet, std::initializer_list<String>>({
+ "cache-control",
+ "content-language",
+ "content-type",
+ "expires",
+ "last-modified",
+ "pragma"
+ }).release();
+ });
+
</ins><span class="cx"> return allowedCrossOriginResponseHeaders->contains(name);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>