Skip to content
Permalink
Browse files
Fix up some content filtering feature flags
https://bugs.webkit.org/show_bug.cgi?id=179079

Reviewed by Simon Fraser.

Source/JavaScriptCore:

* Configurations/FeatureDefines.xcconfig:

Source/WebCore:

* Configurations/FeatureDefines.xcconfig:

Source/WebCore/PAL:

* Configurations/FeatureDefines.xcconfig:

Source/WebKit:

* Configurations/FeatureDefines.xcconfig:

Source/WebKitLegacy/mac:

* Configurations/FeatureDefines.xcconfig:

Tools:

* TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
* TestWebKitAPI/Tests/WebKitCocoa/ContentFilteringPlugIn.mm:
(-[MockContentFilterEnabler initWithCoder:]):
(-[MockContentFilterEnabler dealloc]):


Canonical link: https://commits.webkit.org/195207@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@224254 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
hortont424 committed Oct 31, 2017
1 parent 4945fa3 commit 904d951d09fa8ba4ab80d77853ad38afc773bfea
Showing 13 changed files with 65 additions and 6 deletions.
@@ -1,3 +1,12 @@
2017-10-31 Tim Horton <timothy_horton@apple.com>

Fix up some content filtering feature flags
https://bugs.webkit.org/show_bug.cgi?id=179079

Reviewed by Simon Fraser.

* Configurations/FeatureDefines.xcconfig:

2017-10-31 Keith Miller <keith_miller@apple.com>

Unreviewed, windows build fix.
@@ -70,6 +70,7 @@ ENABLE_CACHE_PARTITIONING = ENABLE_CACHE_PARTITIONING;
ENABLE_CHANNEL_MESSAGING = ENABLE_CHANNEL_MESSAGING;
ENABLE_ENCRYPTED_MEDIA = ENABLE_ENCRYPTED_MEDIA;
ENABLE_CONTENT_FILTERING[sdk=appletv*] = ;
ENABLE_CONTENT_FILTERING[sdk=watch*] = ;
ENABLE_CONTENT_FILTERING[sdk=iphone*] = ENABLE_CONTENT_FILTERING;
ENABLE_CONTENT_FILTERING[sdk=macosx*] = ENABLE_CONTENT_FILTERING;
ENABLE_CSS_ANIMATIONS_LEVEL_2 = ENABLE_CSS_ANIMATIONS_LEVEL_2;
@@ -1,3 +1,12 @@
2017-10-31 Tim Horton <timothy_horton@apple.com>

Fix up some content filtering feature flags
https://bugs.webkit.org/show_bug.cgi?id=179079

Reviewed by Simon Fraser.

* Configurations/FeatureDefines.xcconfig:

2017-10-31 Chris Dumez <cdumez@apple.com>

navigator.serviceWorker should always return the same object
@@ -70,6 +70,7 @@ ENABLE_CACHE_PARTITIONING = ENABLE_CACHE_PARTITIONING;
ENABLE_CHANNEL_MESSAGING = ENABLE_CHANNEL_MESSAGING;
ENABLE_ENCRYPTED_MEDIA = ENABLE_ENCRYPTED_MEDIA;
ENABLE_CONTENT_FILTERING[sdk=appletv*] = ;
ENABLE_CONTENT_FILTERING[sdk=watch*] = ;
ENABLE_CONTENT_FILTERING[sdk=iphone*] = ENABLE_CONTENT_FILTERING;
ENABLE_CONTENT_FILTERING[sdk=macosx*] = ENABLE_CONTENT_FILTERING;
ENABLE_CSS_ANIMATIONS_LEVEL_2 = ENABLE_CSS_ANIMATIONS_LEVEL_2;
@@ -1,3 +1,12 @@
2017-10-31 Tim Horton <timothy_horton@apple.com>

Fix up some content filtering feature flags
https://bugs.webkit.org/show_bug.cgi?id=179079

Reviewed by Simon Fraser.

* Configurations/FeatureDefines.xcconfig:

2017-10-31 Wenson Hsieh <wenson_hsieh@apple.com>

[Attachment Support] Implement WKWebView SPI for inserting attachment elements
@@ -70,6 +70,7 @@ ENABLE_CACHE_PARTITIONING = ENABLE_CACHE_PARTITIONING;
ENABLE_CHANNEL_MESSAGING = ENABLE_CHANNEL_MESSAGING;
ENABLE_ENCRYPTED_MEDIA = ENABLE_ENCRYPTED_MEDIA;
ENABLE_CONTENT_FILTERING[sdk=appletv*] = ;
ENABLE_CONTENT_FILTERING[sdk=watch*] = ;
ENABLE_CONTENT_FILTERING[sdk=iphone*] = ENABLE_CONTENT_FILTERING;
ENABLE_CONTENT_FILTERING[sdk=macosx*] = ENABLE_CONTENT_FILTERING;
ENABLE_CSS_ANIMATIONS_LEVEL_2 = ENABLE_CSS_ANIMATIONS_LEVEL_2;
@@ -1,3 +1,12 @@
2017-10-31 Tim Horton <timothy_horton@apple.com>

Fix up some content filtering feature flags
https://bugs.webkit.org/show_bug.cgi?id=179079

Reviewed by Simon Fraser.

