[webkit-reviews] review granted: [Bug 218314] REGRESSION (r269109): [Catalina] TestWebKitAPI.ContentFiltering.LazilyLoadPlatformFrameworks is failing : [Attachment 412607] Patch

[bugzilla-daemon at webkit.org]

Andy Estes <aestes at apple.com> has granted Aditya Keerthi <akeerthi at apple.com>'s
request for review:
Bug 218314: REGRESSION (r269109): [Catalina]
TestWebKitAPI.ContentFiltering.LazilyLoadPlatformFrameworks is failing
https://bugs.webkit.org/show_bug.cgi?id=218314

Attachment 412607: Patch

https://bugs.webkit.org/attachment.cgi?id=412607&action=review




--- Comment #7 from Andy Estes <aestes at apple.com> ---
Comment on attachment 412607
  --> https://bugs.webkit.org/attachment.cgi?id=412607
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=412607&action=review

> Source/WebCore/Configurations/WebCore.xcconfig:114
> +WK_NETWORK_EXTENSION_LD_FLAGS =
$(WK_NETWORK_EXTENSION_LD_FLAGS_$(WK_PLATFORM_NAME));
> +WK_NETWORK_EXTENSION_LD_FLAGS_iphoneos = -framework NetworkExtension;
> +WK_NETWORK_EXTENSION_LD_FLAGS_iphonesimulator = -framework NetworkExtension;
> +WK_NETWORK_EXTENSION_LD_FLAGS_watchos = -framework NetworkExtension;
> +WK_NETWORK_EXTENSION_LD_FLAGS_watchsimulator = -framework NetworkExtension;
> +WK_NETWORK_EXTENSION_LD_FLAGS_maccatalyst = -framework NetworkExtension;
> +WK_NETWORK_EXTENSION_LD_FLAGS_macosx = -weak_framework NetworkExtension;

A simplification of this would be:

    WK_NETWORK_EXTENSION_LD_FLAGS =
$(WK_NETWORK_EXTENSION_LD_FLAGS_$(WK_COCOA_TOUCH));
    WK_NETWORK_EXTENSION_LD_FLAGS_cocoatouch = -framework NetworkExtension;
    WK_NETWORK_EXTENSION_LD_FLAGS_ = -weak_framework NetworkExtension;

This would also fix the tvOS build.

> Source/WebCore/platform/cocoa/NetworkExtensionContentFilter.h:57
> +    WEBCORE_EXPORT static bool filterSourceRequiresFilter();

Nit: I think `filterSourceRequired` or `isRequired` would say enough.