Diff
Modified: trunk/Source/WebCore/ChangeLog (181977 => 181978)
--- 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)
@@ -1,5 +1,15 @@
2015-03-25 Sam Weinig <[email protected]>
+ 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 <[email protected]>
+
[Content Extensions] Convert content extension compiling to return error codes and write its output using a client
https://bugs.webkit.org/show_bug.cgi?id=143059
Modified: trunk/Source/WebCore/contentextensions/ContentExtensionCompiler.cpp (181977 => 181978)
--- 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)
@@ -100,7 +100,7 @@
}
-std::error_code compileRuleList(const String& ruleList, ContentExtensionCompilationClient& client)
+std::error_code compileRuleList(ContentExtensionCompilationClient& client, const String& ruleList)
{
Vector<ContentExtensionRule> parsedRuleList;
auto parserError = parseRuleList(ruleList, parsedRuleList);
Modified: trunk/Source/WebCore/contentextensions/ContentExtensionCompiler.h (181977 => 181978)
--- 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)
@@ -49,7 +49,7 @@
virtual void writeActions(Vector<SerializedActionByte>&&) = 0;
};
-WEBCORE_EXPORT std::error_code compileRuleList(const String&, ContentExtensionCompilationClient&);
+WEBCORE_EXPORT std::error_code compileRuleList(ContentExtensionCompilationClient&, const String&);
} // namespace ContentExtensions
} // namespace WebCore
Modified: trunk/Source/WebCore/contentextensions/ContentExtensionParser.cpp (181977 => 181978)
--- 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)
@@ -47,7 +47,7 @@
namespace ContentExtensions {
-static std::error_code getTypeFlags(ExecState& exec, const JSValue& typeValue, ResourceFlags& flags, uint16_t(*stringToType)(const String&))
+static std::error_code getTypeFlags(ExecState& exec, const JSValue& typeValue, ResourceFlags& flags, uint16_t (*stringToType)(const String&))
{
if (!typeValue.isObject())
return { };
Modified: trunk/Source/WebKit2/ChangeLog (181977 => 181978)
--- 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)
@@ -1,5 +1,16 @@
2015-03-25 Sam Weinig <[email protected]>
+ 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 <[email protected]>
+
[Content Extensions] Convert content extension compiling to return error codes and write its output using a client
https://bugs.webkit.org/show_bug.cgi?id=143059
Modified: trunk/Source/WebKit2/Shared/WebCompiledContentExtension.cpp (181977 => 181978)
--- 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)
@@ -56,7 +56,7 @@
data.data = ""
data.bytecodeOffset = 0;
data.bytecodeSize = compilerData.bytecode.size();
- data.actionsOffset = compilerData. bytecode.size();
+ data.actionsOffset = compilerData.bytecode.size();
data.actionsSize = compilerData.actions.size();
return create(WTF::move(data));
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKUserContentFilterRef.cpp (181977 => 181978)
--- 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)
@@ -45,7 +45,7 @@
WebCore::ContentExtensions::CompiledContentExtensionData data;
LegacyContentExtensionCompilationClient client(data);
- auto compilerError = WebCore::ContentExtensions::compileRuleList(toWTFString(serializedRulesRef), client);
+ auto compilerError = WebCore::ContentExtensions::compileRuleList(client, toWTFString(serializedRulesRef));
if (compilerError)
return nullptr;
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKUserContentFilter.mm (181977 => 181978)
--- 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)
@@ -43,8 +43,7 @@
WebCore::ContentExtensions::CompiledContentExtensionData data;
WebKit::LegacyContentExtensionCompilationClient client(data);
- auto compilerError = WebCore::ContentExtensions::compileRuleList(String(serializedRules), client);
- if (compilerError)
+ if (auto compilerError = WebCore::ContentExtensions::compileRuleList(client, String(serializedRules)))
[NSException raise:NSGenericException format:@"Failed to compile rules with error: %s", compilerError.message().c_str()];
auto compiledContentExtension = WebKit::WebCompiledContentExtension::createFromCompiledContentExtensionData(data);
Modified: trunk/Tools/ChangeLog (181977 => 181978)
--- trunk/Tools/ChangeLog 2015-03-25 22:46:41 UTC (rev 181977)
+++ trunk/Tools/ChangeLog 2015-03-25 22:56:19 UTC (rev 181978)
@@ -1,3 +1,10 @@
+2015-03-25 Sam Weinig <[email protected]>
+
+ Address additional review feedback from https://bugs.webkit.org/show_bug.cgi?id=143059.
+
+ * TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp:
+ (TestWebKitAPI::InMemoryCompiledContentExtension::createFromFilter):
+
2015-03-25 Myles C. Maxfield <[email protected]>
Migrate update-webkit for Windows to not require Cygwin
Modified: trunk/Tools/TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp (181977 => 181978)
--- 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)
@@ -101,7 +101,7 @@
{
WebCore::ContentExtensions::CompiledContentExtensionData extensionData;
InMemoryContentExtensionCompilationClient client(extensionData);
- auto compilerError = ContentExtensions::compileRuleList(filter, client);
+ auto compilerError = ContentExtensions::compileRuleList(client, filter);
if (compilerError)
return nullptr;
