<!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>[169844] 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/169844">169844</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-06-11 15:01:03 -0700 (Wed, 11 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove some more unneeded member functions from HTTPHeaderMap
https://bugs.webkit.org/show_bug.cgi?id=133768
Reviewed by Simon Fraser.
* loader/CrossOriginAccessControl.cpp:
(WebCore::createAccessControlPreflightRequest):
* platform/network/HTTPHeaderMap.cpp:
(WebCore::HTTPHeaderMap::find): Deleted.
(WebCore::HTTPHeaderMap::keys): Deleted.
* platform/network/HTTPHeaderMap.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloaderCrossOriginAccessControlcpp">trunk/Source/WebCore/loader/CrossOriginAccessControl.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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (169843 => 169844)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-06-11 21:57:55 UTC (rev 169843)
+++ trunk/Source/WebCore/ChangeLog 2014-06-11 22:01:03 UTC (rev 169844)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-06-11 Anders Carlsson <andersca@apple.com>
+
+ Remove some more unneeded member functions from HTTPHeaderMap
+ https://bugs.webkit.org/show_bug.cgi?id=133768
+
+ Reviewed by Simon Fraser.
+
+ * loader/CrossOriginAccessControl.cpp:
+ (WebCore::createAccessControlPreflightRequest):
+ * platform/network/HTTPHeaderMap.cpp:
+ (WebCore::HTTPHeaderMap::find): Deleted.
+ (WebCore::HTTPHeaderMap::keys): Deleted.
+ * platform/network/HTTPHeaderMap.h:
+
</ins><span class="cx"> 2014-06-11 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviwed Mac release build fix; mark the keyPath parameter as unused.
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderCrossOriginAccessControlcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/CrossOriginAccessControl.cpp (169843 => 169844)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/CrossOriginAccessControl.cpp 2014-06-11 21:57:55 UTC (rev 169843)
+++ trunk/Source/WebCore/loader/CrossOriginAccessControl.cpp 2014-06-11 22:01:03 UTC (rev 169844)
</span><span class="lines">@@ -116,13 +116,13 @@
</span><span class="cx"> StringBuilder headerBuffer;
</span><span class="cx">
</span><span class="cx"> bool appendComma = false;
</span><del>- for (const auto& headerName : requestHeaderFields.keys()) {
</del><ins>+ for (const auto& headerField : requestHeaderFields) {
</ins><span class="cx"> if (appendComma)
</span><span class="cx"> headerBuffer.appendLiteral(", ");
</span><span class="cx"> else
</span><span class="cx"> appendComma = true;
</span><span class="cx">
</span><del>- headerBuffer.append(headerName);
</del><ins>+ headerBuffer.append(headerField.key);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> preflightRequest.setHTTPHeaderField("Access-Control-Request-Headers", headerBuffer.toString().lower());
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkHTTPHeaderMapcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/HTTPHeaderMap.cpp (169843 => 169844)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/HTTPHeaderMap.cpp 2014-06-11 21:57:55 UTC (rev 169843)
+++ trunk/Source/WebCore/platform/network/HTTPHeaderMap.cpp 2014-06-11 22:01:03 UTC (rev 169844)
</span><span class="lines">@@ -108,11 +108,6 @@
</span><span class="cx"> return find(name) != end();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HTTPHeaderMap::iterator HTTPHeaderMap::find(const char* name)
-{
- return m_headers.find<CaseFoldingCStringTranslator>(name);
-}
-
</del><span class="cx"> HTTPHeaderMap::const_iterator HTTPHeaderMap::find(const char* name) const
</span><span class="cx"> {
</span><span class="cx"> return m_headers.find<CaseFoldingCStringTranslator>(name);
</span><span class="lines">@@ -128,10 +123,4 @@
</span><span class="cx"> return m_headers.remove(m_headers.find<CaseFoldingCStringTranslator>(name));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WTF::IteratorRange<HTTPHeaderMap::const_iterator::Keys> HTTPHeaderMap::keys() const
-{
- return m_headers.keys();
-}
-
-
</del><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 (169843 => 169844)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/HTTPHeaderMap.h 2014-06-11 21:57:55 UTC (rev 169843)
+++ trunk/Source/WebCore/platform/network/HTTPHeaderMap.h 2014-06-11 22:01:03 UTC (rev 169844)
</span><span class="lines">@@ -44,7 +44,6 @@
</span><span class="cx"> typedef HashMap<AtomicString, String, CaseFoldingHash> HashMapType;
</span><span class="cx"> public:
</span><span class="cx"> typedef HashMapType::const_iterator const_iterator;
</span><del>- typedef HashMapType::iterator iterator;
</del><span class="cx"> typedef HashMapType::AddResult AddResult;
</span><span class="cx">
</span><span class="cx"> HTTPHeaderMap();
</span><span class="lines">@@ -68,15 +67,12 @@
</span><span class="cx"> bool contains(const char*) const;
</span><span class="cx"> String get(const char*) const;
</span><span class="cx"> const_iterator find(const char*) const;
</span><del>- iterator find(const char*);
</del><span class="cx"> AddResult add(const char* name, const String& value);
</span><span class="cx"> bool remove(const char*);
</span><span class="cx">
</span><span class="cx"> const_iterator begin() const { return m_headers.begin(); }
</span><span class="cx"> const_iterator end() const { return m_headers.end(); }
</span><span class="cx">
</span><del>- WTF::IteratorRange<const_iterator::Keys> keys() const;
-
</del><span class="cx"> friend bool operator==(const HTTPHeaderMap& a, const HTTPHeaderMap& b)
</span><span class="cx"> {
</span><span class="cx"> return a.m_headers == b.m_headers;
</span></span></pre>
</div>
</div>
</body>
</html>