Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (241298 => 241299)
--- trunk/Source/_javascript_Core/ChangeLog 2019-02-12 17:38:42 UTC (rev 241298)
+++ trunk/Source/_javascript_Core/ChangeLog 2019-02-12 17:43:37 UTC (rev 241299)
@@ -1,3 +1,13 @@
+2019-02-12 Andy Estes <[email protected]>
+
+ [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 <[email protected]>
Randomize insertion of deallocated StructureIDs into the StructureIDTable's free list.
Modified: trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig (241298 => 241299)
--- trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig 2019-02-12 17:38:42 UTC (rev 241298)
+++ trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig 2019-02-12 17:43:37 UTC (rev 241299)
@@ -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_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;
Modified: trunk/Source/WTF/ChangeLog (241298 => 241299)
--- trunk/Source/WTF/ChangeLog 2019-02-12 17:38:42 UTC (rev 241298)
+++ trunk/Source/WTF/ChangeLog 2019-02-12 17:43:37 UTC (rev 241299)
@@ -1,3 +1,13 @@
+2019-02-12 Andy Estes <[email protected]>
+
+ [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 Myles C. Maxfield <[email protected]>
[Cocoa] Ask platform for generic font family mappings
Modified: trunk/Source/WTF/wtf/Platform.h (241298 => 241299)
--- trunk/Source/WTF/wtf/Platform.h 2019-02-12 17:38:42 UTC (rev 241298)
+++ trunk/Source/WTF/wtf/Platform.h 2019-02-12 17:43:37 UTC (rev 241299)
@@ -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
Modified: trunk/Source/WebCore/ChangeLog (241298 => 241299)
--- trunk/Source/WebCore/ChangeLog 2019-02-12 17:38:42 UTC (rev 241298)
+++ trunk/Source/WebCore/ChangeLog 2019-02-12 17:43:37 UTC (rev 241299)
@@ -1,3 +1,16 @@
+2019-02-12 Andy Estes <[email protected]>
+
+ [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 Jer Noble <[email protected]>
Unreviewed build fix; add a HAVE_CELESTIAL guard around Celestial framework usage.
Modified: trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig (241298 => 241299)
--- trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig 2019-02-12 17:38:42 UTC (rev 241298)
+++ trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig 2019-02-12 17:43:37 UTC (rev 241299)
@@ -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_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;
Modified: trunk/Source/WebCore/PAL/ChangeLog (241298 => 241299)
--- trunk/Source/WebCore/PAL/ChangeLog 2019-02-12 17:38:42 UTC (rev 241298)
+++ trunk/Source/WebCore/PAL/ChangeLog 2019-02-12 17:43:37 UTC (rev 241299)
@@ -1,3 +1,13 @@
+2019-02-12 Andy Estes <[email protected]>
+
+ [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 <[email protected]>
Unreviewed build fix; add a HAVE_CELESTIAL guard around the CelestialSPI.h contents.
Modified: trunk/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig (241298 => 241299)
--- trunk/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig 2019-02-12 17:38:42 UTC (rev 241298)
+++ trunk/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig 2019-02-12 17:43:37 UTC (rev 241299)
@@ -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_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;
Modified: trunk/Source/WebCore/platform/ContentFilterUnblockHandler.h (241298 => 241299)
--- trunk/Source/WebCore/platform/ContentFilterUnblockHandler.h 2019-02-12 17:38:42 UTC (rev 241298)
+++ trunk/Source/WebCore/platform/ContentFilterUnblockHandler.h 2019-02-12 17:43:37 UTC (rev 241299)
@@ -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 @@
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 @@
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
};
Modified: trunk/Source/WebCore/platform/cocoa/ContentFilterUnblockHandlerCocoa.mm (241298 => 241299)
--- trunk/Source/WebCore/platform/cocoa/ContentFilterUnblockHandlerCocoa.mm 2019-02-12 17:38:42 UTC (rev 241298)
+++ trunk/Source/WebCore/platform/cocoa/ContentFilterUnblockHandlerCocoa.mm 2019-02-12 17:43:37 UTC (rev 241299)
@@ -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,29 +31,22 @@
#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 {
ContentFilterUnblockHandler::ContentFilterUnblockHandler(String unblockURLHost, UnblockRequesterFunction unblockRequester)
@@ -63,7 +56,7 @@
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 @@
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 @@
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 @@
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 @@
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::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 @@
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 @@
} // namespace WebCore
-#endif // PLATFORM(IOS_FAMILY) && ENABLE(CONTENT_FILTERING)
+#endif // ENABLE(CONTENT_FILTERING)
Modified: trunk/Source/WebCore/platform/cocoa/ParentalControlsContentFilter.mm (241298 => 241299)
--- trunk/Source/WebCore/platform/cocoa/ParentalControlsContentFilter.mm 2019-02-12 17:38:42 UTC (rev 241298)
+++ trunk/Source/WebCore/platform/cocoa/ParentalControlsContentFilter.mm 2019-02-12 17:43:37 UTC (rev 241299)
@@ -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 @@
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 @@
#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 { };
Modified: trunk/Source/WebKit/ChangeLog (241298 => 241299)
--- trunk/Source/WebKit/ChangeLog 2019-02-12 17:38:42 UTC (rev 241298)
+++ trunk/Source/WebKit/ChangeLog 2019-02-12 17:43:37 UTC (rev 241299)
@@ -1,3 +1,13 @@
+2019-02-12 Andy Estes <[email protected]>
+
+ [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 Alex Christensen <[email protected]>
Remove noisy and unnecessary logs added in r241223
Modified: trunk/Source/WebKit/Configurations/FeatureDefines.xcconfig (241298 => 241299)
--- trunk/Source/WebKit/Configurations/FeatureDefines.xcconfig 2019-02-12 17:38:42 UTC (rev 241298)
+++ trunk/Source/WebKit/Configurations/FeatureDefines.xcconfig 2019-02-12 17:43:37 UTC (rev 241299)
@@ -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_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;
Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (241298 => 241299)
--- trunk/Source/WebKitLegacy/mac/ChangeLog 2019-02-12 17:38:42 UTC (rev 241298)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog 2019-02-12 17:43:37 UTC (rev 241299)
@@ -1,3 +1,13 @@
+2019-02-12 Andy Estes <[email protected]>
+
+ [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 <[email protected]>
[Payment Request] It should be possible to require a phonetic name for shipping contacts
Modified: trunk/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig (241298 => 241299)
--- trunk/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig 2019-02-12 17:38:42 UTC (rev 241298)
+++ trunk/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig 2019-02-12 17:43:37 UTC (rev 241299)
@@ -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_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;
Modified: trunk/Tools/ChangeLog (241298 => 241299)
--- trunk/Tools/ChangeLog 2019-02-12 17:38:42 UTC (rev 241298)
+++ trunk/Tools/ChangeLog 2019-02-12 17:43:37 UTC (rev 241299)
@@ -1,3 +1,13 @@
+2019-02-12 Andy Estes <[email protected]>
+
+ [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-12 Zalan Bujtas <[email protected]>
[LFC][IFC] Add intrinsic width support for float boxes.
Modified: trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig (241298 => 241299)
--- trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig 2019-02-12 17:38:42 UTC (rev 241298)
+++ trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig 2019-02-12 17:43:37 UTC (rev 241299)
@@ -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_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;