<!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>[188567] trunk/Source</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/188567">188567</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-08-17 19:25:10 -0700 (Mon, 17 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add const to content extension parser
https://bugs.webkit.org/show_bug.cgi?id=148044
Patch by Alex Christensen <achristensen@webkit.org> on 2015-08-17
Reviewed by Benjamin Poulain.
Source/JavaScriptCore:
* runtime/JSObject.h:
(JSC::JSObject::getIndexQuickly):
(JSC::JSObject::tryGetIndexQuickly):
(JSC::JSObject::getDirectIndex):
(JSC::JSObject::getIndex):
Added a few const keywords.
Source/WebCore:
* contentextensions/ContentExtensionParser.cpp:
(WebCore::ContentExtensions::containsOnlyASCIIWithNoUppercase):
(WebCore::ContentExtensions::getDomainList):
(WebCore::ContentExtensions::getTypeFlags):
(WebCore::ContentExtensions::loadTrigger):
(WebCore::ContentExtensions::loadAction):
(WebCore::ContentExtensions::loadRule):
(WebCore::ContentExtensions::loadEncodedRules):
Add const. No change in behavior.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSObjecth">trunk/Source/JavaScriptCore/runtime/JSObject.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecontentextensionsContentExtensionParsercpp">trunk/Source/WebCore/contentextensions/ContentExtensionParser.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (188566 => 188567)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-08-18 02:07:57 UTC (rev 188566)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-08-18 02:25:10 UTC (rev 188567)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2015-08-17 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><ins>+ Add const to content extension parser
+ https://bugs.webkit.org/show_bug.cgi?id=148044
+
+ Reviewed by Benjamin Poulain.
+
+ * runtime/JSObject.h:
+ (JSC::JSObject::getIndexQuickly):
+ (JSC::JSObject::tryGetIndexQuickly):
+ (JSC::JSObject::getDirectIndex):
+ (JSC::JSObject::getIndex):
+ Added a few const keywords.
+
+2015-08-17 Alex Christensen <achristensen@webkit.org>
+
</ins><span class="cx"> Build Debug Suffix on Windows with CMake
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=148083
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSObject.h (188566 => 188567)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSObject.h 2015-08-18 02:07:57 UTC (rev 188566)
+++ trunk/Source/JavaScriptCore/runtime/JSObject.h 2015-08-18 02:25:10 UTC (rev 188567)
</span><span class="lines">@@ -222,7 +222,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- JSValue tryGetIndexQuickly(unsigned i)
</del><ins>+ JSValue tryGetIndexQuickly(unsigned i) const
</ins><span class="cx"> {
</span><span class="cx"> switch (indexingType()) {
</span><span class="cx"> case ALL_BLANK_INDEXING_TYPES:
</span><span class="lines">@@ -268,7 +268,7 @@
</span><span class="cx"> return JSValue();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- JSValue getIndex(ExecState* exec, unsigned i)
</del><ins>+ JSValue getIndex(ExecState* exec, unsigned i) const
</ins><span class="cx"> {
</span><span class="cx"> if (JSValue result = tryGetIndexQuickly(i))
</span><span class="cx"> return result;
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (188566 => 188567)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-08-18 02:07:57 UTC (rev 188566)
+++ trunk/Source/WebCore/ChangeLog 2015-08-18 02:25:10 UTC (rev 188567)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-08-17 Alex Christensen <achristensen@webkit.org>
+
+ Add const to content extension parser
+ https://bugs.webkit.org/show_bug.cgi?id=148044
+
+ Reviewed by Benjamin Poulain.
+
+ * contentextensions/ContentExtensionParser.cpp:
+ (WebCore::ContentExtensions::containsOnlyASCIIWithNoUppercase):
+ (WebCore::ContentExtensions::getDomainList):
+ (WebCore::ContentExtensions::getTypeFlags):
+ (WebCore::ContentExtensions::loadTrigger):
+ (WebCore::ContentExtensions::loadAction):
+ (WebCore::ContentExtensions::loadRule):
+ (WebCore::ContentExtensions::loadEncodedRules):
+ Add const. No change in behavior.
+
</ins><span class="cx"> 2015-08-17 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> [OS X] Remove support for composite fonts
</span></span></pre></div>
<a id="trunkSourceWebCorecontentextensionsContentExtensionParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/contentextensions/ContentExtensionParser.cpp (188566 => 188567)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/contentextensions/ContentExtensionParser.cpp 2015-08-18 02:07:57 UTC (rev 188566)
+++ trunk/Source/WebCore/contentextensions/ContentExtensionParser.cpp 2015-08-18 02:25:10 UTC (rev 188567)
</span><span class="lines">@@ -57,17 +57,16 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static std::error_code getDomainList(ExecState& exec, JSObject* arrayObject, Vector<String>& vector)
</del><ins>+static std::error_code getDomainList(ExecState& exec, const JSObject* arrayObject, Vector<String>& vector)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(vector.isEmpty());
</span><span class="cx"> if (!arrayObject || !isJSArray(arrayObject))
</span><span class="cx"> return ContentExtensionError::JSONInvalidDomainList;
</span><del>- JSArray* array = jsCast<JSArray*>(arrayObject);
</del><ins>+ const JSArray* array = jsCast<const JSArray*>(arrayObject);
</ins><span class="cx">
</span><span class="cx"> unsigned length = array->length();
</span><span class="cx"> for (unsigned i = 0; i < length; ++i) {
</span><del>- // FIXME: JSObject::getIndex should be marked as const.
- JSValue value = array->getIndex(&exec, i);
</del><ins>+ const JSValue value = array->getIndex(&exec, i);
</ins><span class="cx"> if (exec.hadException() || !value.isString())
</span><span class="cx"> return ContentExtensionError::JSONInvalidDomainList;
</span><span class="cx">
</span><span class="lines">@@ -87,15 +86,15 @@
</span><span class="cx"> if (!typeValue.isObject())
</span><span class="cx"> return { };
</span><span class="cx">
</span><del>- JSObject* object = typeValue.toObject(&exec);
</del><ins>+ const JSObject* object = typeValue.toObject(&exec);
</ins><span class="cx"> if (!isJSArray(object))
</span><span class="cx"> return ContentExtensionError::JSONInvalidTriggerFlagsArray;
</span><span class="cx">
</span><del>- JSArray* array = jsCast<JSArray*>(object);
</del><ins>+ const JSArray* array = jsCast<const JSArray*>(object);
</ins><span class="cx">
</span><span class="cx"> unsigned length = array->length();
</span><span class="cx"> for (unsigned i = 0; i < length; ++i) {
</span><del>- JSValue value = array->getIndex(&exec, i);
</del><ins>+ const JSValue value = array->getIndex(&exec, i);
</ins><span class="cx"> if (exec.hadException() || !value)
</span><span class="cx"> return ContentExtensionError::JSONInvalidObjectInTriggerFlagsArray;
</span><span class="cx">
</span><span class="lines">@@ -110,13 +109,13 @@
</span><span class="cx"> return { };
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static std::error_code loadTrigger(ExecState& exec, JSObject& ruleObject, Trigger& trigger)
</del><ins>+static std::error_code loadTrigger(ExecState& exec, const JSObject& ruleObject, Trigger& trigger)
</ins><span class="cx"> {
</span><del>- JSValue triggerObject = ruleObject.get(&exec, Identifier::fromString(&exec, "trigger"));
</del><ins>+ const JSValue triggerObject = ruleObject.get(&exec, Identifier::fromString(&exec, "trigger"));
</ins><span class="cx"> if (!triggerObject || exec.hadException() || !triggerObject.isObject())
</span><span class="cx"> return ContentExtensionError::JSONInvalidTrigger;
</span><span class="cx">
</span><del>- JSValue urlFilterObject = triggerObject.get(&exec, Identifier::fromString(&exec, "url-filter"));
</del><ins>+ const JSValue urlFilterObject = triggerObject.get(&exec, Identifier::fromString(&exec, "url-filter"));
</ins><span class="cx"> if (!urlFilterObject || exec.hadException() || !urlFilterObject.isString())
</span><span class="cx"> return ContentExtensionError::JSONInvalidURLFilterInTrigger;
</span><span class="cx">
</span><span class="lines">@@ -126,11 +125,11 @@
</span><span class="cx">
</span><span class="cx"> trigger.urlFilter = urlFilter;
</span><span class="cx">
</span><del>- JSValue urlFilterCaseValue = triggerObject.get(&exec, Identifier::fromString(&exec, "url-filter-is-case-sensitive"));
</del><ins>+ const JSValue urlFilterCaseValue = triggerObject.get(&exec, Identifier::fromString(&exec, "url-filter-is-case-sensitive"));
</ins><span class="cx"> if (urlFilterCaseValue && !exec.hadException() && urlFilterCaseValue.isBoolean())
</span><span class="cx"> trigger.urlFilterIsCaseSensitive = urlFilterCaseValue.toBoolean(&exec);
</span><span class="cx">
</span><del>- JSValue resourceTypeValue = triggerObject.get(&exec, Identifier::fromString(&exec, "resource-type"));
</del><ins>+ const JSValue resourceTypeValue = triggerObject.get(&exec, Identifier::fromString(&exec, "resource-type"));
</ins><span class="cx"> if (!exec.hadException() && resourceTypeValue.isObject()) {
</span><span class="cx"> auto typeFlagsError = getTypeFlags(exec, resourceTypeValue, trigger.flags, readResourceType);
</span><span class="cx"> if (typeFlagsError)
</span><span class="lines">@@ -138,7 +137,7 @@
</span><span class="cx"> } else if (!resourceTypeValue.isUndefined())
</span><span class="cx"> return ContentExtensionError::JSONInvalidTriggerFlagsArray;
</span><span class="cx">
</span><del>- JSValue loadTypeValue = triggerObject.get(&exec, Identifier::fromString(&exec, "load-type"));
</del><ins>+ const JSValue loadTypeValue = triggerObject.get(&exec, Identifier::fromString(&exec, "load-type"));
</ins><span class="cx"> if (!exec.hadException() && loadTypeValue.isObject()) {
</span><span class="cx"> auto typeFlagsError = getTypeFlags(exec, loadTypeValue, trigger.flags, readLoadType);
</span><span class="cx"> if (typeFlagsError)
</span><span class="lines">@@ -146,7 +145,7 @@
</span><span class="cx"> } else if (!loadTypeValue.isUndefined())
</span><span class="cx"> return ContentExtensionError::JSONInvalidTriggerFlagsArray;
</span><span class="cx">
</span><del>- JSValue ifDomain = triggerObject.get(&exec, Identifier::fromString(&exec, "if-domain"));
</del><ins>+ const JSValue ifDomain = triggerObject.get(&exec, Identifier::fromString(&exec, "if-domain"));
</ins><span class="cx"> if (!exec.hadException() && ifDomain.isObject()) {
</span><span class="cx"> auto ifDomainError = getDomainList(exec, asObject(ifDomain), trigger.domains);
</span><span class="cx"> if (ifDomainError)
</span><span class="lines">@@ -158,7 +157,7 @@
</span><span class="cx"> } else if (!ifDomain.isUndefined())
</span><span class="cx"> return ContentExtensionError::JSONInvalidDomainList;
</span><span class="cx">
</span><del>- JSValue unlessDomain = triggerObject.get(&exec, Identifier::fromString(&exec, "unless-domain"));
</del><ins>+ const JSValue unlessDomain = triggerObject.get(&exec, Identifier::fromString(&exec, "unless-domain"));
</ins><span class="cx"> if (!exec.hadException() && unlessDomain.isObject()) {
</span><span class="cx"> if (trigger.domainCondition != Trigger::DomainCondition::None)
</span><span class="cx"> return ContentExtensionError::JSONUnlessAndIfDomain;
</span><span class="lines">@@ -174,13 +173,13 @@
</span><span class="cx"> return { };
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static std::error_code loadAction(ExecState& exec, JSObject& ruleObject, Action& action)
</del><ins>+static std::error_code loadAction(ExecState& exec, const JSObject& ruleObject, Action& action)
</ins><span class="cx"> {
</span><del>- JSValue actionObject = ruleObject.get(&exec, Identifier::fromString(&exec, "action"));
</del><ins>+ const JSValue actionObject = ruleObject.get(&exec, Identifier::fromString(&exec, "action"));
</ins><span class="cx"> if (!actionObject || exec.hadException() || !actionObject.isObject())
</span><span class="cx"> return ContentExtensionError::JSONInvalidAction;
</span><span class="cx">
</span><del>- JSValue typeObject = actionObject.get(&exec, Identifier::fromString(&exec, "type"));
</del><ins>+ const JSValue typeObject = actionObject.get(&exec, Identifier::fromString(&exec, "type"));
</ins><span class="cx"> if (!typeObject || exec.hadException() || !typeObject.isString())
</span><span class="cx"> return ContentExtensionError::JSONInvalidActionType;
</span><span class="cx">
</span><span class="lines">@@ -204,7 +203,7 @@
</span><span class="cx"> return { };
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static std::error_code loadRule(ExecState& exec, JSObject& ruleObject, Vector<ContentExtensionRule>& ruleList)
</del><ins>+static std::error_code loadRule(ExecState& exec, const JSObject& ruleObject, Vector<ContentExtensionRule>& ruleList)
</ins><span class="cx"> {
</span><span class="cx"> Trigger trigger;
</span><span class="cx"> auto triggerError = loadTrigger(exec, ruleObject, trigger);
</span><span class="lines">@@ -223,7 +222,7 @@
</span><span class="cx"> static std::error_code loadEncodedRules(ExecState& exec, const String& rules, Vector<ContentExtensionRule>& ruleList)
</span><span class="cx"> {
</span><span class="cx"> // FIXME: JSONParse should require callbacks instead of an ExecState.
</span><del>- JSValue decodedRules = JSONParse(&exec, rules);
</del><ins>+ const JSValue decodedRules = JSONParse(&exec, rules);
</ins><span class="cx">
</span><span class="cx"> if (exec.hadException() || !decodedRules)
</span><span class="cx"> return ContentExtensionError::JSONInvalid;
</span><span class="lines">@@ -231,14 +230,14 @@
</span><span class="cx"> if (!decodedRules.isObject())
</span><span class="cx"> return ContentExtensionError::JSONTopLevelStructureNotAnObject;
</span><span class="cx">
</span><del>- JSObject* topLevelObject = decodedRules.toObject(&exec);
</del><ins>+ const JSObject* topLevelObject = decodedRules.toObject(&exec);
</ins><span class="cx"> if (!topLevelObject || exec.hadException())
</span><span class="cx"> return ContentExtensionError::JSONTopLevelStructureNotAnObject;
</span><span class="cx">
</span><span class="cx"> if (!isJSArray(topLevelObject))
</span><span class="cx"> return ContentExtensionError::JSONTopLevelStructureNotAnArray;
</span><span class="cx">
</span><del>- JSArray* topLevelArray = jsCast<JSArray*>(topLevelObject);
</del><ins>+ const JSArray* topLevelArray = jsCast<const JSArray*>(topLevelObject);
</ins><span class="cx">
</span><span class="cx"> Vector<ContentExtensionRule> localRuleList;
</span><span class="cx">
</span><span class="lines">@@ -247,11 +246,11 @@
</span><span class="cx"> if (length > maxRuleCount)
</span><span class="cx"> return ContentExtensionError::JSONTooManyRules;
</span><span class="cx"> for (unsigned i = 0; i < length; ++i) {
</span><del>- JSValue value = topLevelArray->getIndex(&exec, i);
</del><ins>+ const JSValue value = topLevelArray->getIndex(&exec, i);
</ins><span class="cx"> if (exec.hadException() || !value)
</span><span class="cx"> return ContentExtensionError::JSONInvalidObjectInTopLevelArray;
</span><span class="cx">
</span><del>- JSObject* ruleObject = value.toObject(&exec);
</del><ins>+ const JSObject* ruleObject = value.toObject(&exec);
</ins><span class="cx"> if (!ruleObject || exec.hadException())
</span><span class="cx"> return ContentExtensionError::JSONInvalidRule;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>