<!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>[213470] 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/213470">213470</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2017-03-06 14:56:43 -0800 (Mon, 06 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Refactor ContentExtensionParser
https://bugs.webkit.org/show_bug.cgi?id=169214
Reviewed by Brady Eidson.
No change in behavior, as verified by existing API tests.
This will make it easier to use getStringList for other things in coming patches.
* contentextensions/ContentExtensionParser.cpp:
(WebCore::ContentExtensions::getStringList):
(WebCore::ContentExtensions::getDomainList):</pre>
<h3>Modified Paths</h3>
<ul>
<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="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (213469 => 213470)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-03-06 22:55:33 UTC (rev 213469)
+++ trunk/Source/WebCore/ChangeLog 2017-03-06 22:56:43 UTC (rev 213470)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2017-03-06 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><ins>+ Refactor ContentExtensionParser
+ https://bugs.webkit.org/show_bug.cgi?id=169214
+
+ Reviewed by Brady Eidson.
+
+ No change in behavior, as verified by existing API tests.
+ This will make it easier to use getStringList for other things in coming patches.
+
+ * contentextensions/ContentExtensionParser.cpp:
+ (WebCore::ContentExtensions::getStringList):
+ (WebCore::ContentExtensions::getDomainList):
+
+2017-03-06 Alex Christensen <achristensen@webkit.org>
+
</ins><span class="cx"> Fix URLs relative to file URLs with paths beginning with Windows drive letters
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=169178
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecontentextensionsContentExtensionParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/contentextensions/ContentExtensionParser.cpp (213469 => 213470)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/contentextensions/ContentExtensionParser.cpp 2017-03-06 22:55:33 UTC (rev 213469)
+++ trunk/Source/WebCore/contentextensions/ContentExtensionParser.cpp 2017-03-06 22:56:43 UTC (rev 213470)
</span><span class="lines">@@ -59,13 +59,13 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static Expected<Vector<String>, std::error_code> getDomainList(ExecState& exec, const JSObject* arrayObject)
</del><ins>+static Expected<Vector<String>, std::error_code> getStringList(ExecState& exec, const JSObject* arrayObject, ContentExtensionError error)
</ins><span class="cx"> {
</span><span class="cx"> VM& vm = exec.vm();
</span><span class="cx"> auto scope = DECLARE_THROW_SCOPE(vm);
</span><span class="cx">
</span><span class="cx"> if (!arrayObject || !isJSArray(arrayObject))
</span><del>- return makeUnexpected(ContentExtensionError::JSONInvalidDomainList);
</del><ins>+ return makeUnexpected(error);
</ins><span class="cx"> const JSArray* array = jsCast<const JSArray*>(arrayObject);
</span><span class="cx">
</span><span class="cx"> Vector<String> domains;
</span><span class="lines">@@ -73,19 +73,29 @@
</span><span class="cx"> for (unsigned i = 0; i < length; ++i) {
</span><span class="cx"> const JSValue value = array->getIndex(&exec, i);
</span><span class="cx"> if (scope.exception() || !value.isString())
</span><del>- return makeUnexpected(ContentExtensionError::JSONInvalidDomainList);
</del><ins>+ return makeUnexpected(error);
</ins><span class="cx">
</span><del>- // Domains should be punycode encoded lower case.
</del><span class="cx"> const String& domain = asString(value)->value(&exec);
</span><span class="cx"> if (domain.isEmpty())
</span><del>- return makeUnexpected(ContentExtensionError::JSONInvalidDomainList);
- if (!containsOnlyASCIIWithNoUppercase(domain))
- return makeUnexpected(ContentExtensionError::JSONDomainNotLowerCaseASCII);
</del><ins>+ return makeUnexpected(error);
</ins><span class="cx"> domains.append(domain);
</span><span class="cx"> }
</span><span class="cx"> return WTFMove(domains);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static Expected<Vector<String>, std::error_code> getDomainList(ExecState& exec, const JSObject* arrayObject)
+{
+ auto strings = getStringList(exec, arrayObject, ContentExtensionError::JSONInvalidDomainList);
+ if (!strings.hasValue())
+ return strings;
+ for (auto& domain : strings.value()) {
+ // Domains should be punycode encoded lower case.
+ if (!containsOnlyASCIIWithNoUppercase(domain))
+ return makeUnexpected(ContentExtensionError::JSONDomainNotLowerCaseASCII);
+ }
+ return strings;
+}
+
</ins><span class="cx"> static std::error_code getTypeFlags(ExecState& exec, const JSValue& typeValue, ResourceFlags& flags, uint16_t (*stringToType)(const String&))
</span><span class="cx"> {
</span><span class="cx"> VM& vm = exec.vm();
</span></span></pre>
</div>
</div>
</body>
</html>