Bug 160454 – Allow building with content filtering disabled

• Status: RESOLVED
• Resolution: FIXED
• Component: WebKit Misc.

[Enrica Casucci]

We need to fix the build if we want to disable content filtering.

[Enrica Casucci]

Created attachment 285121 [details]
Patch

[WebKit Commit Bot]

Attachment 285121 [details] did not pass style-queue:


ERROR: Source/WebKit/mac/Configurations/FeatureDefines.xcconfig:0:  Any changes made to FeatureDefines should be made to all of them (changed file does not match Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig).  [featuredefines/equality] [5]
ERROR: Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig:0:  Any changes made to FeatureDefines should be made to all of them (changed file does not match Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig).  [featuredefines/equality] [5]
ERROR: Source/WebCore/Configurations/FeatureDefines.xcconfig:0:  Any changes made to FeatureDefines should be made to all of them (changed file does not match Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig).  [featuredefines/equality] [5]
ERROR: Source/WebKit2/Configurations/FeatureDefines.xcconfig:0:  Any changes made to FeatureDefines should be made to all of them (changed file does not match Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig).  [featuredefines/equality] [5]
Total errors found: 4 in 18 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[Tim Horton]

Comment on attachment 285121 [details]
Patch

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

> Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig:57
> +ENABLE_CONTENT_FILTERING[sdk=iphonesimulator*] = ENABLE_CONTENT_FILTERING;

Looks like we usually just use the prefix, so these could be e.g. iphone* and only mentioned once (and the same above).

> Source/WebCore/platform/PlatformContentFilter.h:63
>      virtual String unblockRequestDeniedScript() const { return emptyString(); }

This seems related, too, no?

> Source/WebCore/testing/MockContentFilter.h:49
>      String unblockRequestDeniedScript() const override;

Ditto

[Enrica Casucci]

Comment on attachment 285121 [details]
Patch

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

>> Source/WebCore/platform/PlatformContentFilter.h:63
>>      virtual String unblockRequestDeniedScript() const { return emptyString(); }
> 
> This seems related, too, no?

It is relevant because ContentFilterUnblockHandler is only defined if ENABLED_CONTENT_FILTERING.

[Enrica Casucci]

Created attachment 285124 [details]
Patch2

[WebKit Commit Bot]

Attachment 285124 [details] did not pass style-queue:


ERROR: Source/WebKit/mac/Configurations/FeatureDefines.xcconfig:0:  Any changes made to FeatureDefines should be made to all of them (changed file does not match Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig).  [featuredefines/equality] [5]
ERROR: Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig:0:  Any changes made to FeatureDefines should be made to all of them (changed file does not match Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig).  [featuredefines/equality] [5]
ERROR: Source/WebCore/Configurations/FeatureDefines.xcconfig:0:  Any changes made to FeatureDefines should be made to all of them (changed file does not match Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig).  [featuredefines/equality] [5]
ERROR: Source/WebKit2/Configurations/FeatureDefines.xcconfig:0:  Any changes made to FeatureDefines should be made to all of them (changed file does not match Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig).  [featuredefines/equality] [5]
Total errors found: 4 in 18 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[Enrica Casucci]

Created attachment 285148 [details]
Patch3

[Enrica Casucci]

Committed revision 204053