| Summary: | Allow building with content filtering disabled | ||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|
| Product: | WebKit | Reporter: | Enrica Casucci <enrica> | ||||||||
| Component: | WebKit Misc. | Assignee: | Enrica Casucci <enrica> | ||||||||
| Status: | RESOLVED FIXED | ||||||||||
| Severity: | Normal | CC: | aestes, commit-queue, keith_miller, mark.lam, msaboff, saam, thorton | ||||||||
| Priority: | P2 | ||||||||||
| Version: | WebKit Nightly Build | ||||||||||
| Hardware: | Unspecified | ||||||||||
| OS: | Unspecified | ||||||||||
| Attachments: |
|
||||||||||
|
Description
Enrica Casucci
2016-08-02 09:44:33 PDT
Created attachment 285121 [details]
Patch
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.
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 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. Created attachment 285124 [details]
Patch2
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.
Created attachment 285148 [details]
Patch3
Committed revision 204053 |