<!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>[173142] 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/173142">173142</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-08-30 16:19:32 -0700 (Sat, 30 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Convert string literals to character literals in makeString usage
https://bugs.webkit.org/show_bug.cgi?id=136394
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2014-08-30
Reviewed by Sam Weinig.
* inspector/InspectorOverlay.cpp:
(WebCore::InspectorOverlay::evaluateInOverlay):
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::setOriginalURLForDownloadRequest):
* loader/MixedContentChecker.cpp:
(WebCore::MixedContentChecker::logWarning):
* page/ContentSecurityPolicy.cpp:
(WebCore::CSPDirectiveList::checkMediaTypeAndReportViolation):
(WebCore::ContentSecurityPolicy::reportUnsupportedDirective):
(WebCore::ContentSecurityPolicy::reportInvalidPathCharacter):
Also reorder some code to ensure single string creation.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorOverlaycpp">trunk/Source/WebCore/inspector/InspectorOverlay.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderFrameLoadercpp">trunk/Source/WebCore/loader/FrameLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderMixedContentCheckercpp">trunk/Source/WebCore/loader/MixedContentChecker.cpp</a></li>
<li><a href="#trunkSourceWebCorepageContentSecurityPolicycpp">trunk/Source/WebCore/page/ContentSecurityPolicy.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (173141 => 173142)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-08-30 22:43:33 UTC (rev 173141)
+++ trunk/Source/WebCore/ChangeLog 2014-08-30 23:19:32 UTC (rev 173142)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-08-30 Joseph Pecoraro <pecoraro@apple.com>
+
+ Convert string literals to character literals in makeString usage
+ https://bugs.webkit.org/show_bug.cgi?id=136394
+
+ Reviewed by Sam Weinig.
+
+ * inspector/InspectorOverlay.cpp:
+ (WebCore::InspectorOverlay::evaluateInOverlay):
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::setOriginalURLForDownloadRequest):
+ * loader/MixedContentChecker.cpp:
+ (WebCore::MixedContentChecker::logWarning):
+ * page/ContentSecurityPolicy.cpp:
+ (WebCore::CSPDirectiveList::checkMediaTypeAndReportViolation):
+ (WebCore::ContentSecurityPolicy::reportUnsupportedDirective):
+ (WebCore::ContentSecurityPolicy::reportInvalidPathCharacter):
+ Also reorder some code to ensure single string creation.
+
</ins><span class="cx"> 2014-08-26 Maciej Stachowiak <mjs@apple.com>
</span><span class="cx">
</span><span class="cx"> Use RetainPtr::autorelease in some places where it seems appropriate
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorOverlaycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorOverlay.cpp (173141 => 173142)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorOverlay.cpp 2014-08-30 22:43:33 UTC (rev 173141)
+++ trunk/Source/WebCore/inspector/InspectorOverlay.cpp 2014-08-30 23:19:32 UTC (rev 173142)
</span><span class="lines">@@ -869,7 +869,7 @@
</span><span class="cx"> {
</span><span class="cx"> RefPtr<InspectorArray> command = InspectorArray::create();
</span><span class="cx"> command->pushString(method);
</span><del>- overlayPage()->mainFrame().script().evaluate(ScriptSourceCode(makeString("dispatch(", command->toJSONString(), ")")));
</del><ins>+ overlayPage()->mainFrame().script().evaluate(ScriptSourceCode(makeString("dispatch(", command->toJSONString(), ')')));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorOverlay::evaluateInOverlay(const String& method, const String& argument)
</span><span class="lines">@@ -877,7 +877,7 @@
</span><span class="cx"> RefPtr<InspectorArray> command = InspectorArray::create();
</span><span class="cx"> command->pushString(method);
</span><span class="cx"> command->pushString(argument);
</span><del>- overlayPage()->mainFrame().script().evaluate(ScriptSourceCode(makeString("dispatch(", command->toJSONString(), ")")));
</del><ins>+ overlayPage()->mainFrame().script().evaluate(ScriptSourceCode(makeString("dispatch(", command->toJSONString(), ')')));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorOverlay::evaluateInOverlay(const String& method, PassRefPtr<InspectorValue> argument)
</span><span class="lines">@@ -885,7 +885,7 @@
</span><span class="cx"> RefPtr<InspectorArray> command = InspectorArray::create();
</span><span class="cx"> command->pushString(method);
</span><span class="cx"> command->pushValue(argument);
</span><del>- overlayPage()->mainFrame().script().evaluate(ScriptSourceCode(makeString("dispatch(", command->toJSONString(), ")")));
</del><ins>+ overlayPage()->mainFrame().script().evaluate(ScriptSourceCode(makeString("dispatch(", command->toJSONString(), ')')));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorOverlay::freePage()
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (173141 => 173142)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoader.cpp 2014-08-30 22:43:33 UTC (rev 173141)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2014-08-30 23:19:32 UTC (rev 173142)
</span><span class="lines">@@ -2358,7 +2358,7 @@
</span><span class="cx"> // FIXME: Using host-only URL is a very heavy-handed approach. We should attempt to provide the actual page where the download was initiated from, as a reminder to the user.
</span><span class="cx"> String hostOnlyURLString;
</span><span class="cx"> if (port)
</span><del>- hostOnlyURLString = makeString(originalURL.protocol(), "://", originalURL.host(), ":", String::number(port));
</del><ins>+ hostOnlyURLString = makeString(originalURL.protocol(), "://", originalURL.host(), ':', String::number(port));
</ins><span class="cx"> else
</span><span class="cx"> hostOnlyURLString = makeString(originalURL.protocol(), "://", originalURL.host());
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderMixedContentCheckercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/MixedContentChecker.cpp (173141 => 173142)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/MixedContentChecker.cpp 2014-08-30 22:43:33 UTC (rev 173141)
+++ trunk/Source/WebCore/loader/MixedContentChecker.cpp 2014-08-30 23:19:32 UTC (rev 173142)
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx">
</span><span class="cx"> void MixedContentChecker::logWarning(bool allowed, const String& action, const URL& target) const
</span><span class="cx"> {
</span><del>- String message = makeString((allowed ? "" : "[blocked] "), "The page at ", m_frame.document()->url().stringCenterEllipsizedToLength(), " ", action, " insecure content from ", target.stringCenterEllipsizedToLength(), ".\n");
</del><ins>+ String message = makeString((allowed ? String() : "[blocked] "), "The page at ", m_frame.document()->url().stringCenterEllipsizedToLength(), ' ', action, " insecure content from ", target.stringCenterEllipsizedToLength(), ".\n");
</ins><span class="cx"> m_frame.document()->addConsoleMessage(MessageSource::Security, MessageLevel::Warning, message);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageContentSecurityPolicycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ContentSecurityPolicy.cpp (173141 => 173142)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ContentSecurityPolicy.cpp 2014-08-30 22:43:33 UTC (rev 173141)
+++ trunk/Source/WebCore/page/ContentSecurityPolicy.cpp 2014-08-30 23:19:32 UTC (rev 173142)
</span><span class="lines">@@ -929,7 +929,7 @@
</span><span class="cx"> if (checkMediaType(directive, type, typeAttribute))
</span><span class="cx"> return true;
</span><span class="cx">
</span><del>- String message = makeString(consoleMessage, "\'", directive->text(), "\'.");
</del><ins>+ String message = makeString(consoleMessage, '\'', directive->text(), "\'.");
</ins><span class="cx"> if (typeAttribute.isEmpty())
</span><span class="cx"> message = message + " When enforcing the 'plugin-types' directive, the plugin's media type must be explicitly declared with a 'type' attribute on the containing element (e.g. '<object type=\"[TYPE GOES HERE]\" ...>').";
</span><span class="cx">
</span><span class="lines">@@ -1682,13 +1682,15 @@
</span><span class="cx"> DEPRECATED_DEFINE_STATIC_LOCAL(String, optionsMessage, (ASCIILiteral("The 'options' directive has been replaced with 'unsafe-inline' and 'unsafe-eval' source expressions for the 'script-src' and 'style-src' directives. Please use those directives instead, as 'options' has no effect.")));
</span><span class="cx"> DEPRECATED_DEFINE_STATIC_LOCAL(String, policyURIMessage, (ASCIILiteral("The 'policy-uri' directive has been removed from the specification. Please specify a complete policy via the Content-Security-Policy header.")));
</span><span class="cx">
</span><del>- String message = makeString("Unrecognized Content-Security-Policy directive '", name, "'.\n");
</del><ins>+ String message;
</ins><span class="cx"> if (equalIgnoringCase(name, allow))
</span><span class="cx"> message = allowMessage;
</span><span class="cx"> else if (equalIgnoringCase(name, options))
</span><span class="cx"> message = optionsMessage;
</span><span class="cx"> else if (equalIgnoringCase(name, policyURI))
</span><span class="cx"> message = policyURIMessage;
</span><ins>+ else
+ message = makeString("Unrecognized Content-Security-Policy directive '", name, "'.\n");
</ins><span class="cx">
</span><span class="cx"> logToConsole(message);
</span><span class="cx"> }
</span><span class="lines">@@ -1735,9 +1737,12 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(invalidChar == '#' || invalidChar == '?');
</span><span class="cx">
</span><del>- String ignoring = "The fragment identifier, including the '#', will be ignored.";
</del><ins>+ String ignoring;
</ins><span class="cx"> if (invalidChar == '?')
</span><span class="cx"> ignoring = "The query component, including the '?', will be ignored.";
</span><ins>+ else
+ ignoring = "The fragment identifier, including the '#', will be ignored.";
+
</ins><span class="cx"> String message = makeString("The source list for Content Security Policy directive '", directiveName, "' contains a source with an invalid path: '", value, "'. ", ignoring);
</span><span class="cx"> logToConsole(message);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>