<!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>[169941] 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/169941">169941</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-06-13 11:56:29 -0700 (Fri, 13 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add a HTTPHeaderMap::find overload that takes a HTTPHeaderName
https://bugs.webkit.org/show_bug.cgi?id=133872
Reviewed by Andreas Kling.
* loader/DocumentLoader.cpp:
(WebCore::DocumentLoader::responseReceived):
* platform/network/HTTPHeaderMap.cpp:
(WebCore::HTTPHeaderMap::get):
(WebCore::HTTPHeaderMap::find):
* platform/network/HTTPHeaderMap.h:
* platform/network/HTTPHeaderNames.in:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</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="#trunkSourceWebCoreplatformnetworkHTTPHeaderNamesin">trunk/Source/WebCore/platform/network/HTTPHeaderNames.in</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (169940 => 169941)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-06-13 18:48:04 UTC (rev 169940)
+++ trunk/Source/WebCore/ChangeLog 2014-06-13 18:56:29 UTC (rev 169941)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-06-13 Anders Carlsson <andersca@apple.com>
+
+ Add a HTTPHeaderMap::find overload that takes a HTTPHeaderName
+ https://bugs.webkit.org/show_bug.cgi?id=133872
+
+ Reviewed by Andreas Kling.
+
+ * loader/DocumentLoader.cpp:
+ (WebCore::DocumentLoader::responseReceived):
+ * platform/network/HTTPHeaderMap.cpp:
+ (WebCore::HTTPHeaderMap::get):
+ (WebCore::HTTPHeaderMap::find):
+ * platform/network/HTTPHeaderMap.h:
+ * platform/network/HTTPHeaderNames.in:
+
</ins><span class="cx"> 2014-06-13 Frédéric Wang <fred.wang@free.fr>
</span><span class="cx">
</span><span class="cx"> Draw radicals with glyphs for better rendering
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderDocumentLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/DocumentLoader.cpp (169940 => 169941)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/DocumentLoader.cpp 2014-06-13 18:48:04 UTC (rev 169940)
+++ trunk/Source/WebCore/loader/DocumentLoader.cpp 2014-06-13 18:56:29 UTC (rev 169941)
</span><span class="lines">@@ -46,6 +46,7 @@
</span><span class="cx"> #include "FrameTree.h"
</span><span class="cx"> #include "HTMLFormElement.h"
</span><span class="cx"> #include "HTMLFrameOwnerElement.h"
</span><ins>+#include "HTTPHeaderNames.h"
</ins><span class="cx"> #include "HistoryItem.h"
</span><span class="cx"> #include "IconController.h"
</span><span class="cx"> #include "InspectorInstrumentation.h"
</span><span class="lines">@@ -604,7 +605,7 @@
</span><span class="cx"> if (willLoadFallback)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- auto it = response.httpHeaderFields().find("x-frame-options");
</del><ins>+ auto it = response.httpHeaderFields().find(HTTPHeaderName::XFrameOptions);
</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 (169940 => 169941)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/HTTPHeaderMap.cpp 2014-06-13 18:48:04 UTC (rev 169940)
+++ trunk/Source/WebCore/platform/network/HTTPHeaderMap.cpp 2014-06-13 18:56:29 UTC (rev 169941)
</span><span class="lines">@@ -106,15 +106,15 @@
</span><span class="cx">
</span><span class="cx"> String HTTPHeaderMap::get(const char* name) const
</span><span class="cx"> {
</span><del>- auto it = find(name);
</del><ins>+ auto it = m_headers.find<CaseFoldingCStringTranslator>(name);
</ins><span class="cx"> if (it == end())
</span><span class="cx"> return String();
</span><span class="cx"> return it->value;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HTTPHeaderMap::const_iterator HTTPHeaderMap::find(const char* name) const
</del><ins>+HTTPHeaderMap::const_iterator HTTPHeaderMap::find(HTTPHeaderName name) const
</ins><span class="cx"> {
</span><del>- return m_headers.find<CaseFoldingCStringTranslator>(name);
</del><ins>+ return m_headers.find(httpHeaderNameString(name).toStringWithoutCopying());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool HTTPHeaderMap::remove(HTTPHeaderName name)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkHTTPHeaderMaph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/HTTPHeaderMap.h (169940 => 169941)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/HTTPHeaderMap.h 2014-06-13 18:48:04 UTC (rev 169940)
+++ trunk/Source/WebCore/platform/network/HTTPHeaderMap.h 2014-06-13 18:56:29 UTC (rev 169941)
</span><span class="lines">@@ -65,11 +65,12 @@
</span><span class="cx">
</span><span class="cx"> bool contains(HTTPHeaderName) const;
</span><span class="cx"> String get(const char*) const;
</span><del>- const_iterator find(const char*) const;
</del><ins>+ const_iterator find(HTTPHeaderName) const;
</ins><span class="cx"> bool remove(HTTPHeaderName);
</span><span class="cx">
</span><span class="cx"> // Instead of passing a string literal to any of these functions, just use a HTTPHeaderName instead.
</span><span class="cx"> template<size_t length> bool contains(const char (&)[length]) = delete;
</span><ins>+ template<size_t length> const_iterator find(const char(&)[length]) = delete;
</ins><span class="cx"> template<size_t length> bool remove(const char (&)[length]) = delete;
</span><span class="cx">
</span><span class="cx"> const_iterator begin() const { return m_headers.begin(); }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkHTTPHeaderNamesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/HTTPHeaderNames.in (169940 => 169941)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/HTTPHeaderNames.in 2014-06-13 18:48:04 UTC (rev 169940)
+++ trunk/Source/WebCore/platform/network/HTTPHeaderNames.in 2014-06-13 18:56:29 UTC (rev 169941)
</span><span class="lines">@@ -35,4 +35,5 @@
</span><span class="cx"> Location
</span><span class="cx"> Origin
</span><span class="cx"> Referer
</span><del>-User-Agent
</del><span class="cx">\ No newline at end of file
</span><ins>+User-Agent
+X-Frame-Options
</ins></span></pre>
</div>
</div>
</body>
</html>