<!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>[169978] 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/169978">169978</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-06-14 13:33:49 -0700 (Sat, 14 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Simplify Document::processHttpEquiv
https://bugs.webkit.org/show_bug.cgi?id=133910
Reviewed by Andreas Kling.
* dom/Document.cpp:
(WebCore::Document::processHttpEquiv):
* platform/network/HTTPHeaderNames.in:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</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 (169977 => 169978)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-06-14 19:39:19 UTC (rev 169977)
+++ trunk/Source/WebCore/ChangeLog 2014-06-14 20:33:49 UTC (rev 169978)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-06-14 Anders Carlsson <andersca@apple.com>
+
+ Simplify Document::processHttpEquiv
+ https://bugs.webkit.org/show_bug.cgi?id=133910
+
+ Reviewed by Andreas Kling.
+
+ * dom/Document.cpp:
+ (WebCore::Document::processHttpEquiv):
+ * platform/network/HTTPHeaderNames.in:
+
</ins><span class="cx"> 2014-06-14 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> GCController should return FastMalloc memory to the system.
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (169977 => 169978)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2014-06-14 19:39:19 UTC (rev 169977)
+++ trunk/Source/WebCore/dom/Document.cpp 2014-06-14 20:33:49 UTC (rev 169978)
</span><span class="lines">@@ -83,6 +83,7 @@
</span><span class="cx"> #include "HTMLScriptElement.h"
</span><span class="cx"> #include "HTMLStyleElement.h"
</span><span class="cx"> #include "HTMLTitleElement.h"
</span><ins>+#include "HTTPHeaderNames.h"
</ins><span class="cx"> #include "HTTPParsers.h"
</span><span class="cx"> #include "HashChangeEvent.h"
</span><span class="cx"> #include "History.h"
</span><span class="lines">@@ -2787,17 +2788,24 @@
</span><span class="cx">
</span><span class="cx"> Frame* frame = this->frame();
</span><span class="cx">
</span><del>- if (equalIgnoringCase(equiv, "default-style")) {
- // The preferred style set has been overridden as per section
</del><ins>+ HTTPHeaderName headerName;
+ if (!findHTTPHeaderName(equiv, headerName))
+ return;
+
+ switch (headerName) {
+ case HTTPHeaderName::DefaultStyle:
+ // The preferred style set has been overridden as per section
</ins><span class="cx"> // 14.3.2 of the HTML4.0 specification. We need to update the
</span><del>- // sheet used variable and then update our style selector.
</del><ins>+ // sheet used variable and then update our style selector.
</ins><span class="cx"> // For more info, see the test at:
</span><span class="cx"> // http://www.hixie.ch/tests/evil/css/import/main/preferred.html
</span><span class="cx"> // -dwh
</span><span class="cx"> m_styleSheetCollection.setSelectedStylesheetSetName(content);
</span><span class="cx"> m_styleSheetCollection.setPreferredStylesheetSetName(content);
</span><span class="cx"> styleResolverChanged(DeferRecalcStyle);
</span><del>- } else if (equalIgnoringCase(equiv, "refresh")) {
</del><ins>+ break;
+
+ case HTTPHeaderName::Refresh: {
</ins><span class="cx"> double delay;
</span><span class="cx"> String urlString;
</span><span class="cx"> if (frame && parseHTTPRefresh(content, true, delay, urlString)) {
</span><span class="lines">@@ -2813,17 +2821,27 @@
</span><span class="cx"> addConsoleMessage(MessageSource::Security, MessageLevel::Error, message);
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- } else if (equalIgnoringCase(equiv, "set-cookie")) {
</del><ins>+
+ break;
+ }
+
+ case HTTPHeaderName::SetCookie:
</ins><span class="cx"> // FIXME: make setCookie work on XML documents too; e.g. in case of <html:meta .....>
</span><span class="cx"> if (isHTMLDocument()) {
</span><span class="cx"> // Exception (for sandboxed documents) ignored.
</span><span class="cx"> toHTMLDocument(this)->setCookie(content, IGNORE_EXCEPTION);
</span><span class="cx"> }
</span><del>- } else if (equalIgnoringCase(equiv, "content-language"))
</del><ins>+ break;
+
+ case HTTPHeaderName::ContentLanguage:
</ins><span class="cx"> setContentLanguage(content);
</span><del>- else if (equalIgnoringCase(equiv, "x-dns-prefetch-control"))
</del><ins>+ break;
+
+ case HTTPHeaderName::XDNSPrefetchControl:
</ins><span class="cx"> parseDNSPrefetchControlHeader(content);
</span><del>- else if (equalIgnoringCase(equiv, "x-frame-options")) {
</del><ins>+ break;
+
+ case HTTPHeaderName::XFrameOptions:
</ins><span class="cx"> if (frame) {
</span><span class="cx"> FrameLoader& frameLoader = frame->loader();
</span><span class="cx"> unsigned long requestIdentifier = 0;
</span><span class="lines">@@ -2839,14 +2857,27 @@
</span><span class="cx"> addConsoleMessage(MessageSource::Security, MessageLevel::Error, message, requestIdentifier);
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- } else if (equalIgnoringCase(equiv, "content-security-policy"))
</del><ins>+ break;
+
+ case HTTPHeaderName::ContentSecurityPolicy:
</ins><span class="cx"> contentSecurityPolicy()->didReceiveHeader(content, ContentSecurityPolicy::Enforce);
</span><del>- else if (equalIgnoringCase(equiv, "content-security-policy-report-only"))
</del><ins>+ break;
+
+ case HTTPHeaderName::ContentSecurityPolicyReportOnly:
</ins><span class="cx"> contentSecurityPolicy()->didReceiveHeader(content, ContentSecurityPolicy::Report);
</span><del>- else if (equalIgnoringCase(equiv, "x-webkit-csp"))
</del><ins>+ break;
+
+ case HTTPHeaderName::XWebKitCSP:
</ins><span class="cx"> contentSecurityPolicy()->didReceiveHeader(content, ContentSecurityPolicy::PrefixedEnforce);
</span><del>- else if (equalIgnoringCase(equiv, "x-webkit-csp-report-only"))
</del><ins>+ break;
+
+ case HTTPHeaderName::XWebKitCSPReportOnly:
</ins><span class="cx"> contentSecurityPolicy()->didReceiveHeader(content, ContentSecurityPolicy::PrefixedReport);
</span><ins>+ break;
+
+ default:
+ break;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Though isspace() considers \t and \v to be whitespace, Win IE doesn't.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkHTTPHeaderNamesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/HTTPHeaderNames.in (169977 => 169978)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/HTTPHeaderNames.in 2014-06-14 19:39:19 UTC (rev 169977)
+++ trunk/Source/WebCore/platform/network/HTTPHeaderNames.in 2014-06-14 20:33:49 UTC (rev 169978)
</span><span class="lines">@@ -29,9 +29,13 @@
</span><span class="cx"> Authorization
</span><span class="cx"> Cache-Control
</span><span class="cx"> Connection
</span><ins>+Content-Language
</ins><span class="cx"> Content-Length
</span><ins>+Content-Security-Policy
+Content-Security-Policy-Report-Only
</ins><span class="cx"> Content-Type
</span><span class="cx"> Cookie
</span><ins>+Default-Style
</ins><span class="cx"> Host
</span><span class="cx"> If-Match
</span><span class="cx"> If-Modified-Since
</span><span class="lines">@@ -47,6 +51,7 @@
</span><span class="cx"> Pragma
</span><span class="cx"> Range
</span><span class="cx"> Referer
</span><ins>+Refresh
</ins><span class="cx"> Sec-WebSocket-Accept
</span><span class="cx"> Sec-WebSocket-Extensions
</span><span class="cx"> Sec-WebSocket-Key
</span><span class="lines">@@ -56,7 +61,10 @@
</span><span class="cx"> Set-Cookie2
</span><span class="cx"> Upgrade
</span><span class="cx"> User-Agent
</span><ins>+X-DNS-Prefetch-Control
</ins><span class="cx"> X-Frame-Options
</span><ins>+X-WebKit-CSP
+X-WebKit-CSP-Report-Only
</ins><span class="cx">
</span><span class="cx"> // These headers are specific to GStreamer.
</span><span class="cx"> Icy-Metadata
</span></span></pre>
</div>
</div>
</body>
</html>