Modified: trunk/Source/WebCore/PAL/ChangeLog (261136 => 261137)
--- trunk/Source/WebCore/PAL/ChangeLog 2020-05-05 01:27:38 UTC (rev 261136)
+++ trunk/Source/WebCore/PAL/ChangeLog 2020-05-05 01:43:28 UTC (rev 261137)
@@ -1,3 +1,14 @@
+2020-05-04 Peng Liu <peng.l...@apple.com>
+
+ Fix the mistake on macro HAVE_SYSTEM_FEATURE_FLAGS
+ https://bugs.webkit.org/show_bug.cgi?id=211416
+
+ Reviewed by Tim Horton.
+
+ We should use "#if HAVE(SYSTEM_FEATURE_FLAGS)" instead of "#if HAVE(HAVE_SYSTEM_FEATURE_FLAGS)".
+
+ * pal/spi/cocoa/FeatureFlagsSPI.h:
+
2020-05-04 Darin Adler <da...@apple.com>
Remove HAVE(IOSURFACE) checks in Cocoa-platform-specific code
Modified: trunk/Source/WebCore/PAL/pal/spi/cocoa/FeatureFlagsSPI.h (261136 => 261137)
--- trunk/Source/WebCore/PAL/pal/spi/cocoa/FeatureFlagsSPI.h 2020-05-05 01:27:38 UTC (rev 261136)
+++ trunk/Source/WebCore/PAL/pal/spi/cocoa/FeatureFlagsSPI.h 2020-05-05 01:43:28 UTC (rev 261137)
@@ -25,7 +25,7 @@
#pragma once
-#if HAVE(HAVE_SYSTEM_FEATURE_FLAGS)
+#if HAVE(SYSTEM_FEATURE_FLAGS)
#if USE(APPLE_INTERNAL_SDK)
@@ -37,4 +37,4 @@
extern "C" bool _os_feature_enabled_impl(const char *domain, const char *feature);
#endif
-#endif // HAVE(HAVE_SYSTEM_FEATURE_FLAGS)
+#endif // HAVE(SYSTEM_FEATURE_FLAGS)
Modified: trunk/Source/WebKit/ChangeLog (261136 => 261137)
--- trunk/Source/WebKit/ChangeLog 2020-05-05 01:27:38 UTC (rev 261136)
+++ trunk/Source/WebKit/ChangeLog 2020-05-05 01:43:28 UTC (rev 261137)
@@ -1,3 +1,27 @@
+2020-05-04 Peng Liu <peng.l...@apple.com>
+
+ Fix the mistake on macro HAVE_SYSTEM_FEATURE_FLAGS
+ https://bugs.webkit.org/show_bug.cgi?id=211416
+
+ Reviewed by Tim Horton.
+
+ We should use "#if HAVE(SYSTEM_FEATURE_FLAGS)" instead of "#if HAVE(HAVE_SYSTEM_FEATURE_FLAGS)".
+ And we have to use the function _os_feature_enabled_impl() instead of the macro os_feature_enabled()
+ because WebKit is a namespace and cannot be used in os_feature_enabled().
+
+ * Shared/WebPreferencesDefaultValues.cpp:
+ (WebKit::defaultAsyncFrameAndOverflowScrollingEnabled):
+ (WebKit::defaultUseGPUProcessForMedia):
+ (WebKit::defaultRenderCanvasInGPUProcessEnabled):
+ (WebKit::defaultCaptureAudioInGPUProcessEnabled):
+ (WebKit::defaultCaptureVideoInGPUProcessEnabled):
+ (WebKit::defaultWebRTCCodecsInGPUProcess):
+ (WebKit::defaultWebGL2Enabled):
+ (WebKit::defaultWebGPUEnabled):
+ (WebKit::defaultInAppBrowserPrivacy):
+ (WebKit::defaultIncrementalPDFEnabled):
+ (WebKit::defaultWebXREnabled):
+
2020-05-04 Brent Fulgham <bfulg...@apple.com>
[macOS] Eliminate SecurityServer and OCSPD from the WebContent sandbox
Modified: trunk/Source/WebKit/Shared/WebPreferencesDefaultValues.cpp (261136 => 261137)
--- trunk/Source/WebKit/Shared/WebPreferencesDefaultValues.cpp 2020-05-05 01:27:38 UTC (rev 261136)
+++ trunk/Source/WebKit/Shared/WebPreferencesDefaultValues.cpp 2020-05-05 01:43:28 UTC (rev 261137)
@@ -84,8 +84,8 @@
return true;
#endif
-#if HAVE(HAVE_SYSTEM_FEATURE_FLAGS)
- return os_feature_enabled(WebKit, async_frame_and_overflow_scrolling);
+#if HAVE(SYSTEM_FEATURE_FLAGS)
+ return _os_feature_enabled_impl("WebKit", "async_frame_and_overflow_scrolling");
#endif
#if PLATFORM(MAC)
@@ -113,8 +113,8 @@
bool defaultUseGPUProcessForMedia()
{
-#if HAVE(HAVE_SYSTEM_FEATURE_FLAGS)
- return os_feature_enabled(WebKit, canvas_and_media_in_gpu_process);
+#if HAVE(SYSTEM_FEATURE_FLAGS)
+ return _os_feature_enabled_impl("WebKit", "canvas_and_media_in_gpu_process");
#endif
return false;
@@ -124,8 +124,8 @@
bool defaultRenderCanvasInGPUProcessEnabled()
{
-#if HAVE(HAVE_SYSTEM_FEATURE_FLAGS)
- return os_feature_enabled(WebKit, canvas_and_media_in_gpu_process);
+#if HAVE(SYSTEM_FEATURE_FLAGS)
+ return _os_feature_enabled_impl("WebKit", "canvas_and_media_in_gpu_process");
#endif
return false;
@@ -135,12 +135,12 @@
bool defaultCaptureAudioInGPUProcessEnabled()
{
-#if PLATFORM(MAC) && HAVE(HAVE_SYSTEM_FEATURE_FLAGS)
- return os_feature_enabled(WebKit, webrtc_in_gpu_process);
+#if PLATFORM(MAC) && HAVE(SYSTEM_FEATURE_FLAGS)
+ return _os_feature_enabled_impl("WebKit", "webrtc_in_gpu_process");
#endif
-#if PLATFORM(IOS_FAMILY) && HAVE(HAVE_SYSTEM_FEATURE_FLAGS)
- return os_feature_enabled(WebKit, canvas_and_media_in_gpu_process);
+#if PLATFORM(IOS_FAMILY) && HAVE(SYSTEM_FEATURE_FLAGS)
+ return _os_feature_enabled_impl("WebKit", "canvas_and_media_in_gpu_process");
#endif
return false;
@@ -161,8 +161,8 @@
bool defaultCaptureVideoInGPUProcessEnabled()
{
-#if HAVE(HAVE_SYSTEM_FEATURE_FLAGS)
- return os_feature_enabled(WebKit, webrtc_in_gpu_process);
+#if HAVE(SYSTEM_FEATURE_FLAGS)
+ return _os_feature_enabled_impl("WebKit", "webrtc_in_gpu_process");
#endif
return false;
@@ -174,8 +174,8 @@
bool defaultWebRTCCodecsInGPUProcess()
{
-#if HAVE(HAVE_SYSTEM_FEATURE_FLAGS)
- return os_feature_enabled(WebKit, webrtc_in_gpu_process);
+#if HAVE(SYSTEM_FEATURE_FLAGS)
+ return _os_feature_enabled_impl("WebKit", "webrtc_in_gpu_process");
#endif
return false;
@@ -187,8 +187,8 @@
bool defaultWebGL2Enabled()
{
-#if HAVE(HAVE_SYSTEM_FEATURE_FLAGS)
- return os_feature_enabled(WebKit, WebGL2);
+#if HAVE(SYSTEM_FEATURE_FLAGS)
+ return _os_feature_enabled_impl("WebKit", "WebGL2");
#endif
return false;
@@ -200,8 +200,8 @@
bool defaultWebGPUEnabled()
{
-#if HAVE(HAVE_SYSTEM_FEATURE_FLAGS)
- return os_feature_enabled(WebKit, WebGPU);
+#if HAVE(SYSTEM_FEATURE_FLAGS)
+ return _os_feature_enabled_impl("WebKit", "WebGPU");
#endif
return false;
@@ -211,8 +211,8 @@
bool defaultInAppBrowserPrivacy()
{
-#if HAVE(HAVE_SYSTEM_FEATURE_FLAGS)
- return os_feature_enabled(WebKit, InAppBrowserPrivacy);
+#if HAVE(SYSTEM_FEATURE_FLAGS)
+ return _os_feature_enabled_impl("WebKit", "InAppBrowserPrivacy");
#endif
return false;
@@ -221,8 +221,8 @@
#if HAVE(INCREMENTAL_PDF_APIS)
bool defaultIncrementalPDFEnabled()
{
-#if HAVE(HAVE_SYSTEM_FEATURE_FLAGS)
- return os_feature_enabled(WebKit, incremental_pdf);
+#if HAVE(SYSTEM_FEATURE_FLAGS)
+ return _os_feature_enabled_impl("WebKit", "incremental_pdf");
#endif
return false;
@@ -233,8 +233,8 @@
bool defaultWebXREnabled()
{
-#if HAVE(HAVE_SYSTEM_FEATURE_FLAGS)
- return os_feature_enabled(WebKit, WebXR);
+#if HAVE(SYSTEM_FEATURE_FLAGS)
+ return _os_feature_enabled_impl("WebKit", "WebXR");
#endif
return false;
@@ -242,5 +242,4 @@
#endif // ENABLE(WEBXR)
-
} // namespace WebKit
