<!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>[192680] 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/192680">192680</a></dd>
<dt>Author</dt> <dd>youenn.fablet@crf.canon.fr</dd>
<dt>Date</dt> <dd>2015-11-20 01:25:56 -0800 (Fri, 20 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use HTTPHeaderName as much as possible in XMLHttpRequest
https://bugs.webkit.org/show_bug.cgi?id=151438
Reviewed by Darin Adler.
Removing XMLHttpRequest::setRequestHeaderInternal and XMLHttpRequest::getRequestHeader.
Using directly HTTPHeaderMap.add, HTTPHeaderMap.set and HTTPHeaderMap.get.
No change in behavior.
* xml/XMLHttpRequest.cpp:
(WebCore::XMLHttpRequest::send):
(WebCore::XMLHttpRequest::setRequestHeader):
(WebCore::XMLHttpRequest::getAllResponseHeaders):
* xml/XMLHttpRequest.h:</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>
<li><a href="#trunkSourceWebCorexmlXMLHttpRequesth">trunk/Source/WebCore/xml/XMLHttpRequest.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (192679 => 192680)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-11-20 09:06:05 UTC (rev 192679)
+++ trunk/Source/WebCore/ChangeLog 2015-11-20 09:25:56 UTC (rev 192680)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-11-20 Youenn Fablet <youenn.fablet@crf.canon.fr>
+
+ Use HTTPHeaderName as much as possible in XMLHttpRequest
+ https://bugs.webkit.org/show_bug.cgi?id=151438
+
+ Reviewed by Darin Adler.
+
+ Removing XMLHttpRequest::setRequestHeaderInternal and XMLHttpRequest::getRequestHeader.
+ Using directly HTTPHeaderMap.add, HTTPHeaderMap.set and HTTPHeaderMap.get.
+
+ No change in behavior.
+
+ * xml/XMLHttpRequest.cpp:
+ (WebCore::XMLHttpRequest::send):
+ (WebCore::XMLHttpRequest::setRequestHeader):
+ (WebCore::XMLHttpRequest::getAllResponseHeaders):
+ * xml/XMLHttpRequest.h:
+
</ins><span class="cx"> 2015-11-20 Eric Carlson <eric.carlson@apple.com>
</span><span class="cx">
</span><span class="cx"> MediaStream: Fix mock video source crash
</span></span></pre></div>
<a id="trunkSourceWebCorexmlXMLHttpRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/XMLHttpRequest.cpp (192679 => 192680)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/XMLHttpRequest.cpp 2015-11-20 09:06:05 UTC (rev 192679)
+++ trunk/Source/WebCore/xml/XMLHttpRequest.cpp 2015-11-20 09:25:56 UTC (rev 192680)
</span><span class="lines">@@ -595,11 +595,11 @@
</span><span class="cx"> if (!m_requestHeaders.contains(HTTPHeaderName::ContentType)) {
</span><span class="cx"> #if ENABLE(DASHBOARD_SUPPORT)
</span><span class="cx"> if (usesDashboardBackwardCompatibilityMode())
</span><del>- setRequestHeaderInternal("Content-Type", "application/x-www-form-urlencoded");
</del><ins>+ m_requestHeaders.set(HTTPHeaderName::ContentType, ASCIILiteral("application/x-www-form-urlencoded"));
</ins><span class="cx"> else
</span><span class="cx"> #endif
</span><span class="cx"> // FIXME: this should include the charset used for encoding.
</span><del>- setRequestHeaderInternal("Content-Type", document->isHTMLDocument() ? "text/html;charset=UTF-8":"application/xml;charset=UTF-8");
</del><ins>+ m_requestHeaders.set(HTTPHeaderName::ContentType, document->isHTMLDocument() ? ASCIILiteral("text/html;charset=UTF-8") : ASCIILiteral("application/xml;charset=UTF-8"));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // FIXME: According to XMLHttpRequest Level 2, this should use the Document.innerHTML algorithm
</span><span class="lines">@@ -620,14 +620,14 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (!body.isNull() && m_method != "GET" && m_method != "HEAD" && m_url.protocolIsInHTTPFamily()) {
</span><del>- String contentType = getRequestHeader("Content-Type");
</del><ins>+ String contentType = m_requestHeaders.get(HTTPHeaderName::ContentType);
</ins><span class="cx"> if (contentType.isNull()) {
</span><span class="cx"> #if ENABLE(DASHBOARD_SUPPORT)
</span><span class="cx"> if (usesDashboardBackwardCompatibilityMode())
</span><del>- setRequestHeaderInternal("Content-Type", "application/x-www-form-urlencoded");
</del><ins>+ m_requestHeaders.set(HTTPHeaderName::ContentType, ASCIILiteral("application/x-www-form-urlencoded"));
</ins><span class="cx"> else
</span><span class="cx"> #endif
</span><del>- setRequestHeaderInternal("Content-Type", "text/plain;charset=UTF-8");
</del><ins>+ m_requestHeaders.set(HTTPHeaderName::ContentType, ASCIILiteral("text/plain;charset=UTF-8"));
</ins><span class="cx"> } else {
</span><span class="cx"> replaceCharsetInMediaType(contentType, "UTF-8");
</span><span class="cx"> m_requestHeaders.set(HTTPHeaderName::ContentType, contentType);
</span><span class="lines">@@ -650,10 +650,10 @@
</span><span class="cx"> if (!m_requestHeaders.contains(HTTPHeaderName::ContentType)) {
</span><span class="cx"> const String& blobType = body->type();
</span><span class="cx"> if (!blobType.isEmpty() && isValidContentType(blobType))
</span><del>- setRequestHeaderInternal("Content-Type", blobType);
</del><ins>+ m_requestHeaders.set(HTTPHeaderName::ContentType, blobType);
</ins><span class="cx"> else {
</span><span class="cx"> // From FileAPI spec, whenever media type cannot be determined, empty string must be returned.
</span><del>- setRequestHeaderInternal("Content-Type", "");
</del><ins>+ m_requestHeaders.set(HTTPHeaderName::ContentType, emptyString());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -675,7 +675,7 @@
</span><span class="cx"> m_requestEntityBody->generateFiles(document());
</span><span class="cx">
</span><span class="cx"> if (!m_requestHeaders.contains(HTTPHeaderName::ContentType))
</span><del>- setRequestHeaderInternal("Content-Type", makeString("multipart/form-data; boundary=", m_requestEntityBody->boundary().data()));
</del><ins>+ m_requestHeaders.set(HTTPHeaderName::ContentType, makeString("multipart/form-data; boundary=", m_requestEntityBody->boundary().data()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> createRequest(ec);
</span><span class="lines">@@ -955,19 +955,9 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- setRequestHeaderInternal(name, normalizedValue);
</del><ins>+ m_requestHeaders.add(name, normalizedValue);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void XMLHttpRequest::setRequestHeaderInternal(const String& name, const String& value)
-{
- m_requestHeaders.add(name, value);
-}
-
-String XMLHttpRequest::getRequestHeader(const String& name) const
-{
- return m_requestHeaders.get(name);
-}
-
</del><span class="cx"> String XMLHttpRequest::getAllResponseHeaders() const
</span><span class="cx"> {
</span><span class="cx"> if (m_state < HEADERS_RECEIVED || m_error)
</span></span></pre></div>
<a id="trunkSourceWebCorexmlXMLHttpRequesth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/XMLHttpRequest.h (192679 => 192680)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/XMLHttpRequest.h 2015-11-20 09:06:05 UTC (rev 192679)
+++ trunk/Source/WebCore/xml/XMLHttpRequest.h 2015-11-20 09:25:56 UTC (rev 192680)
</span><span class="lines">@@ -176,9 +176,6 @@
</span><span class="cx"> bool initSend(ExceptionCode&);
</span><span class="cx"> void sendBytesData(const void*, size_t, ExceptionCode&);
</span><span class="cx">
</span><del>- String getRequestHeader(const String& name) const;
- void setRequestHeaderInternal(const String& name, const String& value);
-
</del><span class="cx"> void changeState(State newState);
</span><span class="cx"> void callReadyStateChangeListener();
</span><span class="cx"> void dropProtection();
</span></span></pre>
</div>
</div>
</body>
</html>