Title: [181795] trunk/Source/WebCore
- Revision
- 181795
- Author
- [email protected]
- Date
- 2015-03-20 02:36:21 -0700 (Fri, 20 Mar 2015)
Log Message
[Content Filtering] Adopt NEFilterSource unblock handling
https://bugs.webkit.org/show_bug.cgi?id=142904
Reviewed by Andreas Kling.
* platform/cocoa/NetworkExtensionContentFilter.mm:
(WebCore::NetworkExtensionContentFilter::unblockHandler):
Returned an unblock handler that calls -[NEFilterSource remediateWithDecisionHandler:].
* platform/cocoa/ParentalControlsContentFilter.mm:
(WebCore::ParentalControlsContentFilter::unblockHandler): Used ASCIILiteral.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (181794 => 181795)
--- trunk/Source/WebCore/ChangeLog 2015-03-20 09:26:50 UTC (rev 181794)
+++ trunk/Source/WebCore/ChangeLog 2015-03-20 09:36:21 UTC (rev 181795)
@@ -1,3 +1,16 @@
+2015-03-20 Andy Estes <[email protected]>
+
+ [Content Filtering] Adopt NEFilterSource unblock handling
+ https://bugs.webkit.org/show_bug.cgi?id=142904
+
+ Reviewed by Andreas Kling.
+
+ * platform/cocoa/NetworkExtensionContentFilter.mm:
+ (WebCore::NetworkExtensionContentFilter::unblockHandler):
+ Returned an unblock handler that calls -[NEFilterSource remediateWithDecisionHandler:].
+ * platform/cocoa/ParentalControlsContentFilter.mm:
+ (WebCore::ParentalControlsContentFilter::unblockHandler): Used ASCIILiteral.
+
2015-03-19 Andy Estes <[email protected]>
[Content Filtering] Add tests for unblock requests
Modified: trunk/Source/WebCore/platform/cocoa/NetworkExtensionContentFilter.mm (181794 => 181795)
--- trunk/Source/WebCore/platform/cocoa/NetworkExtensionContentFilter.mm 2015-03-20 09:26:50 UTC (rev 181794)
+++ trunk/Source/WebCore/platform/cocoa/NetworkExtensionContentFilter.mm 2015-03-20 09:36:21 UTC (rev 181795)
@@ -161,7 +161,20 @@
ContentFilterUnblockHandler NetworkExtensionContentFilter::unblockHandler() const
{
+#if HAVE(MODERN_NE_FILTER_SOURCE)
+ using DecisionHandlerFunction = ContentFilterUnblockHandler::DecisionHandlerFunction;
+
+ RetainPtr<NEFilterSource> neFilterSource { m_neFilterSource };
+ return ContentFilterUnblockHandler {
+ ASCIILiteral("nefilter-unblock"), [neFilterSource](DecisionHandlerFunction decisionHandler) {
+ [neFilterSource remediateWithDecisionHandler:[decisionHandler](NEFilterSourceStatus status, NSDictionary *) {
+ decisionHandler(status == NEFilterSourceStatusPass);
+ }];
+ }
+ };
+#else
return { };
+#endif
}
void NetworkExtensionContentFilter::handleDecision(NEFilterSourceStatus status, NSData *replacementData)
Modified: trunk/Source/WebCore/platform/cocoa/ParentalControlsContentFilter.mm (181794 => 181795)
--- trunk/Source/WebCore/platform/cocoa/ParentalControlsContentFilter.mm 2015-03-20 09:26:50 UTC (rev 181794)
+++ trunk/Source/WebCore/platform/cocoa/ParentalControlsContentFilter.mm 2015-03-20 09:36:21 UTC (rev 181795)
@@ -94,7 +94,7 @@
ContentFilterUnblockHandler ParentalControlsContentFilter::unblockHandler() const
{
#if PLATFORM(IOS)
- return ContentFilterUnblockHandler { "unblock", m_webFilterEvaluator };
+ return ContentFilterUnblockHandler { ASCIILiteral("unblock"), m_webFilterEvaluator };
#else
return { };
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
