Title: [197184] tags/Safari-602.1.20.1/Source/WebCore
- Revision
- 197184
- Author
- [email protected]
- Date
- 2016-02-26 11:09:24 -0800 (Fri, 26 Feb 2016)
Log Message
Merged r197154. rdar://problem/24845077
Modified Paths
Diff
Modified: tags/Safari-602.1.20.1/Source/WebCore/ChangeLog (197183 => 197184)
--- tags/Safari-602.1.20.1/Source/WebCore/ChangeLog 2016-02-26 18:56:07 UTC (rev 197183)
+++ tags/Safari-602.1.20.1/Source/WebCore/ChangeLog 2016-02-26 19:09:24 UTC (rev 197184)
@@ -1,3 +1,21 @@
+2016-02-26 Babak Shafiei <[email protected]>
+
+ Merge r197154.
+
+ 2016-02-25 David Kilzer <[email protected]>
+
+ REGRESSION (r196744): NetworkExtension.framework and NEFilterSource class are not available on Recovery partition
+ <http://webkit.org/b/154703>
+
+ Reviewed by Andy Estes.
+
+ * platform/cocoa/NetworkExtensionContentFilter.mm: Make
+ soft-linking of NetworkExtension.framework and NEFilterSource
+ class optional since they are not available on the Recovery
+ partition. Note that NetworkExtensionContentFilter::enabled()
+ does not need to change since it already had the correct
+ behavior when getNEFilterSourceClass() returned nullptr.
+
2016-02-24 Ryan Haddad <[email protected]>
Speculative fix for ios build.
Modified: tags/Safari-602.1.20.1/Source/WebCore/platform/cocoa/NetworkExtensionContentFilter.mm (197183 => 197184)
--- tags/Safari-602.1.20.1/Source/WebCore/platform/cocoa/NetworkExtensionContentFilter.mm 2016-02-26 18:56:07 UTC (rev 197183)
+++ tags/Safari-602.1.20.1/Source/WebCore/platform/cocoa/NetworkExtensionContentFilter.mm 2016-02-26 19:09:24 UTC (rev 197184)
@@ -38,8 +38,8 @@
#import "URL.h"
#import <objc/runtime.h>
-SOFT_LINK_FRAMEWORK(NetworkExtension);
-SOFT_LINK_CLASS(NetworkExtension, NEFilterSource);
+SOFT_LINK_FRAMEWORK_OPTIONAL(NetworkExtension);
+SOFT_LINK_CLASS_OPTIONAL(NetworkExtension, NEFilterSource);
#if HAVE(MODERN_NE_FILTER_SOURCE)
static inline NSData *replacementDataFromDecisionInfo(NSDictionary *decisionInfo)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
