Title: [197154] trunk/Source/WebCore
- Revision
- 197154
- Author
- ddkil...@apple.com
- Date
- 2016-02-25 18:04:01 -0800 (Thu, 25 Feb 2016)
Log Message
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.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (197153 => 197154)
--- trunk/Source/WebCore/ChangeLog 2016-02-26 02:03:22 UTC (rev 197153)
+++ trunk/Source/WebCore/ChangeLog 2016-02-26 02:04:01 UTC (rev 197154)
@@ -1,3 +1,17 @@
+2016-02-25 David Kilzer <ddkil...@apple.com>
+
+ 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-25 Ada Chan <adac...@apple.com>
Update the definition of ENABLE_VIDEO_PRESENTATION_MODE for Mac platform
Modified: trunk/Source/WebCore/platform/cocoa/NetworkExtensionContentFilter.mm (197153 => 197154)
--- trunk/Source/WebCore/platform/cocoa/NetworkExtensionContentFilter.mm 2016-02-26 02:03:22 UTC (rev 197153)
+++ trunk/Source/WebCore/platform/cocoa/NetworkExtensionContentFilter.mm 2016-02-26 02:04:01 UTC (rev 197154)
@@ -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
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
