<!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>[181978] trunk</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/181978">181978</a></dd>
<dt>Author</dt> <dd>weinig@apple.com</dd>
<dt>Date</dt> <dd>2015-03-25 15:56:19 -0700 (Wed, 25 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Address additional review feedback from https://bugs.webkit.org/show_bug.cgi?id=143059.
Source/WebCore:
* contentextensions/ContentExtensionCompiler.cpp:
(WebCore::ContentExtensions::compileRuleList):
* contentextensions/ContentExtensionCompiler.h:
* contentextensions/ContentExtensionParser.cpp:
(WebCore::ContentExtensions::getTypeFlags):
Source/WebKit2:
* Shared/WebCompiledContentExtension.cpp:
(WebKit::WebCompiledContentExtension::createFromCompiledContentExtensionData):
* UIProcess/API/C/WKUserContentFilterRef.cpp:
(WKUserContentFilterCreate):
* UIProcess/API/Cocoa/_WKUserContentFilter.mm:
(-[_WKUserContentFilter initWithName:serializedRules:]):
Tools:
* TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp:
(TestWebKitAPI::InMemoryCompiledContentExtension::createFromFilter):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecontentextensionsContentExtensionCompilercpp">trunk/Source/WebCore/contentextensions/ContentExtensionCompiler.cpp</a></li>
<li><a href="#trunkSourceWebCorecontentextensionsContentExtensionCompilerh">trunk/Source/WebCore/contentextensions/ContentExtensionCompiler.h</a></li>
<li><a href="#trunkSourceWebCorecontentextensionsContentExtensionParsercpp">trunk/Source/WebCore/contentextensions/ContentExtensionParser.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedWebCompiledContentExtensioncpp">trunk/Source/WebKit2/Shared/WebCompiledContentExtension.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKUserContentFilterRefcpp">trunk/Source/WebKit2/UIProcess/API/C/WKUserContentFilterRef.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoa_WKUserContentFiltermm">trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKUserContentFilter.mm</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebCoreContentExtensionscpp">trunk/Tools/TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (181977 => 181978)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-03-25 22:46:41 UTC (rev 181977)
+++ trunk/Source/WebCore/ChangeLog 2015-03-25 22:56:19 UTC (rev 181978)
</span><span class="lines">@@ -1,5 +1,15 @@
</span><span class="cx"> 2015-03-25 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><ins>+ Address additional review feedback from https://bugs.webkit.org/show_bug.cgi?id=143059.
+
+ * contentextensions/ContentExtensionCompiler.cpp:
+ (WebCore::ContentExtensions::compileRuleList):
+ * contentextensions/ContentExtensionCompiler.h:
+ * contentextensions/ContentExtensionParser.cpp:
+ (WebCore::ContentExtensions::getTypeFlags):
+
+2015-03-25 Sam Weinig <sam@webkit.org>
+
</ins><span class="cx"> [Content Extensions] Convert content extension compiling to return error codes and write its output using a client
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=143059
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecontentextensionsContentExtensionCompilercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/contentextensions/ContentExtensionCompiler.cpp (181977 => 181978)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/contentextensions/ContentExtensionCompiler.cpp 2015-03-25 22:46:41 UTC (rev 181977)
+++ trunk/Source/WebCore/contentextensions/ContentExtensionCompiler.cpp 2015-03-25 22:56:19 UTC (rev 181978)
</span><span class="lines">@@ -100,7 +100,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-std::error_code compileRuleList(const String& ruleList, ContentExtensionCompilationClient& client)
</del><ins>+std::error_code compileRuleList(ContentExtensionCompilationClient& client, const String& ruleList)
</ins><span class="cx"> {
</span><span class="cx"> Vector<ContentExtensionRule> parsedRuleList;
</span><span class="cx"> auto parserError = parseRuleList(ruleList, parsedRuleList);
</span></span></pre></div>
<a id="trunkSourceWebCorecontentextensionsContentExtensionCompilerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/contentextensions/ContentExtensionCompiler.h (181977 => 181978)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/contentextensions/ContentExtensionCompiler.h 2015-03-25 22:46:41 UTC (rev 181977)
+++ trunk/Source/WebCore/contentextensions/ContentExtensionCompiler.h 2015-03-25 22:56:19 UTC (rev 181978)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> virtual void writeActions(Vector<SerializedActionByte>&&) = 0;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-WEBCORE_EXPORT std::error_code compileRuleList(const String&, ContentExtensionCompilationClient&);
</del><ins>+WEBCORE_EXPORT std::error_code compileRuleList(ContentExtensionCompilationClient&, const String&);
</ins><span class="cx">
</span><span class="cx"> } // namespace ContentExtensions
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorecontentextensionsContentExtensionParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/contentextensions/ContentExtensionParser.cpp (181977 => 181978)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/contentextensions/ContentExtensionParser.cpp 2015-03-25 22:46:41 UTC (rev 181977)
+++ trunk/Source/WebCore/contentextensions/ContentExtensionParser.cpp 2015-03-25 22:56:19 UTC (rev 181978)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx">
</span><span class="cx"> namespace ContentExtensions {
</span><span class="cx">
</span><del>-static std::error_code getTypeFlags(ExecState& exec, const JSValue& typeValue, ResourceFlags& flags, uint16_t(*stringToType)(const String&))
</del><ins>+static std::error_code getTypeFlags(ExecState& exec, const JSValue& typeValue, ResourceFlags& flags, uint16_t (*stringToType)(const String&))
</ins><span class="cx"> {
</span><span class="cx"> if (!typeValue.isObject())
</span><span class="cx"> return { };
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (181977 => 181978)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-03-25 22:46:41 UTC (rev 181977)
+++ trunk/Source/WebKit2/ChangeLog 2015-03-25 22:56:19 UTC (rev 181978)
</span><span class="lines">@@ -1,5 +1,16 @@
</span><span class="cx"> 2015-03-25 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><ins>+ Address additional review feedback from https://bugs.webkit.org/show_bug.cgi?id=143059.
+
+ * Shared/WebCompiledContentExtension.cpp:
+ (WebKit::WebCompiledContentExtension::createFromCompiledContentExtensionData):
+ * UIProcess/API/C/WKUserContentFilterRef.cpp:
+ (WKUserContentFilterCreate):
+ * UIProcess/API/Cocoa/_WKUserContentFilter.mm:
+ (-[_WKUserContentFilter initWithName:serializedRules:]):
+
+2015-03-25 Sam Weinig <sam@webkit.org>
+
</ins><span class="cx"> [Content Extensions] Convert content extension compiling to return error codes and write its output using a client
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=143059
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebCompiledContentExtensioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebCompiledContentExtension.cpp (181977 => 181978)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebCompiledContentExtension.cpp 2015-03-25 22:46:41 UTC (rev 181977)
+++ trunk/Source/WebKit2/Shared/WebCompiledContentExtension.cpp 2015-03-25 22:56:19 UTC (rev 181978)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> data.data = WTF::move(sharedMemory);
</span><span class="cx"> data.bytecodeOffset = 0;
</span><span class="cx"> data.bytecodeSize = compilerData.bytecode.size();
</span><del>- data.actionsOffset = compilerData. bytecode.size();
</del><ins>+ data.actionsOffset = compilerData.bytecode.size();
</ins><span class="cx"> data.actionsSize = compilerData.actions.size();
</span><span class="cx">
</span><span class="cx"> return create(WTF::move(data));
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKUserContentFilterRefcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKUserContentFilterRef.cpp (181977 => 181978)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKUserContentFilterRef.cpp 2015-03-25 22:46:41 UTC (rev 181977)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKUserContentFilterRef.cpp 2015-03-25 22:56:19 UTC (rev 181978)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> WebCore::ContentExtensions::CompiledContentExtensionData data;
</span><span class="cx"> LegacyContentExtensionCompilationClient client(data);
</span><span class="cx">
</span><del>- auto compilerError = WebCore::ContentExtensions::compileRuleList(toWTFString(serializedRulesRef), client);
</del><ins>+ auto compilerError = WebCore::ContentExtensions::compileRuleList(client, toWTFString(serializedRulesRef));
</ins><span class="cx"> if (compilerError)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoa_WKUserContentFiltermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKUserContentFilter.mm (181977 => 181978)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKUserContentFilter.mm 2015-03-25 22:46:41 UTC (rev 181977)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKUserContentFilter.mm 2015-03-25 22:56:19 UTC (rev 181978)
</span><span class="lines">@@ -43,8 +43,7 @@
</span><span class="cx"> WebCore::ContentExtensions::CompiledContentExtensionData data;
</span><span class="cx"> WebKit::LegacyContentExtensionCompilationClient client(data);
</span><span class="cx">
</span><del>- auto compilerError = WebCore::ContentExtensions::compileRuleList(String(serializedRules), client);
- if (compilerError)
</del><ins>+ if (auto compilerError = WebCore::ContentExtensions::compileRuleList(client, String(serializedRules)))
</ins><span class="cx"> [NSException raise:NSGenericException format:@"Failed to compile rules with error: %s", compilerError.message().c_str()];
</span><span class="cx">
</span><span class="cx"> auto compiledContentExtension = WebKit::WebCompiledContentExtension::createFromCompiledContentExtensionData(data);
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (181977 => 181978)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-03-25 22:46:41 UTC (rev 181977)
+++ trunk/Tools/ChangeLog 2015-03-25 22:56:19 UTC (rev 181978)
</span><span class="lines">@@ -1,3 +1,10 @@
</span><ins>+2015-03-25 Sam Weinig <sam@webkit.org>
+
+ Address additional review feedback from https://bugs.webkit.org/show_bug.cgi?id=143059.
+
+ * TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp:
+ (TestWebKitAPI::InMemoryCompiledContentExtension::createFromFilter):
+
</ins><span class="cx"> 2015-03-25 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> Migrate update-webkit for Windows to not require Cygwin
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebCoreContentExtensionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp (181977 => 181978)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp 2015-03-25 22:46:41 UTC (rev 181977)
+++ trunk/Tools/TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp 2015-03-25 22:56:19 UTC (rev 181978)
</span><span class="lines">@@ -101,7 +101,7 @@
</span><span class="cx"> {
</span><span class="cx"> WebCore::ContentExtensions::CompiledContentExtensionData extensionData;
</span><span class="cx"> InMemoryContentExtensionCompilationClient client(extensionData);
</span><del>- auto compilerError = ContentExtensions::compileRuleList(filter, client);
</del><ins>+ auto compilerError = ContentExtensions::compileRuleList(client, filter);
</ins><span class="cx"> if (compilerError)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>