<!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>[169679] 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/169679">169679</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-06-07 13:17:20 -0700 (Sat, 07 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>HTTPHeaderMap should not derive from HashMap
https://bugs.webkit.org/show_bug.cgi?id=133392
Reviewed by Darin Adler.
Source/WebCore:
Use a HashMap member variable instead.
* WebCore.exp.in:
* loader/DocumentLoader.cpp:
(WebCore::DocumentLoader::responseReceived):
* platform/network/HTTPHeaderMap.cpp:
(WebCore::HTTPHeaderMap::copyData):
(WebCore::HTTPHeaderMap::adopt):
(WebCore::HTTPHeaderMap::get):
(WebCore::HTTPHeaderMap::set):
(WebCore::HTTPHeaderMap::add):
(WebCore::HTTPHeaderMap::contains):
(WebCore::HTTPHeaderMap::find):
(WebCore::HTTPHeaderMap::remove):
(WebCore::HTTPHeaderMap::keys):
* platform/network/HTTPHeaderMap.h:
(WebCore::HTTPHeaderMap::isEmpty):
(WebCore::HTTPHeaderMap::size):
(WebCore::HTTPHeaderMap::clear):
(WebCore::HTTPHeaderMap::begin):
(WebCore::HTTPHeaderMap::end):
(WebCore::HTTPHeaderMap::operator==):
(WebCore::HTTPHeaderMap::operator!=):
* platform/network/ResourceRequestBase.cpp:
(WebCore::ResourceRequestBase::adopt):
* platform/network/ResourceRequestBase.h:
* platform/network/ResourceResponseBase.cpp:
(WebCore::ResourceResponseBase::adopt):
* platform/network/ResourceResponseBase.h:
* xml/XMLHttpRequest.cpp:
(WebCore::XMLHttpRequest::createRequest):
Source/WebKit2:
* Shared/WebCoreArgumentCoders.cpp:
(IPC::ArgumentCoder<HTTPHeaderMap>::encode):
(IPC::ArgumentCoder<HTTPHeaderMap>::decode):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebCoreloaderDocumentLoadercpp">trunk/Source/WebCore/loader/DocumentLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkHTTPHeaderMapcpp">trunk/Source/WebCore/platform/network/HTTPHeaderMap.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkHTTPHeaderMaph">trunk/Source/WebCore/platform/network/HTTPHeaderMap.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkResourceRequestBasecpp">trunk/Source/WebCore/platform/network/ResourceRequestBase.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkResourceRequestBaseh">trunk/Source/WebCore/platform/network/ResourceRequestBase.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkResourceResponseBasecpp">trunk/Source/WebCore/platform/network/ResourceResponseBase.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkResourceResponseBaseh">trunk/Source/WebCore/platform/network/ResourceResponseBase.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcfResourceRequestCFNetcpp">trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupResourceRequesth">trunk/Source/WebCore/platform/network/soup/ResourceRequest.h</a></li>
<li><a href="#trunkSourceWebCorexmlXMLHttpRequestcpp">trunk/Source/WebCore/xml/XMLHttpRequest.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebURLResponsecpp">trunk/Source/WebKit/win/WebURLResponse.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessmacDiskCacheMonitormm">trunk/Source/WebKit2/NetworkProcess/mac/DiskCacheMonitor.mm</a></li>
<li><a href="#trunkSourceWebKit2SharedWebCoreArgumentCoderscpp">trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (169678 => 169679)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-06-07 19:56:33 UTC (rev 169678)
+++ trunk/Source/WebCore/ChangeLog 2014-06-07 20:17:20 UTC (rev 169679)
</span><span class="lines">@@ -1,3 +1,42 @@
</span><ins>+2014-05-29 Anders Carlsson <andersca@apple.com>
+
+ HTTPHeaderMap should not derive from HashMap
+ https://bugs.webkit.org/show_bug.cgi?id=133392
+
+ Reviewed by Darin Adler.
+
+ Use a HashMap member variable instead.
+
+ * WebCore.exp.in:
+ * loader/DocumentLoader.cpp:
+ (WebCore::DocumentLoader::responseReceived):
+ * platform/network/HTTPHeaderMap.cpp:
+ (WebCore::HTTPHeaderMap::copyData):
+ (WebCore::HTTPHeaderMap::adopt):
+ (WebCore::HTTPHeaderMap::get):
+ (WebCore::HTTPHeaderMap::set):
+ (WebCore::HTTPHeaderMap::add):
+ (WebCore::HTTPHeaderMap::contains):
+ (WebCore::HTTPHeaderMap::find):
+ (WebCore::HTTPHeaderMap::remove):
+ (WebCore::HTTPHeaderMap::keys):
+ * platform/network/HTTPHeaderMap.h:
+ (WebCore::HTTPHeaderMap::isEmpty):
+ (WebCore::HTTPHeaderMap::size):
+ (WebCore::HTTPHeaderMap::clear):
+ (WebCore::HTTPHeaderMap::begin):
+ (WebCore::HTTPHeaderMap::end):
+ (WebCore::HTTPHeaderMap::operator==):
+ (WebCore::HTTPHeaderMap::operator!=):
+ * platform/network/ResourceRequestBase.cpp:
+ (WebCore::ResourceRequestBase::adopt):
+ * platform/network/ResourceRequestBase.h:
+ * platform/network/ResourceResponseBase.cpp:
+ (WebCore::ResourceResponseBase::adopt):
+ * platform/network/ResourceResponseBase.h:
+ * xml/XMLHttpRequest.cpp:
+ (WebCore::XMLHttpRequest::createRequest):
+
</ins><span class="cx"> 2014-06-07 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> Use C++11 lambdas to construct FileThread::Task objects
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (169678 => 169679)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-06-07 19:56:33 UTC (rev 169678)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-06-07 20:17:20 UTC (rev 169679)
</span><span class="lines">@@ -289,6 +289,9 @@
</span><span class="cx"> __ZN7WebCore13GraphicsLayer8addChildEPS0_
</span><span class="cx"> __ZN7WebCore13GraphicsLayerC2ERNS_19GraphicsLayerClientE
</span><span class="cx"> __ZN7WebCore13GraphicsLayerD2Ev
</span><ins>+__ZN7WebCore13HTTPHeaderMap3addERKN3WTF12AtomicStringERKNS1_6StringE
+__ZN7WebCore13HTTPHeaderMap3setERKN3WTF12AtomicStringERKNS1_6StringE
+__ZN7WebCore13HTTPHeaderMap6removeEPKc
</ins><span class="cx"> __ZN7WebCore13HTTPHeaderMapC1Ev
</span><span class="cx"> __ZN7WebCore13HTTPHeaderMapD1Ev
</span><span class="cx"> __ZN7WebCore13HitTestResultC1ERKNS_11LayoutPointE
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderDocumentLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/DocumentLoader.cpp (169678 => 169679)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/DocumentLoader.cpp 2014-06-07 19:56:33 UTC (rev 169678)
+++ trunk/Source/WebCore/loader/DocumentLoader.cpp 2014-06-07 20:17:20 UTC (rev 169679)
</span><span class="lines">@@ -604,9 +604,7 @@
</span><span class="cx"> if (willLoadFallback)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- DEPRECATED_DEFINE_STATIC_LOCAL(AtomicString, xFrameOptionHeader, ("x-frame-options", AtomicString::ConstructFromLiteral));
-
- auto it = response.httpHeaderFields().find(xFrameOptionHeader);
</del><ins>+ auto it = response.httpHeaderFields().find("x-frame-options");
</ins><span class="cx"> if (it != response.httpHeaderFields().end()) {
</span><span class="cx"> String content = it->value;
</span><span class="cx"> ASSERT(m_mainResource);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkHTTPHeaderMapcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/HTTPHeaderMap.cpp (169678 => 169679)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/HTTPHeaderMap.cpp 2014-06-07 19:56:33 UTC (rev 169678)
+++ trunk/Source/WebCore/platform/network/HTTPHeaderMap.cpp 2014-06-07 20:17:20 UTC (rev 169679)
</span><span class="lines">@@ -43,35 +43,38 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassOwnPtr<CrossThreadHTTPHeaderMapData> HTTPHeaderMap::copyData() const
</del><ins>+std::unique_ptr<CrossThreadHTTPHeaderMapData> HTTPHeaderMap::copyData() const
</ins><span class="cx"> {
</span><del>- OwnPtr<CrossThreadHTTPHeaderMapData> data = adoptPtr(new CrossThreadHTTPHeaderMapData());
- data->reserveInitialCapacity(size());
</del><ins>+ auto data = std::make_unique<CrossThreadHTTPHeaderMapData>();
+ data->reserveInitialCapacity(m_headers.size());
</ins><span class="cx">
</span><span class="cx"> for (const auto& header : *this)
</span><span class="cx"> data->uncheckedAppend(std::make_pair(header.key.string().isolatedCopy(), header.value.isolatedCopy()));
</span><span class="cx">
</span><del>- return data.release();
</del><ins>+ return data;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void HTTPHeaderMap::adopt(PassOwnPtr<CrossThreadHTTPHeaderMapData> data)
</del><ins>+void HTTPHeaderMap::adopt(std::unique_ptr<CrossThreadHTTPHeaderMapData> data)
</ins><span class="cx"> {
</span><del>- clear();
- size_t dataSize = data->size();
- for (size_t index = 0; index < dataSize; ++index) {
- std::pair<String, String>& header = (*data)[index];
- set(header.first, header.second);
- }
</del><ins>+ m_headers.clear();
+
+ for (auto& header : *data)
+ m_headers.add(std::move(header.first), std::move(header.second));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String HTTPHeaderMap::get(const AtomicString& name) const
</span><span class="cx"> {
</span><del>- return HashMap<AtomicString, String, CaseFoldingHash>::get(name);
</del><ins>+ return m_headers.get(name);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+HTTPHeaderMap::AddResult HTTPHeaderMap::set(const AtomicString& name, const String& value)
+{
+ return m_headers.set(name, value);
+}
+
</ins><span class="cx"> HTTPHeaderMap::AddResult HTTPHeaderMap::add(const AtomicString& name, const String& value)
</span><span class="cx"> {
</span><del>- return HashMap<AtomicString, String, CaseFoldingHash>::add(name, value);
</del><ins>+ return m_headers.add(name, value);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Adapter that allows the HashMap to take C strings as keys.
</span><span class="lines">@@ -94,20 +97,46 @@
</span><span class="cx">
</span><span class="cx"> String HTTPHeaderMap::get(const char* name) const
</span><span class="cx"> {
</span><del>- const_iterator i = find<CaseFoldingCStringTranslator>(name);
- if (i == end())
</del><ins>+ auto it = find(name);
+ if (it == end())
</ins><span class="cx"> return String();
</span><del>- return i->value;
</del><ins>+ return it->value;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool HTTPHeaderMap::contains(const char* name) const
</span><span class="cx"> {
</span><del>- return find<CaseFoldingCStringTranslator>(name) != end();
</del><ins>+ return find(name) != end();
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+HTTPHeaderMap::iterator HTTPHeaderMap::find(const char* name)
+{
+ return m_headers.find<CaseFoldingCStringTranslator>(name);
+}
+
+HTTPHeaderMap::const_iterator HTTPHeaderMap::find(const char* name) const
+{
+ return m_headers.find<CaseFoldingCStringTranslator>(name);
+}
+
</ins><span class="cx"> HTTPHeaderMap::AddResult HTTPHeaderMap::add(const char* name, const String& value)
</span><span class="cx"> {
</span><del>- return HashMap<AtomicString, String, CaseFoldingHash>::add<CaseFoldingCStringTranslator>(name, value);
</del><ins>+ return m_headers.add<CaseFoldingCStringTranslator>(name, value);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+void HTTPHeaderMap::remove(const char* name)
+{
+ remove(find(name));
+}
+
+void HTTPHeaderMap::remove(iterator it)
+{
+ m_headers.remove(it);
+}
+
+WTF::IteratorRange<HTTPHeaderMap::const_iterator::Keys> HTTPHeaderMap::keys() const
+{
+ return m_headers.keys();
+}
+
+
</ins><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkHTTPHeaderMaph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/HTTPHeaderMap.h (169678 => 169679)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/HTTPHeaderMap.h 2014-06-07 19:56:33 UTC (rev 169678)
+++ trunk/Source/WebCore/platform/network/HTTPHeaderMap.h 2014-06-07 20:17:20 UTC (rev 169679)
</span><span class="lines">@@ -29,7 +29,6 @@
</span><span class="cx">
</span><span class="cx"> #include <utility>
</span><span class="cx"> #include <wtf/HashMap.h>
</span><del>-#include <wtf/PassOwnPtr.h>
</del><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx"> #include <wtf/text/AtomicString.h>
</span><span class="cx"> #include <wtf/text/AtomicStringHash.h>
</span><span class="lines">@@ -37,30 +36,63 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>- typedef Vector<std::pair<String, String>> CrossThreadHTTPHeaderMapData;
</del><ins>+typedef Vector<std::pair<String, String>> CrossThreadHTTPHeaderMapData;
</ins><span class="cx">
</span><del>- // FIXME: Not every header fits into a map. Notably, multiple Set-Cookie header fields are needed to set multiple cookies.
- class HTTPHeaderMap : public HashMap<AtomicString, String, CaseFoldingHash> {
- public:
- HTTPHeaderMap();
- ~HTTPHeaderMap();
</del><ins>+// FIXME: Not every header fits into a map. Notably, multiple Set-Cookie header fields are needed to set multiple cookies.
</ins><span class="cx">
</span><del>- // Gets a copy of the data suitable for passing to another thread.
- PassOwnPtr<CrossThreadHTTPHeaderMapData> copyData() const;
</del><ins>+class HTTPHeaderMap {
+ typedef HashMap<AtomicString, String, CaseFoldingHash> HashMapType;
+public:
+ typedef HashMapType::const_iterator const_iterator;
+ typedef HashMapType::iterator iterator;
+ typedef HashMapType::AddResult AddResult;
</ins><span class="cx">
</span><del>- void adopt(PassOwnPtr<CrossThreadHTTPHeaderMapData>);
-
- String get(const AtomicString& name) const;
</del><ins>+ HTTPHeaderMap();
+ ~HTTPHeaderMap();
</ins><span class="cx">
</span><del>- AddResult add(const AtomicString& name, const String& value);
</del><ins>+ // Gets a copy of the data suitable for passing to another thread.
+ std::unique_ptr<CrossThreadHTTPHeaderMapData> copyData() const;
+ void adopt(std::unique_ptr<CrossThreadHTTPHeaderMapData>);
</ins><span class="cx">
</span><del>- // Alternate accessors that are faster than converting the char* to AtomicString first.
- bool contains(const char*) const;
- String get(const char*) const;
- AddResult add(const char* name, const String& value);
-
- };
</del><ins>+ bool isEmpty() const { return m_headers.isEmpty(); }
+ int size() const { return m_headers.size(); }
</ins><span class="cx">
</span><ins>+ void clear() { m_headers.clear(); }
+
+ String get(const AtomicString& name) const;
+
+ AddResult set(const AtomicString& name, const String& value);
+ AddResult add(const AtomicString& name, const String& value);
+
+ // Alternate accessors that are faster than converting the char* to AtomicString first.
+ bool contains(const char*) const;
+ String get(const char*) const;
+ const_iterator find(const char*) const;
+ iterator find(const char*);
+ AddResult add(const char* name, const String& value);
+
+ void remove(const char*);
+ void remove(iterator);
+
+ const_iterator begin() const { return m_headers.begin(); }
+ const_iterator end() const { return m_headers.end(); }
+
+ WTF::IteratorRange<const_iterator::Keys> keys() const;
+
+ friend bool operator==(const HTTPHeaderMap& a, const HTTPHeaderMap& b)
+ {
+ return a.m_headers == b.m_headers;
+ }
+
+ friend bool operator!=(const HTTPHeaderMap& a, const HTTPHeaderMap& b)
+ {
+ return !(a == b);
+ }
+
+private:
+ HashMap<AtomicString, String, CaseFoldingHash> m_headers;
+};
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // HTTPHeaderMap_h
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkResourceRequestBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ResourceRequestBase.cpp (169678 => 169679)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ResourceRequestBase.cpp 2014-06-07 19:56:33 UTC (rev 169678)
+++ trunk/Source/WebCore/platform/network/ResourceRequestBase.cpp 2014-06-07 20:17:20 UTC (rev 169679)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #include "ResourceRequestBase.h"
</span><span class="cx">
</span><span class="cx"> #include "ResourceRequest.h"
</span><ins>+#include <wtf/PassOwnPtr.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -58,7 +59,7 @@
</span><span class="cx"> request->setPriority(data->m_priority);
</span><span class="cx">
</span><span class="cx"> request->updateResourceRequest();
</span><del>- request->m_httpHeaderFields.adopt(data->m_httpHeaders.release());
</del><ins>+ request->m_httpHeaderFields.adopt(std::move(data->m_httpHeaders));
</ins><span class="cx">
</span><span class="cx"> size_t encodingCount = data->m_responseContentDispositionEncodingFallbackArray.size();
</span><span class="cx"> if (encodingCount > 0) {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkResourceRequestBaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ResourceRequestBase.h (169678 => 169679)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ResourceRequestBase.h 2014-06-07 19:56:33 UTC (rev 169678)
+++ trunk/Source/WebCore/platform/network/ResourceRequestBase.h 2014-06-07 20:17:20 UTC (rev 169679)
</span><span class="lines">@@ -33,8 +33,6 @@
</span><span class="cx"> #include "URL.h"
</span><span class="cx"> #include "ResourceLoadPriority.h"
</span><span class="cx">
</span><del>-#include <wtf/OwnPtr.h>
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> enum ResourceRequestCachePolicy {
</span><span class="lines">@@ -248,7 +246,7 @@
</span><span class="cx"> URL m_firstPartyForCookies;
</span><span class="cx">
</span><span class="cx"> String m_httpMethod;
</span><del>- OwnPtr<CrossThreadHTTPHeaderMapData> m_httpHeaders;
</del><ins>+ std::unique_ptr<CrossThreadHTTPHeaderMapData> m_httpHeaders;
</ins><span class="cx"> Vector<String> m_responseContentDispositionEncodingFallbackArray;
</span><span class="cx"> RefPtr<FormData> m_httpBody;
</span><span class="cx"> bool m_allowCookies;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkResourceResponseBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ResourceResponseBase.cpp (169678 => 169679)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ResourceResponseBase.cpp 2014-06-07 19:56:33 UTC (rev 169678)
+++ trunk/Source/WebCore/platform/network/ResourceResponseBase.cpp 2014-06-07 20:17:20 UTC (rev 169679)
</span><span class="lines">@@ -105,7 +105,7 @@
</span><span class="cx"> response->setHTTPStatusText(data->m_httpStatusText);
</span><span class="cx">
</span><span class="cx"> response->lazyInit(CommonAndUncommonFields);
</span><del>- response->m_httpHeaderFields.adopt(data->m_httpHeaders.release());
</del><ins>+ response->m_httpHeaderFields.adopt(std::move(data->m_httpHeaders));
</ins><span class="cx"> response->setResourceLoadTiming(data->m_resourceLoadTiming);
</span><span class="cx"> response->doPlatformAdopt(data);
</span><span class="cx"> return response.release();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkResourceResponseBaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ResourceResponseBase.h (169678 => 169679)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ResourceResponseBase.h 2014-06-07 19:56:33 UTC (rev 169678)
+++ trunk/Source/WebCore/platform/network/ResourceResponseBase.h 2014-06-07 20:17:20 UTC (rev 169679)
</span><span class="lines">@@ -195,7 +195,7 @@
</span><span class="cx"> String m_suggestedFilename;
</span><span class="cx"> int m_httpStatusCode;
</span><span class="cx"> String m_httpStatusText;
</span><del>- OwnPtr<CrossThreadHTTPHeaderMapData> m_httpHeaders;
</del><ins>+ std::unique_ptr<CrossThreadHTTPHeaderMapData> m_httpHeaders;
</ins><span class="cx"> ResourceLoadTiming m_resourceLoadTiming;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfResourceRequestCFNetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp (169678 => 169679)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp 2014-06-07 19:56:33 UTC (rev 169678)
+++ trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp 2014-06-07 20:17:20 UTC (rev 169679)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #include "ResourceRequestCFNet.h"
</span><span class="cx">
</span><span class="cx"> #include "ResourceRequest.h"
</span><ins>+#include <wtf/PassOwnPtr.h>
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(PUBLIC_SUFFIX_LIST)
</span><span class="cx"> #include "PublicSuffix.h"
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupResourceRequesth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/ResourceRequest.h (169678 => 169679)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/ResourceRequest.h 2014-06-07 19:56:33 UTC (rev 169678)
+++ trunk/Source/WebCore/platform/network/soup/ResourceRequest.h 2014-06-07 20:17:20 UTC (rev 169679)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> #include "GUniquePtrSoup.h"
</span><span class="cx"> #include "ResourceRequestBase.h"
</span><span class="cx"> #include <libsoup/soup.h>
</span><ins>+#include <wtf/PassOwnPtr.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorexmlXMLHttpRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/XMLHttpRequest.cpp (169678 => 169679)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/XMLHttpRequest.cpp 2014-06-07 19:56:33 UTC (rev 169678)
+++ trunk/Source/WebCore/xml/XMLHttpRequest.cpp 2014-06-07 20:17:20 UTC (rev 169679)
</span><span class="lines">@@ -758,7 +758,7 @@
</span><span class="cx"> request.setHTTPBody(m_requestEntityBody.release());
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (m_requestHeaders.size() > 0)
</del><ins>+ if (!m_requestHeaders.isEmpty())
</ins><span class="cx"> request.addHTTPHeaderFields(m_requestHeaders);
</span><span class="cx">
</span><span class="cx"> ThreadableLoaderOptions options;
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebURLResponsecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebURLResponse.cpp (169678 => 169679)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebURLResponse.cpp 2014-06-07 19:56:33 UTC (rev 169678)
+++ trunk/Source/WebKit/win/WebURLResponse.cpp 2014-06-07 20:17:20 UTC (rev 169679)
</span><span class="lines">@@ -360,7 +360,11 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_response.isHTTP());
</span><span class="cx">
</span><del>- *headerFields = COMPropertyBag<String, AtomicString, CaseFoldingHash>::createInstance(m_response.httpHeaderFields());
</del><ins>+ HashMap<String, String, CaseFoldingHash> fields;
+ for (const auto& keyValuePair : m_response.httpHeaderFields())
+ fields.add(keyValuePair.key, keyValuePair.value);
+
+ *headerFields = COMPropertyBag<String, String, CaseFoldingHash>::adopt(fields);
</ins><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (169678 => 169679)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-06-07 19:56:33 UTC (rev 169678)
+++ trunk/Source/WebKit2/ChangeLog 2014-06-07 20:17:20 UTC (rev 169679)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-05-29 Anders Carlsson <andersca@apple.com>
+
+ HTTPHeaderMap should not derive from HashMap
+ https://bugs.webkit.org/show_bug.cgi?id=133392
+
+ Reviewed by Darin Adler.
+
+ * Shared/WebCoreArgumentCoders.cpp:
+ (IPC::ArgumentCoder<HTTPHeaderMap>::encode):
+ (IPC::ArgumentCoder<HTTPHeaderMap>::decode):
+
</ins><span class="cx"> 2014-06-07 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Fix a path used for sandbox profiles
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessmacDiskCacheMonitormm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/mac/DiskCacheMonitor.mm (169678 => 169679)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/mac/DiskCacheMonitor.mm 2014-06-07 19:56:33 UTC (rev 169678)
+++ trunk/Source/WebKit2/NetworkProcess/mac/DiskCacheMonitor.mm 2014-06-07 20:17:20 UTC (rev 169679)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> #import "NetworkProcessConnectionMessages.h"
</span><span class="cx"> #import "NetworkResourceLoader.h"
</span><span class="cx"> #import "WebCoreArgumentCoders.h"
</span><ins>+#import <wtf/PassOwnPtr.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __has_include
</span><span class="cx"> #if __has_include(<CFNetwork/CFURLCachePriv.h>)
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebCoreArgumentCoderscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp (169678 => 169679)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp 2014-06-07 19:56:33 UTC (rev 169678)
+++ trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp 2014-06-07 20:17:20 UTC (rev 169679)
</span><span class="lines">@@ -395,12 +395,35 @@
</span><span class="cx">
</span><span class="cx"> void ArgumentCoder<HTTPHeaderMap>::encode(ArgumentEncoder& encoder, const HTTPHeaderMap& headerMap)
</span><span class="cx"> {
</span><del>- encoder << static_cast<const HashMap<AtomicString, String, CaseFoldingHash>&>(headerMap);
</del><ins>+ encoder << static_cast<uint64_t>(headerMap.size());
+ for (auto& keyValuePair : headerMap) {
+ encoder << keyValuePair.key;
+ encoder << keyValuePair.value;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool ArgumentCoder<HTTPHeaderMap>::decode(ArgumentDecoder& decoder, HTTPHeaderMap& headerMap)
</span><span class="cx"> {
</span><del>- return decoder.decode(static_cast<HashMap<AtomicString, String, CaseFoldingHash>&>(headerMap));
</del><ins>+ uint64_t size;
+ if (!decoder.decode(size))
+ return false;
+
+ for (size_t i = 0; i < size; ++i) {
+ AtomicString name;
+ if (!decoder.decode(name))
+ return false;
+
+ String value;
+ if (!decoder.decode(value))
+ return false;
+
+ if (!headerMap.add(name, value).isNewEntry) {
+ decoder.markInvalid();
+ return false;
+ }
+ }
+
+ return true;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>