* Configurations/FeatureDefines.xcconfig:

2017-10-31 Youenn Fablet <youenn@apple.com>

rwt should allow service worker to load localhost HTTPS resources with any certificate
@@ -70,6 +70,7 @@ ENABLE_CACHE_PARTITIONING = ENABLE_CACHE_PARTITIONING;
ENABLE_CHANNEL_MESSAGING = ENABLE_CHANNEL_MESSAGING;
ENABLE_ENCRYPTED_MEDIA = ENABLE_ENCRYPTED_MEDIA;
ENABLE_CONTENT_FILTERING[sdk=appletv*] = ;
ENABLE_CONTENT_FILTERING[sdk=watch*] = ;
ENABLE_CONTENT_FILTERING[sdk=iphone*] = ENABLE_CONTENT_FILTERING;
ENABLE_CONTENT_FILTERING[sdk=macosx*] = ENABLE_CONTENT_FILTERING;
ENABLE_CSS_ANIMATIONS_LEVEL_2 = ENABLE_CSS_ANIMATIONS_LEVEL_2;
@@ -1,3 +1,12 @@
2017-10-31 Tim Horton <timothy_horton@apple.com>

Fix up some content filtering feature flags
https://bugs.webkit.org/show_bug.cgi?id=179079

Reviewed by Simon Fraser.

* Configurations/FeatureDefines.xcconfig:

2017-10-28 Zalan Bujtas <zalan@apple.com>

[FrameView::layout cleanup] Move core layout logic to a separate class.
@@ -70,6 +70,7 @@ ENABLE_CACHE_PARTITIONING = ENABLE_CACHE_PARTITIONING;
ENABLE_CHANNEL_MESSAGING = ENABLE_CHANNEL_MESSAGING;
ENABLE_ENCRYPTED_MEDIA = ENABLE_ENCRYPTED_MEDIA;
ENABLE_CONTENT_FILTERING[sdk=appletv*] = ;
ENABLE_CONTENT_FILTERING[sdk=watch*] = ;
ENABLE_CONTENT_FILTERING[sdk=iphone*] = ENABLE_CONTENT_FILTERING;
ENABLE_CONTENT_FILTERING[sdk=macosx*] = ENABLE_CONTENT_FILTERING;
ENABLE_CSS_ANIMATIONS_LEVEL_2 = ENABLE_CSS_ANIMATIONS_LEVEL_2;
@@ -1,3 +1,15 @@
2017-10-31 Tim Horton <timothy_horton@apple.com>

Fix up some content filtering feature flags
https://bugs.webkit.org/show_bug.cgi?id=179079

Reviewed by Simon Fraser.

* TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
* TestWebKitAPI/Tests/WebKitCocoa/ContentFilteringPlugIn.mm:
(-[MockContentFilterEnabler initWithCoder:]):
(-[MockContentFilterEnabler dealloc]):

2017-10-31 Youenn Fablet <youenn@apple.com>

rwt should allow service worker to load localhost HTTPS resources with any certificate
@@ -70,6 +70,7 @@ ENABLE_CACHE_PARTITIONING = ENABLE_CACHE_PARTITIONING;
ENABLE_CHANNEL_MESSAGING = ENABLE_CHANNEL_MESSAGING;
ENABLE_ENCRYPTED_MEDIA = ENABLE_ENCRYPTED_MEDIA;
ENABLE_CONTENT_FILTERING[sdk=appletv*] = ;
ENABLE_CONTENT_FILTERING[sdk=watch*] = ;
ENABLE_CONTENT_FILTERING[sdk=iphone*] = ENABLE_CONTENT_FILTERING;
ENABLE_CONTENT_FILTERING[sdk=macosx*] = ENABLE_CONTENT_FILTERING;
ENABLE_CSS_ANIMATIONS_LEVEL_2 = ENABLE_CSS_ANIMATIONS_LEVEL_2;
@@ -25,7 +25,7 @@

#import "config.h"

#if WK_API_ENABLED
#if WK_API_ENABLED && ENABLE(CONTENT_FILTERING)

#import "ContentFiltering.h"
#import "MockContentFilterSettings.h"
@@ -59,21 +59,17 @@ - (instancetype)initWithCoder:(NSCoder *)decoder
if (!(self = [super init]))
return nil;

#if ENABLE(CONTENT_FILTERING)
auto& settings = MockContentFilterSettings::singleton();
settings.setEnabled(true);
settings.setDecision(static_cast<Decision>([decoder decodeIntForKey:@"Decision"]));
settings.setDecisionPoint(static_cast<DecisionPoint>([decoder decodeIntForKey:@"DecisionPoint"]));
settings.setBlockedString(ASCIILiteral("blocked"));
#endif
return self;
}

- (void)dealloc
{
#if ENABLE(CONTENT_FILTERING)
MockContentFilterSettings::singleton().setEnabled(false);
#endif
[super dealloc];
}

@@ -133,4 +129,4 @@ - (void)checkIfPlatformFrameworksAreLoaded:(void (^)(BOOL parentalControlsLoaded

@end

#endif // WK_API_ENABLED
#endif // WK_API_ENABLED && ENABLE(CONTENT_FILTERING)

0 comments on commit 904d951

Please sign in to comment.