<!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>[161838] 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/161838">161838</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-01-12 14:07:44 -0800 (Sun, 12 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Simplify creation of XMLHttpRequestStaticData
https://bugs.webkit.org/show_bug.cgi?id=126852
Reviewed by Sam Weinig.
Add a staticData() getter that does the initialization and get rid of the explicit
calls to initializeXMLHttpRequestStaticData().
* xml/XMLHttpRequest.cpp:
(WebCore::XMLHttpRequestStaticData::XMLHttpRequestStaticData):
(WebCore::staticData):
(WebCore::XMLHttpRequest::XMLHttpRequest):
(WebCore::XMLHttpRequest::isAllowedHTTPHeader):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorexmlXMLHttpRequestcpp">trunk/Source/WebCore/xml/XMLHttpRequest.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161837 => 161838)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-12 21:38:12 UTC (rev 161837)
+++ trunk/Source/WebCore/ChangeLog 2014-01-12 22:07:44 UTC (rev 161838)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-01-12 Anders Carlsson <andersca@apple.com>
+
+ Simplify creation of XMLHttpRequestStaticData
+ https://bugs.webkit.org/show_bug.cgi?id=126852
+
+ Reviewed by Sam Weinig.
+
+ Add a staticData() getter that does the initialization and get rid of the explicit
+ calls to initializeXMLHttpRequestStaticData().
+
+ * xml/XMLHttpRequest.cpp:
+ (WebCore::XMLHttpRequestStaticData::XMLHttpRequestStaticData):
+ (WebCore::staticData):
+ (WebCore::XMLHttpRequest::XMLHttpRequest):
+ (WebCore::XMLHttpRequest::isAllowedHTTPHeader):
+
</ins><span class="cx"> 2014-01-12 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Final WebCore link error: update a symbol in WebCoreSystemInterfaceIOS.mm.
</span></span></pre></div>
<a id="trunkSourceWebCorexmlXMLHttpRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/XMLHttpRequest.cpp (161837 => 161838)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/XMLHttpRequest.cpp 2014-01-12 21:38:12 UTC (rev 161837)
+++ trunk/Source/WebCore/xml/XMLHttpRequest.cpp 2014-01-12 22:07:44 UTC (rev 161838)
</span><span class="lines">@@ -55,6 +55,7 @@
</span><span class="cx"> #include "XMLHttpRequestUpload.h"
</span><span class="cx"> #include "markup.h"
</span><span class="cx"> #include <heap/Strong.h>
</span><ins>+#include <mutex>
</ins><span class="cx"> #include <runtime/ArrayBuffer.h>
</span><span class="cx"> #include <runtime/ArrayBufferView.h>
</span><span class="cx"> #include <runtime/JSLock.h>
</span><span class="lines">@@ -83,38 +84,52 @@
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(XMLHttpRequestStaticData); WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><span class="cx"> XMLHttpRequestStaticData();
</span><del>- String m_proxyHeaderPrefix;
- String m_secHeaderPrefix;
- HashSet<String, CaseFoldingHash> m_forbiddenRequestHeaders;
</del><ins>+ const String m_proxyHeaderPrefix;
+ const String m_secHeaderPrefix;
+ const HashSet<String, CaseFoldingHash> m_forbiddenRequestHeaders;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> XMLHttpRequestStaticData::XMLHttpRequestStaticData()
</span><span class="cx"> : m_proxyHeaderPrefix("proxy-")
</span><span class="cx"> , m_secHeaderPrefix("sec-")
</span><ins>+ , m_forbiddenRequestHeaders({
+ "accept-charset",
+ "accept-encoding",
+ "access-control-request-headers",
+ "access-control-request-method",
+ "connection",
+ "content-length",
+ "content-transfer-encoding",
+ "cookie",
+ "cookie2",
+ "date",
+ "expect",
+ "host",
+ "keep-alive",
+ "origin",
+ "referer",
+ "te",
+ "trailer",
+ "transfer-encoding",
+ "upgrade",
+ "user-agent",
+ "via",
+ })
</ins><span class="cx"> {
</span><del>- m_forbiddenRequestHeaders.add("accept-charset");
- m_forbiddenRequestHeaders.add("accept-encoding");
- m_forbiddenRequestHeaders.add("access-control-request-headers");
- m_forbiddenRequestHeaders.add("access-control-request-method");
- m_forbiddenRequestHeaders.add("connection");
- m_forbiddenRequestHeaders.add("content-length");
- m_forbiddenRequestHeaders.add("content-transfer-encoding");
- m_forbiddenRequestHeaders.add("cookie");
- m_forbiddenRequestHeaders.add("cookie2");
- m_forbiddenRequestHeaders.add("date");
- m_forbiddenRequestHeaders.add("expect");
- m_forbiddenRequestHeaders.add("host");
- m_forbiddenRequestHeaders.add("keep-alive");
- m_forbiddenRequestHeaders.add("origin");
- m_forbiddenRequestHeaders.add("referer");
- m_forbiddenRequestHeaders.add("te");
- m_forbiddenRequestHeaders.add("trailer");
- m_forbiddenRequestHeaders.add("transfer-encoding");
- m_forbiddenRequestHeaders.add("upgrade");
- m_forbiddenRequestHeaders.add("user-agent");
- m_forbiddenRequestHeaders.add("via");
</del><span class="cx"> }
</span><span class="cx">
</span><ins>+static const XMLHttpRequestStaticData& staticData()
+{
+ std::once_flag onceFlag;
+ static const XMLHttpRequestStaticData* staticData;
+
+ std::call_once(onceFlag, [] {
+ staticData = std::make_unique<XMLHttpRequestStaticData>().release();
+ });
+
+ return *staticData;
+}
+
</ins><span class="cx"> static bool isSetCookieHeader(const AtomicString& name)
</span><span class="cx"> {
</span><span class="cx"> return equalIgnoringCase(name, "set-cookie") || equalIgnoringCase(name, "set-cookie2");
</span><span class="lines">@@ -139,21 +154,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static const XMLHttpRequestStaticData* staticData = 0;
-
-static const XMLHttpRequestStaticData* createXMLHttpRequestStaticData()
-{
- staticData = new XMLHttpRequestStaticData;
- return staticData;
-}
-
-static const XMLHttpRequestStaticData* initializeXMLHttpRequestStaticData()
-{
- // Uses dummy to avoid warnings about an unused variable.
- AtomicallyInitializedStatic(const XMLHttpRequestStaticData*, dummy = createXMLHttpRequestStaticData());
- return dummy;
-}
-
</del><span class="cx"> static void logConsoleError(ScriptExecutionContext* context, const String& message)
</span><span class="cx"> {
</span><span class="cx"> if (!context)
</span><span class="lines">@@ -192,7 +192,6 @@
</span><span class="cx"> , m_responseTypeCode(ResponseTypeDefault)
</span><span class="cx"> , m_responseCacheIsValid(false)
</span><span class="cx"> {
</span><del>- initializeXMLHttpRequestStaticData();
</del><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> xmlHttpRequestCounter.increment();
</span><span class="cx"> #endif
</span><span class="lines">@@ -474,9 +473,8 @@
</span><span class="cx">
</span><span class="cx"> bool XMLHttpRequest::isAllowedHTTPHeader(const String& name)
</span><span class="cx"> {
</span><del>- initializeXMLHttpRequestStaticData();
- return !staticData->m_forbiddenRequestHeaders.contains(name) && !name.startsWith(staticData->m_proxyHeaderPrefix, false)
- && !name.startsWith(staticData->m_secHeaderPrefix, false);
</del><ins>+ return !staticData().m_forbiddenRequestHeaders.contains(name) && !name.startsWith(staticData().m_proxyHeaderPrefix, false)
+ && !name.startsWith(staticData().m_secHeaderPrefix, false);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void XMLHttpRequest::open(const String& method, const URL& url, ExceptionCode& ec)
</span></span></pre>
</div>
</div>
</body>
</html>