WebKit Bugzilla
Attachment 361800 Details for
Bug 194521
: [iOSMac] Enable Parental Controls Content Filtering
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch
bug-194521-20190212090451.patch (text/plain), 19.34 KB, created by
Andy Estes
on 2019-02-12 09:04:52 PST
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
Andy Estes
Created:
2019-02-12 09:04:52 PST
Size:
19.34 KB
patch
obsolete
>Subversion Revision: 241282 >diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog >index 608249f7f276994737bd7817a105f0853a0dde39..9c454c3f6be4d876c9a554f6ea514d72d3bddf61 100644 >--- a/Source/JavaScriptCore/ChangeLog >+++ b/Source/JavaScriptCore/ChangeLog >@@ -1,3 +1,13 @@ >+2019-02-11 Andy Estes <aestes@apple.com> >+ >+ [iOSMac] Enable Parental Controls Content Filtering >+ https://bugs.webkit.org/show_bug.cgi?id=194521 >+ <rdar://39732376> >+ >+ Reviewed by Tim Horton. >+ >+ * Configurations/FeatureDefines.xcconfig: >+ > 2019-02-11 Mark Lam <mark.lam@apple.com> > > Randomize insertion of deallocated StructureIDs into the StructureIDTable's free list. >diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog >index 823ab06a9facaad0c7b21a1f4ffd6fa308d3ca29..396bffaa357031e369206acb6b77c37cc3b95459 100644 >--- a/Source/WTF/ChangeLog >+++ b/Source/WTF/ChangeLog >@@ -1,3 +1,13 @@ >+2019-02-11 Andy Estes <aestes@apple.com> >+ >+ [iOSMac] Enable Parental Controls Content Filtering >+ https://bugs.webkit.org/show_bug.cgi?id=194521 >+ <rdar://39732376> >+ >+ Reviewed by Tim Horton. >+ >+ * wtf/Platform.h: >+ > 2019-02-11 Truitt Savell <tsavell@apple.com> > > Unreviewed, rolling out r241229. >diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog >index acbd4c7131ee6fd779f9943b421a0343baf459b0..9f5fa164afc2b8e0d6eeab07d41b24aa213a0d45 100644 >--- a/Source/WebCore/ChangeLog >+++ b/Source/WebCore/ChangeLog >@@ -1,3 +1,16 @@ >+2019-02-11 Andy Estes <aestes@apple.com> >+ >+ [iOSMac] Enable Parental Controls Content Filtering >+ https://bugs.webkit.org/show_bug.cgi?id=194521 >+ <rdar://39732376> >+ >+ Reviewed by Tim Horton. >+ >+ * Configurations/FeatureDefines.xcconfig: >+ * platform/ContentFilterUnblockHandler.h: >+ * platform/cocoa/ContentFilterUnblockHandlerCocoa.mm: >+ * platform/cocoa/ParentalControlsContentFilter.mm: >+ > 2019-02-11 Daniel Bates <dabates@apple.com> > > [iOS] Mouse/Touch/Pointer events are missing modifier keys >diff --git a/Source/WebCore/PAL/ChangeLog b/Source/WebCore/PAL/ChangeLog >index 1ad95ca2f0b3263b6b1af09ea1273b83085d5bb0..30c25c54e584909607e08536f6087c65ba625b25 100644 >--- a/Source/WebCore/PAL/ChangeLog >+++ b/Source/WebCore/PAL/ChangeLog >@@ -1,3 +1,13 @@ >+2019-02-11 Andy Estes <aestes@apple.com> >+ >+ [iOSMac] Enable Parental Controls Content Filtering >+ https://bugs.webkit.org/show_bug.cgi?id=194521 >+ <rdar://39732376> >+ >+ Reviewed by Tim Horton. >+ >+ * Configurations/FeatureDefines.xcconfig: >+ > 2019-02-11 Jer Noble <jer.noble@apple.com> > > [Cocoa] Notify AVSystemController of our presenting PID before registering as a Now Playing app. >diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog >index c4bd1e8bd3f54117d4bdb58fb75b435394350c81..978768a4698ce10c483ddb8376b099fe1e7d1192 100644 >--- a/Source/WebKit/ChangeLog >+++ b/Source/WebKit/ChangeLog >@@ -1,3 +1,13 @@ >+2019-02-11 Andy Estes <aestes@apple.com> >+ >+ [iOSMac] Enable Parental Controls Content Filtering >+ https://bugs.webkit.org/show_bug.cgi?id=194521 >+ <rdar://39732376> >+ >+ Reviewed by Tim Horton. >+ >+ * Configurations/FeatureDefines.xcconfig: >+ > 2019-02-11 Daniel Bates <dabates@apple.com> > > [iOS] Mouse/Touch/Pointer events are missing modifier keys >diff --git a/Source/WebKitLegacy/mac/ChangeLog b/Source/WebKitLegacy/mac/ChangeLog >index 9a36586501c2dd39f6780b66302a81163da64397..665d344c5ef6c14e4e6f46b8dd2dac11a6fa711d 100644 >--- a/Source/WebKitLegacy/mac/ChangeLog >+++ b/Source/WebKitLegacy/mac/ChangeLog >@@ -1,3 +1,13 @@ >+2019-02-11 Andy Estes <aestes@apple.com> >+ >+ [iOSMac] Enable Parental Controls Content Filtering >+ https://bugs.webkit.org/show_bug.cgi?id=194521 >+ <rdar://39732376> >+ >+ Reviewed by Tim Horton. >+ >+ * Configurations/FeatureDefines.xcconfig: >+ > 2019-02-06 Andy Estes <aestes@apple.com> > > [Payment Request] It should be possible to require a phonetic name for shipping contacts >diff --git a/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig b/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig >index ac7c361ecb02dd578171b5013ba71b796575ea16..2aa08d862e0a6f46aa9e18a46666a173c8151827 100644 >--- a/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig >+++ b/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig >@@ -1,4 +1,4 @@ >-// Copyright (C) 2009-2018 Apple Inc. All rights reserved. >+// Copyright (C) 2009-2019 Apple Inc. All rights reserved. > // Copyright (C) 2009 Google Inc. All rights reserved. > // > // Redistribution and use in source and binary forms, with or without >@@ -72,6 +72,7 @@ ENABLE_CACHE_PARTITIONING = ENABLE_CACHE_PARTITIONING; > ENABLE_CHANNEL_MESSAGING = ENABLE_CHANNEL_MESSAGING; > > ENABLE_CONTENT_FILTERING = $(ENABLE_CONTENT_FILTERING_$(WK_PLATFORM_NAME)); >+ENABLE_CONTENT_FILTERING_iosmac = ENABLE_CONTENT_FILTERING; > ENABLE_CONTENT_FILTERING_iphoneos = ENABLE_CONTENT_FILTERING; > ENABLE_CONTENT_FILTERING_iphonesimulator = ENABLE_CONTENT_FILTERING; > ENABLE_CONTENT_FILTERING_macosx = ENABLE_CONTENT_FILTERING; >diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h >index 87f8cd30dfcc59f91026f2a8f820b15d78e92946..3906a12342d93bb6800bdb7f0970b28f15ea7211 100644 >--- a/Source/WTF/wtf/Platform.h >+++ b/Source/WTF/wtf/Platform.h >@@ -1079,6 +1079,10 @@ > #define HAVE_CORE_ANIMATION_RENDER_SERVER 1 > #endif > >+#if PLATFORM(IOS_FAMILY) && !PLATFORM(IOSMAC) && !PLATFORM(APPLETV) >+#define HAVE_PARENTAL_CONTROLS_WITH_UNBLOCK_HANDLER 1 >+#endif >+ > #if PLATFORM(COCOA) > > #define USE_AVFOUNDATION 1 >@@ -1088,7 +1092,7 @@ > #define ENABLE_DATA_DETECTION 1 > #endif > >-#if !PLATFORM(APPLETV) && !PLATFORM(IOSMAC) >+#if !PLATFORM(APPLETV) > #define HAVE_PARENTAL_CONTROLS 1 > #endif > >diff --git a/Source/WebCore/Configurations/FeatureDefines.xcconfig b/Source/WebCore/Configurations/FeatureDefines.xcconfig >index ac7c361ecb02dd578171b5013ba71b796575ea16..2aa08d862e0a6f46aa9e18a46666a173c8151827 100644 >--- a/Source/WebCore/Configurations/FeatureDefines.xcconfig >+++ b/Source/WebCore/Configurations/FeatureDefines.xcconfig >@@ -1,4 +1,4 @@ >-// Copyright (C) 2009-2018 Apple Inc. All rights reserved. >+// Copyright (C) 2009-2019 Apple Inc. All rights reserved. > // Copyright (C) 2009 Google Inc. All rights reserved. > // > // Redistribution and use in source and binary forms, with or without >@@ -72,6 +72,7 @@ ENABLE_CACHE_PARTITIONING = ENABLE_CACHE_PARTITIONING; > ENABLE_CHANNEL_MESSAGING = ENABLE_CHANNEL_MESSAGING; > > ENABLE_CONTENT_FILTERING = $(ENABLE_CONTENT_FILTERING_$(WK_PLATFORM_NAME)); >+ENABLE_CONTENT_FILTERING_iosmac = ENABLE_CONTENT_FILTERING; > ENABLE_CONTENT_FILTERING_iphoneos = ENABLE_CONTENT_FILTERING; > ENABLE_CONTENT_FILTERING_iphonesimulator = ENABLE_CONTENT_FILTERING; > ENABLE_CONTENT_FILTERING_macosx = ENABLE_CONTENT_FILTERING; >diff --git a/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig b/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig >index ac7c361ecb02dd578171b5013ba71b796575ea16..2aa08d862e0a6f46aa9e18a46666a173c8151827 100644 >--- a/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig >+++ b/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig >@@ -1,4 +1,4 @@ >-// Copyright (C) 2009-2018 Apple Inc. All rights reserved. >+// Copyright (C) 2009-2019 Apple Inc. All rights reserved. > // Copyright (C) 2009 Google Inc. All rights reserved. > // > // Redistribution and use in source and binary forms, with or without >@@ -72,6 +72,7 @@ ENABLE_CACHE_PARTITIONING = ENABLE_CACHE_PARTITIONING; > ENABLE_CHANNEL_MESSAGING = ENABLE_CHANNEL_MESSAGING; > > ENABLE_CONTENT_FILTERING = $(ENABLE_CONTENT_FILTERING_$(WK_PLATFORM_NAME)); >+ENABLE_CONTENT_FILTERING_iosmac = ENABLE_CONTENT_FILTERING; > ENABLE_CONTENT_FILTERING_iphoneos = ENABLE_CONTENT_FILTERING; > ENABLE_CONTENT_FILTERING_iphonesimulator = ENABLE_CONTENT_FILTERING; > ENABLE_CONTENT_FILTERING_macosx = ENABLE_CONTENT_FILTERING; >diff --git a/Source/WebCore/platform/ContentFilterUnblockHandler.h b/Source/WebCore/platform/ContentFilterUnblockHandler.h >index fdf1fd79231a02dfd4d34b0cc2ea946a193b593c..18be1c5f182db488b7f860f28c6dedcdc1185456 100644 >--- a/Source/WebCore/platform/ContentFilterUnblockHandler.h >+++ b/Source/WebCore/platform/ContentFilterUnblockHandler.h >@@ -1,5 +1,5 @@ > /* >- * Copyright (C) 2015 Apple Inc. All rights reserved. >+ * Copyright (C) 2015-2019 Apple Inc. All rights reserved. > * > * Redistribution and use in source and binary forms, with or without > * modification, are permitted provided that the following conditions >@@ -49,7 +49,7 @@ public: > > ContentFilterUnblockHandler() = default; > WEBCORE_EXPORT ContentFilterUnblockHandler(String unblockURLHost, UnblockRequesterFunction); >-#if HAVE(PARENTAL_CONTROLS) && PLATFORM(IOS_FAMILY) >+#if HAVE(PARENTAL_CONTROLS_WITH_UNBLOCK_HANDLER) > ContentFilterUnblockHandler(String unblockURLHost, RetainPtr<WebFilterEvaluator>); > #endif > >@@ -68,7 +68,7 @@ private: > String m_unblockURLHost; > URL m_unreachableURL; > UnblockRequesterFunction m_unblockRequester; >-#if HAVE(PARENTAL_CONTROLS) && PLATFORM(IOS_FAMILY) >+#if HAVE(PARENTAL_CONTROLS_WITH_UNBLOCK_HANDLER) > RetainPtr<WebFilterEvaluator> m_webFilterEvaluator; > #endif > }; >diff --git a/Source/WebCore/platform/cocoa/ContentFilterUnblockHandlerCocoa.mm b/Source/WebCore/platform/cocoa/ContentFilterUnblockHandlerCocoa.mm >index 9c329e7bc44c756d9a73a5ff63307bf120007219..00c3e0f3322469ff5fbbb6124f4ece62ba354a33 100644 >--- a/Source/WebCore/platform/cocoa/ContentFilterUnblockHandlerCocoa.mm >+++ b/Source/WebCore/platform/cocoa/ContentFilterUnblockHandlerCocoa.mm >@@ -1,5 +1,5 @@ > /* >- * Copyright (C) 2013 Apple Inc. All rights reserved. >+ * Copyright (C) 2013-2019 Apple Inc. All rights reserved. > * > * Redistribution and use in source and binary forms, with or without > * modification, are permitted provided that the following conditions >@@ -31,28 +31,21 @@ > #import "ContentFilter.h" > #import "Logging.h" > #import "ResourceRequest.h" >+#import <pal/spi/cocoa/WebFilterEvaluatorSPI.h> > #import <wtf/BlockObjCExceptions.h> >- >-#if !LOG_DISABLED >+#import <wtf/SoftLinking.h> > #import <wtf/text/CString.h> >-#endif >- >-#if PLATFORM(IOS_FAMILY) > #import "WebCoreThreadRun.h" > >-#if HAVE(PARENTAL_CONTROLS) >-#import <pal/spi/cocoa/WebFilterEvaluatorSPI.h> >-#import <wtf/SoftLinking.h> >+static NSString * const unblockURLHostKey { @"unblockURLHost" }; >+static NSString * const unreachableURLKey { @"unreachableURL" }; >+ >+#if HAVE(PARENTAL_CONTROLS_WITH_UNBLOCK_HANDLER) >+static NSString * const webFilterEvaluatorKey { @"webFilterEvaluator" }; > > SOFT_LINK_PRIVATE_FRAMEWORK(WebContentAnalysis); > SOFT_LINK_CLASS(WebContentAnalysis, WebFilterEvaluator); >- >-static NSString * const webFilterEvaluatorKey { @"webFilterEvaluator" }; > #endif >-#endif >- >-static NSString * const unblockURLHostKey { @"unblockURLHost" }; >-static NSString * const unreachableURLKey { @"unreachableURL" }; > > namespace WebCore { > >@@ -63,7 +56,7 @@ ContentFilterUnblockHandler::ContentFilterUnblockHandler(String unblockURLHost, > LOG(ContentFiltering, "Creating ContentFilterUnblockHandler with an unblock requester and unblock URL host <%s>.\n", m_unblockURLHost.ascii().data()); > } > >-#if HAVE(PARENTAL_CONTROLS) && PLATFORM(IOS_FAMILY) >+#if HAVE(PARENTAL_CONTROLS_WITH_UNBLOCK_HANDLER) > ContentFilterUnblockHandler::ContentFilterUnblockHandler(String unblockURLHost, RetainPtr<WebFilterEvaluator> evaluator) > : m_unblockURLHost { WTFMove(unblockURLHost) } > , m_webFilterEvaluator { WTFMove(evaluator) } >@@ -81,7 +74,7 @@ void ContentFilterUnblockHandler::wrapWithDecisionHandler(const DecisionHandlerF > decisionHandler(unblocked); > }); > }}; >-#if HAVE(PARENTAL_CONTROLS) && PLATFORM(IOS_FAMILY) >+#if HAVE(PARENTAL_CONTROLS_WITH_UNBLOCK_HANDLER) > m_webFilterEvaluator = nullptr; > #endif > std::swap(m_unblockRequester, wrappedRequester); >@@ -89,7 +82,7 @@ void ContentFilterUnblockHandler::wrapWithDecisionHandler(const DecisionHandlerF > > bool ContentFilterUnblockHandler::needsUIProcess() const > { >-#if HAVE(PARENTAL_CONTROLS) && PLATFORM(IOS_FAMILY) >+#if HAVE(PARENTAL_CONTROLS_WITH_UNBLOCK_HANDLER) > return m_webFilterEvaluator; > #else > return false; >@@ -102,7 +95,7 @@ void ContentFilterUnblockHandler::encode(NSCoder *coder) const > BEGIN_BLOCK_OBJC_EXCEPTIONS; > [coder encodeObject:m_unblockURLHost forKey:unblockURLHostKey]; > [coder encodeObject:(NSURL *)m_unreachableURL forKey:unreachableURLKey]; >-#if HAVE(PARENTAL_CONTROLS) && PLATFORM(IOS_FAMILY) >+#if HAVE(PARENTAL_CONTROLS_WITH_UNBLOCK_HANDLER) > [coder encodeObject:m_webFilterEvaluator.get() forKey:webFilterEvaluatorKey]; > #endif > END_BLOCK_OBJC_EXCEPTIONS; >@@ -114,7 +107,7 @@ bool ContentFilterUnblockHandler::decode(NSCoder *coder, ContentFilterUnblockHan > BEGIN_BLOCK_OBJC_EXCEPTIONS; > unblockHandler.m_unblockURLHost = [coder decodeObjectOfClass:[NSString class] forKey:unblockURLHostKey]; > unblockHandler.m_unreachableURL = [coder decodeObjectOfClass:[NSURL class] forKey:unreachableURLKey]; >-#if HAVE(PARENTAL_CONTROLS) && PLATFORM(IOS_FAMILY) >+#if HAVE(PARENTAL_CONTROLS_WITH_UNBLOCK_HANDLER) > unblockHandler.m_webFilterEvaluator = [coder decodeObjectOfClass:getWebFilterEvaluatorClass() forKey:webFilterEvaluatorKey]; > #endif > return true; >@@ -125,7 +118,7 @@ bool ContentFilterUnblockHandler::decode(NSCoder *coder, ContentFilterUnblockHan > bool ContentFilterUnblockHandler::canHandleRequest(const ResourceRequest& request) const > { > if (!m_unblockRequester) { >-#if HAVE(PARENTAL_CONTROLS) && PLATFORM(IOS_FAMILY) >+#if HAVE(PARENTAL_CONTROLS_WITH_UNBLOCK_HANDLER) > if (!m_webFilterEvaluator) > return false; > #else >@@ -154,7 +147,7 @@ static inline void dispatchToMainThread(void (^block)()) > > void ContentFilterUnblockHandler::requestUnblockAsync(DecisionHandlerFunction decisionHandler) const > { >-#if HAVE(PARENTAL_CONTROLS) && PLATFORM(IOS_FAMILY) >+#if HAVE(PARENTAL_CONTROLS_WITH_UNBLOCK_HANDLER) > if (m_webFilterEvaluator) { > [m_webFilterEvaluator unblockWithCompletion:[decisionHandler](BOOL unblocked, NSError *) { > dispatchToMainThread([decisionHandler, unblocked] { >@@ -177,4 +170,4 @@ void ContentFilterUnblockHandler::requestUnblockAsync(DecisionHandlerFunction de > > } // namespace WebCore > >-#endif // PLATFORM(IOS_FAMILY) && ENABLE(CONTENT_FILTERING) >+#endif // ENABLE(CONTENT_FILTERING) >diff --git a/Source/WebCore/platform/cocoa/ParentalControlsContentFilter.mm b/Source/WebCore/platform/cocoa/ParentalControlsContentFilter.mm >index ee187815601d13269b6a4862caae5ccaad4c9339..eac18739a866c3df49c5de272c87a1ccf7ce455f 100644 >--- a/Source/WebCore/platform/cocoa/ParentalControlsContentFilter.mm >+++ b/Source/WebCore/platform/cocoa/ParentalControlsContentFilter.mm >@@ -1,5 +1,5 @@ > /* >- * Copyright (C) 2015 Apple Inc. All rights reserved. >+ * Copyright (C) 2015-2019 Apple Inc. All rights reserved. > * > * Redistribution and use in source and binary forms, with or without > * modification, are permitted provided that the following conditions >@@ -55,7 +55,7 @@ std::unique_ptr<ParentalControlsContentFilter> ParentalControlsContentFilter::cr > > static inline bool canHandleResponse(const ResourceResponse& response) > { >-#if PLATFORM(MAC) >+#if PLATFORM(MAC) || PLATFORM(IOSMAC) > return response.url().protocolIs("https"); > #else > return response.url().protocolIsInHTTPFamily(); >@@ -99,7 +99,7 @@ Ref<SharedBuffer> ParentalControlsContentFilter::replacementData() const > #if ENABLE(CONTENT_FILTERING) > ContentFilterUnblockHandler ParentalControlsContentFilter::unblockHandler() const > { >-#if PLATFORM(IOS_FAMILY) >+#if HAVE(PARENTAL_CONTROLS_WITH_UNBLOCK_HANDLER) > return ContentFilterUnblockHandler { "unblock"_s, m_webFilterEvaluator }; > #else > return { }; >diff --git a/Source/WebKit/Configurations/FeatureDefines.xcconfig b/Source/WebKit/Configurations/FeatureDefines.xcconfig >index ac7c361ecb02dd578171b5013ba71b796575ea16..2aa08d862e0a6f46aa9e18a46666a173c8151827 100644 >--- a/Source/WebKit/Configurations/FeatureDefines.xcconfig >+++ b/Source/WebKit/Configurations/FeatureDefines.xcconfig >@@ -1,4 +1,4 @@ >-// Copyright (C) 2009-2018 Apple Inc. All rights reserved. >+// Copyright (C) 2009-2019 Apple Inc. All rights reserved. > // Copyright (C) 2009 Google Inc. All rights reserved. > // > // Redistribution and use in source and binary forms, with or without >@@ -72,6 +72,7 @@ ENABLE_CACHE_PARTITIONING = ENABLE_CACHE_PARTITIONING; > ENABLE_CHANNEL_MESSAGING = ENABLE_CHANNEL_MESSAGING; > > ENABLE_CONTENT_FILTERING = $(ENABLE_CONTENT_FILTERING_$(WK_PLATFORM_NAME)); >+ENABLE_CONTENT_FILTERING_iosmac = ENABLE_CONTENT_FILTERING; > ENABLE_CONTENT_FILTERING_iphoneos = ENABLE_CONTENT_FILTERING; > ENABLE_CONTENT_FILTERING_iphonesimulator = ENABLE_CONTENT_FILTERING; > ENABLE_CONTENT_FILTERING_macosx = ENABLE_CONTENT_FILTERING; >diff --git a/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig b/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig >index ac7c361ecb02dd578171b5013ba71b796575ea16..2aa08d862e0a6f46aa9e18a46666a173c8151827 100644 >--- a/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig >+++ b/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig >@@ -1,4 +1,4 @@ >-// Copyright (C) 2009-2018 Apple Inc. All rights reserved. >+// Copyright (C) 2009-2019 Apple Inc. All rights reserved. > // Copyright (C) 2009 Google Inc. All rights reserved. > // > // Redistribution and use in source and binary forms, with or without >@@ -72,6 +72,7 @@ ENABLE_CACHE_PARTITIONING = ENABLE_CACHE_PARTITIONING; > ENABLE_CHANNEL_MESSAGING = ENABLE_CHANNEL_MESSAGING; > > ENABLE_CONTENT_FILTERING = $(ENABLE_CONTENT_FILTERING_$(WK_PLATFORM_NAME)); >+ENABLE_CONTENT_FILTERING_iosmac = ENABLE_CONTENT_FILTERING; > ENABLE_CONTENT_FILTERING_iphoneos = ENABLE_CONTENT_FILTERING; > ENABLE_CONTENT_FILTERING_iphonesimulator = ENABLE_CONTENT_FILTERING; > ENABLE_CONTENT_FILTERING_macosx = ENABLE_CONTENT_FILTERING; >diff --git a/Tools/ChangeLog b/Tools/ChangeLog >index 48d71eb240459862a65e95e1aab0afdc949a3b53..e8c321a0107eb2dab8c093be1d97f1658b9faaa2 100644 >--- a/Tools/ChangeLog >+++ b/Tools/ChangeLog >@@ -1,3 +1,13 @@ >+2019-02-11 Andy Estes <aestes@apple.com> >+ >+ [iOSMac] Enable Parental Controls Content Filtering >+ https://bugs.webkit.org/show_bug.cgi?id=194521 >+ <rdar://39732376> >+ >+ Reviewed by Tim Horton. >+ >+ * TestWebKitAPI/Configurations/FeatureDefines.xcconfig: >+ > 2019-02-11 Daniel Bates <dabates@apple.com> > > [iOS] Mouse/Touch/Pointer events are missing modifier keys >diff --git a/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig b/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig >index ac7c361ecb02dd578171b5013ba71b796575ea16..2aa08d862e0a6f46aa9e18a46666a173c8151827 100644 >--- a/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig >+++ b/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig >@@ -1,4 +1,4 @@ >-// Copyright (C) 2009-2018 Apple Inc. All rights reserved. >+// Copyright (C) 2009-2019 Apple Inc. All rights reserved. > // Copyright (C) 2009 Google Inc. All rights reserved. > // > // Redistribution and use in source and binary forms, with or without >@@ -72,6 +72,7 @@ ENABLE_CACHE_PARTITIONING = ENABLE_CACHE_PARTITIONING; > ENABLE_CHANNEL_MESSAGING = ENABLE_CHANNEL_MESSAGING; > > ENABLE_CONTENT_FILTERING = $(ENABLE_CONTENT_FILTERING_$(WK_PLATFORM_NAME)); >+ENABLE_CONTENT_FILTERING_iosmac = ENABLE_CONTENT_FILTERING; > ENABLE_CONTENT_FILTERING_iphoneos = ENABLE_CONTENT_FILTERING; > ENABLE_CONTENT_FILTERING_iphonesimulator = ENABLE_CONTENT_FILTERING; > ENABLE_CONTENT_FILTERING_macosx = ENABLE_CONTENT_FILTERING;
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 194521
:
361730
| 361800