Diff
Modified: trunk/ChangeLog (220249 => 220250)
--- trunk/ChangeLog 2017-08-04 02:37:53 UTC (rev 220249)
+++ trunk/ChangeLog 2017-08-04 02:41:16 UTC (rev 220250)
@@ -1,3 +1,16 @@
+2017-08-03 Brian Burg <[email protected]>
+
+ Remove ENABLE(WEB_SOCKET) guards
+ https://bugs.webkit.org/show_bug.cgi?id=167044
+
+ Reviewed by Joseph Pecoraro.
+
+ * Source/cmake/OptionsMac.cmake:
+ * Source/cmake/OptionsWin.cmake:
+ * Source/cmake/WebKitFeatures.cmake:
+ * Source/cmake/tools/vsprops/FeatureDefines.props:
+ * Source/cmake/tools/vsprops/FeatureDefinesCairo.props:
+
2017-08-03 Brady Eidson <[email protected]>
Add SW IDLs and stub out basic functionality.
Modified: trunk/Source/_javascript_Core/ChangeLog (220249 => 220250)
--- trunk/Source/_javascript_Core/ChangeLog 2017-08-04 02:37:53 UTC (rev 220249)
+++ trunk/Source/_javascript_Core/ChangeLog 2017-08-04 02:41:16 UTC (rev 220250)
@@ -1,3 +1,12 @@
+2017-08-03 Brian Burg <[email protected]>
+
+ Remove ENABLE(WEB_SOCKET) guards
+ https://bugs.webkit.org/show_bug.cgi?id=167044
+
+ Reviewed by Joseph Pecoraro.
+
+ * Configurations/FeatureDefines.xcconfig:
+
2017-08-03 Youenn Fablet <[email protected]>
Remove FETCH_API compilation guard
Modified: trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig (220249 => 220250)
--- trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig 2017-08-04 02:37:53 UTC (rev 220249)
+++ trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig 2017-08-04 02:41:16 UTC (rev 220250)
@@ -213,7 +213,6 @@
ENABLE_WEBGPU[sdk=iphonesimulator*] = ;
ENABLE_WEB_ANIMATIONS = ENABLE_WEB_ANIMATIONS;
ENABLE_WEB_AUDIO = ENABLE_WEB_AUDIO;
-ENABLE_WEB_SOCKETS = ENABLE_WEB_SOCKETS;
ENABLE_XSLT = ENABLE_XSLT;
@@ -243,4 +242,4 @@
ENABLE_DATA_INTERACTION[sdk=iphoneos11*] = ENABLE_DATA_INTERACTION;
ENABLE_DATA_INTERACTION[sdk=iphonesimulator11*] = ENABLE_DATA_INTERACTION;
-FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS3_TEXT) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FILTERS
_LEVEL_2) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_KEYBOARD_KEY_ATTRIBUTE) $(ENABLE_KEYBOARD_CODE_ATTRIBUTE) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_MET
ER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_RTC) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_W
EBGPU) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT);
+FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS3_TEXT) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FILTERS_
LEVEL_2) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_KEYBOARD_KEY_ATTRIBUTE) $(ENABLE_KEYBOARD_CODE_ATTRIBUTE) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METE
R_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_RTC) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WIRELES
S_PLAYBACK_TARGET) $(ENABLE_XSLT);
Modified: trunk/Source/WTF/ChangeLog (220249 => 220250)
--- trunk/Source/WTF/ChangeLog 2017-08-04 02:37:53 UTC (rev 220249)
+++ trunk/Source/WTF/ChangeLog 2017-08-04 02:41:16 UTC (rev 220250)
@@ -1,3 +1,12 @@
+2017-08-03 Brian Burg <[email protected]>
+
+ Remove ENABLE(WEB_SOCKET) guards
+ https://bugs.webkit.org/show_bug.cgi?id=167044
+
+ Reviewed by Joseph Pecoraro.
+
+ * wtf/FeatureDefines.h:
+
2017-08-03 Youenn Fablet <[email protected]>
Remove FETCH_API compilation guard
Modified: trunk/Source/WTF/wtf/FeatureDefines.h (220249 => 220250)
--- trunk/Source/WTF/wtf/FeatureDefines.h 2017-08-04 02:37:53 UTC (rev 220249)
+++ trunk/Source/WTF/wtf/FeatureDefines.h 2017-08-04 02:41:16 UTC (rev 220250)
@@ -708,10 +708,6 @@
#define ENABLE_WEB_AUDIO 0
#endif
-#if !defined(ENABLE_WEB_SOCKETS)
-#define ENABLE_WEB_SOCKETS 1
-#endif
-
#if !defined(ENABLE_XSLT)
#define ENABLE_XSLT 1
#endif
Modified: trunk/Source/WebCore/ChangeLog (220249 => 220250)
--- trunk/Source/WebCore/ChangeLog 2017-08-04 02:37:53 UTC (rev 220249)
+++ trunk/Source/WebCore/ChangeLog 2017-08-04 02:41:16 UTC (rev 220250)
@@ -1,3 +1,63 @@
+2017-08-03 Brian Burg <[email protected]>
+
+ Remove ENABLE(WEB_SOCKET) guards
+ https://bugs.webkit.org/show_bug.cgi?id=167044
+
+ Reviewed by Joseph Pecoraro.
+
+ * Configurations/FeatureDefines.xcconfig:
+ * Modules/websockets/ThreadableWebSocketChannel.cpp:
+ * Modules/websockets/ThreadableWebSocketChannel.h:
+ * Modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp:
+ * Modules/websockets/ThreadableWebSocketChannelClientWrapper.h:
+ * Modules/websockets/WebSocket.cpp:
+ * Modules/websockets/WebSocket.h:
+ * Modules/websockets/WebSocket.idl:
+ * Modules/websockets/WebSocketChannel.cpp:
+ * Modules/websockets/WebSocketChannel.h:
+ * Modules/websockets/WebSocketChannelClient.h:
+ * Modules/websockets/WebSocketDeflateFramer.cpp:
+ * Modules/websockets/WebSocketDeflateFramer.h:
+ * Modules/websockets/WebSocketDeflater.cpp:
+ * Modules/websockets/WebSocketDeflater.h:
+ * Modules/websockets/WebSocketExtensionDispatcher.cpp:
+ * Modules/websockets/WebSocketExtensionDispatcher.h:
+ * Modules/websockets/WebSocketExtensionParser.cpp:
+ * Modules/websockets/WebSocketExtensionParser.h:
+ * Modules/websockets/WebSocketExtensionProcessor.h:
+ * Modules/websockets/WebSocketFrame.cpp:
+ * Modules/websockets/WebSocketFrame.h:
+ * Modules/websockets/WebSocketHandshake.cpp:
+ * Modules/websockets/WebSocketHandshake.h:
+ * Modules/websockets/WorkerThreadableWebSocketChannel.cpp:
+ * Modules/websockets/WorkerThreadableWebSocketChannel.h:
+ * dom/Document.cpp:
+ (WebCore::Document::Document):
+ (WebCore::Document::idbConnectionProxy):
+ (WebCore::Document::socketProvider):
+ * dom/Document.h:
+ * dom/ScriptExecutionContext.h:
+ * inspector/InspectorInstrumentation.cpp:
+ (WebCore::InspectorInstrumentation::didSendWebSocketFrameImpl):
+ * inspector/InspectorInstrumentation.h:
+ (WebCore::InspectorInstrumentation::didSendWebSocketFrame):
+ * inspector/InspectorNetworkAgent.cpp:
+ * inspector/InspectorNetworkAgent.h:
+ * page/RuntimeEnabledFeatures.cpp:
+ (WebCore::RuntimeEnabledFeatures::webSocketEnabled const):
+ * page/RuntimeEnabledFeatures.h:
+ * page/SocketProvider.cpp:
+ * page/SocketProvider.h:
+ * workers/WorkerGlobalScope.cpp:
+ (WebCore::WorkerGlobalScope::WorkerGlobalScope):
+ * workers/WorkerGlobalScope.h:
+ * workers/WorkerMessagingProxy.cpp:
+ (WebCore::WorkerMessagingProxy::startWorkerGlobalScope):
+ * workers/WorkerThread.cpp:
+ (WebCore::WorkerThread::WorkerThread):
+ (WebCore::WorkerThread::socketProvider):
+ * workers/WorkerThread.h:
+
2017-08-03 Don Olmstead <[email protected]>
Remove LayoutUnit dependency in TextStream
Modified: trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig (220249 => 220250)
--- trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig 2017-08-04 02:37:53 UTC (rev 220249)
+++ trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig 2017-08-04 02:41:16 UTC (rev 220250)
@@ -213,7 +213,6 @@
ENABLE_WEBGPU[sdk=iphonesimulator*] = ;
ENABLE_WEB_ANIMATIONS = ENABLE_WEB_ANIMATIONS;
ENABLE_WEB_AUDIO = ENABLE_WEB_AUDIO;
-ENABLE_WEB_SOCKETS = ENABLE_WEB_SOCKETS;
ENABLE_XSLT = ENABLE_XSLT;
@@ -243,4 +242,4 @@
ENABLE_DATA_INTERACTION[sdk=iphoneos11*] = ENABLE_DATA_INTERACTION;
ENABLE_DATA_INTERACTION[sdk=iphonesimulator11*] = ENABLE_DATA_INTERACTION;
-FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS3_TEXT) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FILTERS
_LEVEL_2) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_KEYBOARD_KEY_ATTRIBUTE) $(ENABLE_KEYBOARD_CODE_ATTRIBUTE) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_MET
ER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_RTC) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_W
EBGPU) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT);
+FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS3_TEXT) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FILTERS_
LEVEL_2) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_KEYBOARD_KEY_ATTRIBUTE) $(ENABLE_KEYBOARD_CODE_ATTRIBUTE) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METE
R_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_RTC) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WIRELES
S_PLAYBACK_TARGET) $(ENABLE_XSLT);
Modified: trunk/Source/WebCore/Modules/websockets/ThreadableWebSocketChannel.cpp (220249 => 220250)
--- trunk/Source/WebCore/Modules/websockets/ThreadableWebSocketChannel.cpp 2017-08-04 02:37:53 UTC (rev 220249)
+++ trunk/Source/WebCore/Modules/websockets/ThreadableWebSocketChannel.cpp 2017-08-04 02:41:16 UTC (rev 220250)
@@ -29,8 +29,6 @@
*/
#include "config.h"
-
-#if ENABLE(WEB_SOCKETS)
#include "ThreadableWebSocketChannel.h"
#include "Document.h"
@@ -57,5 +55,3 @@
}
} // namespace WebCore
-
-#endif // ENABLE(WEB_SOCKETS)
Modified: trunk/Source/WebCore/Modules/websockets/ThreadableWebSocketChannel.h (220249 => 220250)
--- trunk/Source/WebCore/Modules/websockets/ThreadableWebSocketChannel.h 2017-08-04 02:37:53 UTC (rev 220249)
+++ trunk/Source/WebCore/Modules/websockets/ThreadableWebSocketChannel.h 2017-08-04 02:41:16 UTC (rev 220250)
@@ -30,8 +30,6 @@
#pragma once
-#if ENABLE(WEB_SOCKETS)
-
#include <wtf/Forward.h>
#include <wtf/Noncopyable.h>
@@ -85,5 +83,3 @@
};
} // namespace WebCore
-
-#endif // ENABLE(WEB_SOCKETS)
Modified: trunk/Source/WebCore/Modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp (220249 => 220250)
--- trunk/Source/WebCore/Modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp 2017-08-04 02:37:53 UTC (rev 220249)
+++ trunk/Source/WebCore/Modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp 2017-08-04 02:41:16 UTC (rev 220250)
@@ -29,7 +29,6 @@
*/
#include "config.h"
-#if ENABLE(WEB_SOCKETS)
#include "ThreadableWebSocketChannelClientWrapper.h"
#include "ScriptExecutionContext.h"
@@ -271,5 +270,3 @@
}
} // namespace WebCore
-
-#endif
Modified: trunk/Source/WebCore/Modules/websockets/ThreadableWebSocketChannelClientWrapper.h (220249 => 220250)
--- trunk/Source/WebCore/Modules/websockets/ThreadableWebSocketChannelClientWrapper.h 2017-08-04 02:37:53 UTC (rev 220249)
+++ trunk/Source/WebCore/Modules/websockets/ThreadableWebSocketChannelClientWrapper.h 2017-08-04 02:41:16 UTC (rev 220250)
@@ -30,8 +30,6 @@
#pragma once
-#if ENABLE(WEB_SOCKETS)
-
#include "ScriptExecutionContext.h"
#include "ThreadableWebSocketChannel.h"
#include "WebSocketChannelClient.h"
@@ -107,5 +105,3 @@
};
} // namespace WebCore
-
-#endif // ENABLE(WEB_SOCKETS)
Modified: trunk/Source/WebCore/Modules/websockets/WebSocket.cpp (220249 => 220250)
--- trunk/Source/WebCore/Modules/websockets/WebSocket.cpp 2017-08-04 02:37:53 UTC (rev 220249)
+++ trunk/Source/WebCore/Modules/websockets/WebSocket.cpp 2017-08-04 02:41:16 UTC (rev 220250)
@@ -30,9 +30,6 @@
*/
#include "config.h"
-
-#if ENABLE(WEB_SOCKETS)
-
#include "WebSocket.h"
#include "Blob.h"
@@ -683,6 +680,4 @@
dispatchEvent(event);
}
-} // namespace WebCore
-
-#endif
+} // namespace WebCore
Modified: trunk/Source/WebCore/Modules/websockets/WebSocket.h (220249 => 220250)
--- trunk/Source/WebCore/Modules/websockets/WebSocket.h 2017-08-04 02:37:53 UTC (rev 220249)
+++ trunk/Source/WebCore/Modules/websockets/WebSocket.h 2017-08-04 02:41:16 UTC (rev 220250)
@@ -30,8 +30,6 @@
#pragma once
-#if ENABLE(WEB_SOCKETS)
-
#include "ActiveDOMObject.h"
#include "EventTarget.h"
#include "ExceptionOr.h"
@@ -151,5 +149,3 @@
};
} // namespace WebCore
-
-#endif // ENABLE(WEB_SOCKETS)
Modified: trunk/Source/WebCore/Modules/websockets/WebSocket.idl (220249 => 220250)
--- trunk/Source/WebCore/Modules/websockets/WebSocket.idl 2017-08-04 02:37:53 UTC (rev 220249)
+++ trunk/Source/WebCore/Modules/websockets/WebSocket.idl 2017-08-04 02:41:16 UTC (rev 220250)
@@ -31,7 +31,6 @@
[
ActiveDOMObject,
- Conditional=WEB_SOCKETS,
Constructor(USVString url, optional sequence<DOMString> protocols = []),
Constructor(USVString url, DOMString protocol),
ConstructorMayThrowException,
Modified: trunk/Source/WebCore/Modules/websockets/WebSocketChannel.cpp (220249 => 220250)
--- trunk/Source/WebCore/Modules/websockets/WebSocketChannel.cpp 2017-08-04 02:37:53 UTC (rev 220249)
+++ trunk/Source/WebCore/Modules/websockets/WebSocketChannel.cpp 2017-08-04 02:41:16 UTC (rev 220250)
@@ -29,9 +29,6 @@
*/
#include "config.h"
-
-#if ENABLE(WEB_SOCKETS)
-
#include "WebSocketChannel.h"
#include "Blob.h"
@@ -846,6 +843,4 @@
return m_handshake->mode();
}
-} // namespace WebCore
-
-#endif // ENABLE(WEB_SOCKETS)
+} // namespace WebCore
Modified: trunk/Source/WebCore/Modules/websockets/WebSocketChannel.h (220249 => 220250)
--- trunk/Source/WebCore/Modules/websockets/WebSocketChannel.h 2017-08-04 02:37:53 UTC (rev 220249)
+++ trunk/Source/WebCore/Modules/websockets/WebSocketChannel.h 2017-08-04 02:41:16 UTC (rev 220250)
@@ -30,8 +30,6 @@
#pragma once
-#if ENABLE(WEB_SOCKETS)
-
#include "FileReaderLoaderClient.h"
#include "SocketStreamHandleClient.h"
#include "ThreadableWebSocketChannel.h"
@@ -232,5 +230,3 @@
SPECIALIZE_TYPE_TRAITS_BEGIN(WebCore::WebSocketChannel)
static bool isType(const WebCore::ThreadableWebSocketChannel& threadableWebSocketChannel) { return threadableWebSocketChannel.isWebSocketChannel(); }
SPECIALIZE_TYPE_TRAITS_END()
-
-#endif // ENABLE(WEB_SOCKETS)
Modified: trunk/Source/WebCore/Modules/websockets/WebSocketChannelClient.h (220249 => 220250)
--- trunk/Source/WebCore/Modules/websockets/WebSocketChannelClient.h 2017-08-04 02:37:53 UTC (rev 220249)
+++ trunk/Source/WebCore/Modules/websockets/WebSocketChannelClient.h 2017-08-04 02:41:16 UTC (rev 220250)
@@ -30,8 +30,6 @@
#pragma once
-#if ENABLE(WEB_SOCKETS)
-
#include <wtf/Forward.h>
#include <wtf/Vector.h>
@@ -58,5 +56,3 @@
};
} // namespace WebCore
-
-#endif // ENABLE(WEB_SOCKETS)
Modified: trunk/Source/WebCore/Modules/websockets/WebSocketDeflateFramer.cpp (220249 => 220250)
--- trunk/Source/WebCore/Modules/websockets/WebSocketDeflateFramer.cpp 2017-08-04 02:37:53 UTC (rev 220249)
+++ trunk/Source/WebCore/Modules/websockets/WebSocketDeflateFramer.cpp 2017-08-04 02:41:16 UTC (rev 220250)
@@ -29,9 +29,6 @@
*/
#include "config.h"
-
-#if ENABLE(WEB_SOCKETS)
-
#include "WebSocketDeflateFramer.h"
#include <wtf/HashMap.h>
@@ -253,5 +250,3 @@
}
} // namespace WebCore
-
-#endif // ENABLE(WEB_SOCKETS)
Modified: trunk/Source/WebCore/Modules/websockets/WebSocketDeflateFramer.h (220249 => 220250)
--- trunk/Source/WebCore/Modules/websockets/WebSocketDeflateFramer.h 2017-08-04 02:37:53 UTC (rev 220249)
+++ trunk/Source/WebCore/Modules/websockets/WebSocketDeflateFramer.h 2017-08-04 02:41:16 UTC (rev 220250)
@@ -30,8 +30,6 @@
#pragma once
-#if ENABLE(WEB_SOCKETS)
-
#if USE(ZLIB)
#include "WebSocketDeflater.h"
#endif
@@ -105,5 +103,3 @@
};
} // namespace WebCore
-
-#endif // ENABLE(WEB_SOCKETS)
Modified: trunk/Source/WebCore/Modules/websockets/WebSocketDeflater.cpp (220249 => 220250)
--- trunk/Source/WebCore/Modules/websockets/WebSocketDeflater.cpp 2017-08-04 02:37:53 UTC (rev 220249)
+++ trunk/Source/WebCore/Modules/websockets/WebSocketDeflater.cpp 2017-08-04 02:41:16 UTC (rev 220250)
@@ -31,7 +31,7 @@
#include "config.h"
#include "WebSocketDeflater.h"
-#if ENABLE(WEB_SOCKETS) && USE(ZLIB)
+#if USE(ZLIB)
#include "Logging.h"
#include <wtf/FastMalloc.h>
@@ -206,4 +206,4 @@
} // namespace WebCore
-#endif // ENABLE(WEB_SOCKETS) && USE(ZLIB)
+#endif // USE(ZLIB)
Modified: trunk/Source/WebCore/Modules/websockets/WebSocketDeflater.h (220249 => 220250)
--- trunk/Source/WebCore/Modules/websockets/WebSocketDeflater.h 2017-08-04 02:37:53 UTC (rev 220249)
+++ trunk/Source/WebCore/Modules/websockets/WebSocketDeflater.h 2017-08-04 02:41:16 UTC (rev 220250)
@@ -30,8 +30,6 @@
#pragma once
-#if ENABLE(WEB_SOCKETS)
-
#include <wtf/Vector.h>
struct z_stream_s;
@@ -84,5 +82,3 @@
};
} // namespace WebCore
-
-#endif // ENABLE(WEB_SOCKETS)
Modified: trunk/Source/WebCore/Modules/websockets/WebSocketExtensionDispatcher.cpp (220249 => 220250)
--- trunk/Source/WebCore/Modules/websockets/WebSocketExtensionDispatcher.cpp 2017-08-04 02:37:53 UTC (rev 220249)
+++ trunk/Source/WebCore/Modules/websockets/WebSocketExtensionDispatcher.cpp 2017-08-04 02:41:16 UTC (rev 220250)
@@ -30,12 +30,8 @@
#include "config.h"
-#if ENABLE(WEB_SOCKETS)
-
#include "WebSocketExtensionDispatcher.h"
-
#include "WebSocketExtensionParser.h"
-
#include <wtf/ASCIICType.h>
#include <wtf/HashMap.h>
#include <wtf/text/CString.h>
@@ -152,5 +148,3 @@
}
} // namespace WebCore
-
-#endif // ENABLE(WEB_SOCKETS)
Modified: trunk/Source/WebCore/Modules/websockets/WebSocketExtensionDispatcher.h (220249 => 220250)
--- trunk/Source/WebCore/Modules/websockets/WebSocketExtensionDispatcher.h 2017-08-04 02:37:53 UTC (rev 220249)
+++ trunk/Source/WebCore/Modules/websockets/WebSocketExtensionDispatcher.h 2017-08-04 02:41:16 UTC (rev 220250)
@@ -30,8 +30,6 @@
#pragma once
-#if ENABLE(WEB_SOCKETS)
-
#include "WebSocketExtensionProcessor.h"
#include <wtf/Vector.h>
#include <wtf/text/StringBuilder.h>
@@ -61,5 +59,3 @@
};
} // namespace WebCore
-
-#endif // ENABLE(WEB_SOCKETS)
Modified: trunk/Source/WebCore/Modules/websockets/WebSocketExtensionParser.cpp (220249 => 220250)
--- trunk/Source/WebCore/Modules/websockets/WebSocketExtensionParser.cpp 2017-08-04 02:37:53 UTC (rev 220249)
+++ trunk/Source/WebCore/Modules/websockets/WebSocketExtensionParser.cpp 2017-08-04 02:41:16 UTC (rev 220250)
@@ -30,8 +30,6 @@
#include "config.h"
-#if ENABLE(WEB_SOCKETS)
-
#include "WebSocketExtensionParser.h"
#include <wtf/ASCIICType.h>
@@ -144,5 +142,3 @@
}
} // namespace WebCore
-
-#endif // ENABLE(WEB_SOCKETS)
Modified: trunk/Source/WebCore/Modules/websockets/WebSocketExtensionParser.h (220249 => 220250)
--- trunk/Source/WebCore/Modules/websockets/WebSocketExtensionParser.h 2017-08-04 02:37:53 UTC (rev 220249)
+++ trunk/Source/WebCore/Modules/websockets/WebSocketExtensionParser.h 2017-08-04 02:41:16 UTC (rev 220250)
@@ -30,8 +30,6 @@
#pragma once
-#if ENABLE(WEB_SOCKETS)
-
#include <wtf/HashMap.h>
#include <wtf/text/StringHash.h>
#include <wtf/text/WTFString.h>
@@ -67,5 +65,3 @@
};
} // namespace WebCore
-
-#endif // ENABLE(WEB_SOCKETS)
Modified: trunk/Source/WebCore/Modules/websockets/WebSocketExtensionProcessor.h (220249 => 220250)
--- trunk/Source/WebCore/Modules/websockets/WebSocketExtensionProcessor.h 2017-08-04 02:37:53 UTC (rev 220249)
+++ trunk/Source/WebCore/Modules/websockets/WebSocketExtensionProcessor.h 2017-08-04 02:41:16 UTC (rev 220250)
@@ -30,8 +30,6 @@
#pragma once
-#if ENABLE(WEB_SOCKETS)
-
#include <wtf/HashMap.h>
#include <wtf/text/WTFString.h>
@@ -67,5 +65,3 @@
};
} // namespace WebCore
-
-#endif // ENABLE(WEB_SOCKETS)
Modified: trunk/Source/WebCore/Modules/websockets/WebSocketFrame.cpp (220249 => 220250)
--- trunk/Source/WebCore/Modules/websockets/WebSocketFrame.cpp 2017-08-04 02:37:53 UTC (rev 220249)
+++ trunk/Source/WebCore/Modules/websockets/WebSocketFrame.cpp 2017-08-04 02:41:16 UTC (rev 220250)
@@ -22,10 +22,7 @@
#include "config.h"
-#if ENABLE(WEB_SOCKETS)
-
#include "WebSocketFrame.h"
-
#include <wtf/CryptographicallyRandomNumber.h>
#include <wtf/MathExtras.h>
@@ -184,5 +181,3 @@
}
} // namespace WebCore
-
-#endif // ENABLE(WEB_SOCKETS)
Modified: trunk/Source/WebCore/Modules/websockets/WebSocketFrame.h (220249 => 220250)
--- trunk/Source/WebCore/Modules/websockets/WebSocketFrame.h 2017-08-04 02:37:53 UTC (rev 220249)
+++ trunk/Source/WebCore/Modules/websockets/WebSocketFrame.h 2017-08-04 02:41:16 UTC (rev 220250)
@@ -30,8 +30,6 @@
#pragma once
-#if ENABLE(WEB_SOCKETS)
-
#include <wtf/text/WTFString.h>
namespace WebCore {
@@ -74,5 +72,3 @@
};
} // namespace WebCore
-
-#endif // ENABLE(WEB_SOCKETS)
Modified: trunk/Source/WebCore/Modules/websockets/WebSocketHandshake.cpp (220249 => 220250)
--- trunk/Source/WebCore/Modules/websockets/WebSocketHandshake.cpp 2017-08-04 02:37:53 UTC (rev 220249)
+++ trunk/Source/WebCore/Modules/websockets/WebSocketHandshake.cpp 2017-08-04 02:41:16 UTC (rev 220250)
@@ -30,11 +30,7 @@
*/
#include "config.h"
-
-#if ENABLE(WEB_SOCKETS)
-
#include "WebSocketHandshake.h"
-#include "WebSocket.h"
#include "Cookie.h"
#include "CookieJar.h"
@@ -42,11 +38,12 @@
#include "HTTPHeaderMap.h"
#include "HTTPHeaderNames.h"
#include "HTTPParsers.h"
-#include "URL.h"
#include "Logging.h"
#include "ResourceRequest.h"
#include "ScriptExecutionContext.h"
#include "SecurityOrigin.h"
+#include "URL.h"
+#include "WebSocket.h"
#include <wtf/ASCIICType.h>
#include <wtf/CryptographicallyRandomNumber.h>
#include <wtf/MD5.h>
@@ -615,5 +612,3 @@
}
} // namespace WebCore
-
-#endif // ENABLE(WEB_SOCKETS)
Modified: trunk/Source/WebCore/Modules/websockets/WebSocketHandshake.h (220249 => 220250)
--- trunk/Source/WebCore/Modules/websockets/WebSocketHandshake.h 2017-08-04 02:37:53 UTC (rev 220249)
+++ trunk/Source/WebCore/Modules/websockets/WebSocketHandshake.h 2017-08-04 02:41:16 UTC (rev 220250)
@@ -30,8 +30,6 @@
#pragma once
-#if ENABLE(WEB_SOCKETS)
-
#include "URL.h"
#include "ResourceResponse.h"
#include "WebSocketExtensionDispatcher.h"
@@ -116,5 +114,3 @@
};
} // namespace WebCore
-
-#endif // ENABLE(WEB_SOCKETS)
Modified: trunk/Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.cpp (220249 => 220250)
--- trunk/Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.cpp 2017-08-04 02:37:53 UTC (rev 220249)
+++ trunk/Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.cpp 2017-08-04 02:41:16 UTC (rev 220250)
@@ -29,9 +29,6 @@
*/
#include "config.h"
-
-#if ENABLE(WEB_SOCKETS)
-
#include "WorkerThreadableWebSocketChannel.h"
#include "Blob.h"
@@ -587,5 +584,3 @@
}
} // namespace WebCore
-
-#endif // ENABLE(WEB_SOCKETS)
Modified: trunk/Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.h (220249 => 220250)
--- trunk/Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.h 2017-08-04 02:37:53 UTC (rev 220249)
+++ trunk/Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.h 2017-08-04 02:41:16 UTC (rev 220250)
@@ -30,12 +30,9 @@
#pragma once
-#if ENABLE(WEB_SOCKETS)
-
#include "ThreadableWebSocketChannel.h"
#include "WebSocketChannelClient.h"
#include "WorkerGlobalScope.h"
-
#include <wtf/RefCounted.h>
#include <wtf/RefPtr.h>
#include <wtf/text/WTFString.h>
@@ -172,5 +169,3 @@
};
} // namespace WebCore
-
-#endif // ENABLE(WEB_SOCKETS)
Modified: trunk/Source/WebCore/PAL/ChangeLog (220249 => 220250)
--- trunk/Source/WebCore/PAL/ChangeLog 2017-08-04 02:37:53 UTC (rev 220249)
+++ trunk/Source/WebCore/PAL/ChangeLog 2017-08-04 02:41:16 UTC (rev 220250)
@@ -1,3 +1,12 @@
+2017-08-03 Brian Burg <[email protected]>
+
+ Remove ENABLE(WEB_SOCKET) guards
+ https://bugs.webkit.org/show_bug.cgi?id=167044
+
+ Reviewed by Joseph Pecoraro.
+
+ * Configurations/FeatureDefines.xcconfig:
+
2017-08-03 Yoshiaki Jitsukawa <[email protected]>
[PAL] Move spi/cf directory into PAL
Modified: trunk/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig (220249 => 220250)
--- trunk/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig 2017-08-04 02:37:53 UTC (rev 220249)
+++ trunk/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig 2017-08-04 02:41:16 UTC (rev 220250)
@@ -213,7 +213,6 @@
ENABLE_WEBGPU[sdk=iphonesimulator*] = ;
ENABLE_WEB_ANIMATIONS = ENABLE_WEB_ANIMATIONS;
ENABLE_WEB_AUDIO = ENABLE_WEB_AUDIO;
-ENABLE_WEB_SOCKETS = ENABLE_WEB_SOCKETS;
ENABLE_XSLT = ENABLE_XSLT;
@@ -243,4 +242,4 @@
ENABLE_DATA_INTERACTION[sdk=iphoneos11*] = ENABLE_DATA_INTERACTION;
ENABLE_DATA_INTERACTION[sdk=iphonesimulator11*] = ENABLE_DATA_INTERACTION;
-FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS3_TEXT) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FILTERS
_LEVEL_2) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_KEYBOARD_KEY_ATTRIBUTE) $(ENABLE_KEYBOARD_CODE_ATTRIBUTE) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_MET
ER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_RTC) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_W
EBGPU) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT);
+FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS3_TEXT) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FILTERS_
LEVEL_2) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_KEYBOARD_KEY_ATTRIBUTE) $(ENABLE_KEYBOARD_CODE_ATTRIBUTE) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METE
R_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_RTC) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WIRELES
S_PLAYBACK_TARGET) $(ENABLE_XSLT);
Modified: trunk/Source/WebCore/dom/Document.cpp (220249 => 220250)
--- trunk/Source/WebCore/dom/Document.cpp 2017-08-04 02:37:53 UTC (rev 220249)
+++ trunk/Source/WebCore/dom/Document.cpp 2017-08-04 02:41:16 UTC (rev 220250)
@@ -501,9 +501,7 @@
, m_fontSelector(CSSFontSelector::create(*this))
, m_didAssociateFormControlsTimer(*this, &Document::didAssociateFormControlsTimerFired)
, m_cookieCacheExpiryTimer(*this, &Document::invalidateDOMCookieCache)
-#if ENABLE(WEB_SOCKETS)
, m_socketProvider(page() ? &page()->socketProvider() : nullptr)
-#endif
, m_isSynthesized(constructionFlags & Synthesized)
, m_isNonRenderedPlaceholder(constructionFlags & NonRenderedPlaceholder)
, m_orientationNotifier(currentOrientation(frame))
@@ -3058,7 +3056,6 @@
}
#if ENABLE(INDEXED_DATABASE)
-
IDBClient::IDBConnectionProxy* Document::idbConnectionProxy()
{
if (!m_idbConnectionProxy) {
@@ -3069,17 +3066,12 @@
}
return m_idbConnectionProxy.get();
}
-
#endif
-#if ENABLE(WEB_SOCKETS)
-
SocketProvider* Document::socketProvider()
{
return m_socketProvider.get();
}
-
-#endif
bool Document::canNavigate(Frame* targetFrame)
{
Modified: trunk/Source/WebCore/dom/Document.h (220249 => 220250)
--- trunk/Source/WebCore/dom/Document.h 2017-08-04 02:37:53 UTC (rev 220249)
+++ trunk/Source/WebCore/dom/Document.h 2017-08-04 02:41:16 UTC (rev 220250)
@@ -658,9 +658,7 @@
#if ENABLE(INDEXED_DATABASE)
IDBClient::IDBConnectionProxy* idbConnectionProxy() final;
#endif
-#if ENABLE(WEB_SOCKETS)
SocketProvider* socketProvider() final;
-#endif
bool canNavigate(Frame* targetFrame);
Frame* findUnsafeParentScrollPropagationBoundary();
@@ -1710,9 +1708,7 @@
Timer m_didAssociateFormControlsTimer;
Timer m_cookieCacheExpiryTimer;
-#if ENABLE(WEB_SOCKETS)
RefPtr<SocketProvider> m_socketProvider;
-#endif
String m_cachedDOMCookies;
Modified: trunk/Source/WebCore/dom/EventTargetFactory.in (220249 => 220250)
--- trunk/Source/WebCore/dom/EventTargetFactory.in 2017-08-04 02:37:53 UTC (rev 220249)
+++ trunk/Source/WebCore/dom/EventTargetFactory.in 2017-08-04 02:41:16 UTC (rev 220250)
@@ -40,7 +40,7 @@
VideoTrackList conditional=VIDEO_TRACK
WebKitMediaKeySession conditional=LEGACY_ENCRYPTED_MEDIA
WebKitNamedFlow
-WebSocket conditional=WEB_SOCKETS
+WebSocket
Worker
XMLHttpRequest
XMLHttpRequestUpload
Modified: trunk/Source/WebCore/dom/ScriptExecutionContext.h (220249 => 220250)
--- trunk/Source/WebCore/dom/ScriptExecutionContext.h 2017-08-04 02:37:53 UTC (rev 220249)
+++ trunk/Source/WebCore/dom/ScriptExecutionContext.h 2017-08-04 02:41:16 UTC (rev 220250)
@@ -90,9 +90,7 @@
#if ENABLE(INDEXED_DATABASE)
virtual IDBClient::IDBConnectionProxy* idbConnectionProxy() = 0;
#endif
-#if ENABLE(WEB_SOCKETS)
virtual SocketProvider* socketProvider() = 0;
-#endif
virtual String resourceRequestIdentifier() const { return String(); };
Modified: trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp (220249 => 220250)
--- trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp 2017-08-04 02:37:53 UTC (rev 220249)
+++ trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp 2017-08-04 02:41:16 UTC (rev 220250)
@@ -931,7 +931,6 @@
workerAgent->workerTerminated(proxy);
}
-#if ENABLE(WEB_SOCKETS)
void InspectorInstrumentation::didCreateWebSocketImpl(InstrumentingAgents& instrumentingAgents, unsigned long identifier, const URL& requestURL)
{
if (!instrumentingAgents.inspectorEnvironment().developerExtrasEnabled())
@@ -976,7 +975,6 @@
if (InspectorNetworkAgent* networkAgent = instrumentingAgents.inspectorNetworkAgent())
networkAgent->didSendWebSocketFrame(identifier, frame);
}
-#endif
void InspectorInstrumentation::didCreateCSSCanvasImpl(InstrumentingAgents& instrumentingAgents, HTMLCanvasElement& canvasElement, const String& name)
{
Modified: trunk/Source/WebCore/inspector/InspectorInstrumentation.h (220249 => 220250)
--- trunk/Source/WebCore/inspector/InspectorInstrumentation.h 2017-08-04 02:37:53 UTC (rev 220249)
+++ trunk/Source/WebCore/inspector/InspectorInstrumentation.h 2017-08-04 02:41:16 UTC (rev 220250)
@@ -220,7 +220,6 @@
static void workerStarted(ScriptExecutionContext&, WorkerInspectorProxy*, const URL&);
static void workerTerminated(ScriptExecutionContext&, WorkerInspectorProxy*);
-#if ENABLE(WEB_SOCKETS)
static void didCreateWebSocket(Document*, unsigned long identifier, const URL& requestURL);
static void willSendWebSocketHandshakeRequest(Document*, unsigned long identifier, const ResourceRequest&);
static void didReceiveWebSocketHandshakeResponse(Document*, unsigned long identifier, const ResourceResponse&);
@@ -228,7 +227,6 @@
static void didReceiveWebSocketFrame(Document*, unsigned long identifier, const WebSocketFrame&);
static void didSendWebSocketFrame(Document*, unsigned long identifier, const WebSocketFrame&);
static void didReceiveWebSocketFrameError(Document*, unsigned long identifier, const String& errorMessage);
-#endif
#if ENABLE(RESOURCE_USAGE)
static void didHandleMemoryPressure(Page&, Critical);
@@ -384,7 +382,6 @@
static void workerStartedImpl(InstrumentingAgents&, WorkerInspectorProxy*, const URL&);
static void workerTerminatedImpl(InstrumentingAgents&, WorkerInspectorProxy*);
-#if ENABLE(WEB_SOCKETS)
static void didCreateWebSocketImpl(InstrumentingAgents&, unsigned long identifier, const URL& requestURL);
static void willSendWebSocketHandshakeRequestImpl(InstrumentingAgents&, unsigned long identifier, const ResourceRequest&);
static void didReceiveWebSocketHandshakeResponseImpl(InstrumentingAgents&, unsigned long identifier, const ResourceResponse&);
@@ -392,7 +389,6 @@
static void didReceiveWebSocketFrameImpl(InstrumentingAgents&, unsigned long identifier, const WebSocketFrame&);
static void didSendWebSocketFrameImpl(InstrumentingAgents&, unsigned long identifier, const WebSocketFrame&);
static void didReceiveWebSocketFrameErrorImpl(InstrumentingAgents&, unsigned long identifier, const String&);
-#endif
#if ENABLE(RESOURCE_USAGE)
static void didHandleMemoryPressureImpl(InstrumentingAgents&, Critical);
@@ -1052,7 +1048,6 @@
workerTerminatedImpl(*instrumentingAgents, proxy);
}
-#if ENABLE(WEB_SOCKETS)
inline void InspectorInstrumentation::didCreateWebSocket(Document* document, unsigned long identifier, const URL& requestURL)
{
FAST_RETURN_IF_NO_FRONTENDS(void());
@@ -1101,7 +1096,6 @@
if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForDocument(document))
didSendWebSocketFrameImpl(*instrumentingAgents, identifier, frame);
}
-#endif // ENABLE(WEB_SOCKETS)
#if ENABLE(RESOURCE_USAGE)
inline void InspectorInstrumentation::didHandleMemoryPressure(Page& page, Critical critical)
Modified: trunk/Source/WebCore/inspector/InspectorNetworkAgent.cpp (220249 => 220250)
--- trunk/Source/WebCore/inspector/InspectorNetworkAgent.cpp 2017-08-04 02:37:53 UTC (rev 220249)
+++ trunk/Source/WebCore/inspector/InspectorNetworkAgent.cpp 2017-08-04 02:41:16 UTC (rev 220250)
@@ -601,8 +601,6 @@
.release();
}
-#if ENABLE(WEB_SOCKETS)
-
void InspectorNetworkAgent::didCreateWebSocket(unsigned long identifier, const URL& requestURL)
{
m_frontendDispatcher->webSocketCreated(IdentifiersFactory::requestId(identifier), requestURL.string());
@@ -658,8 +656,6 @@
m_frontendDispatcher->webSocketFrameError(IdentifiersFactory::requestId(identifier), timestamp(), errorMessage);
}
-#endif // ENABLE(WEB_SOCKETS)
-
void InspectorNetworkAgent::enable(ErrorString&)
{
enable();
@@ -790,8 +786,6 @@
inspectorThreadableLoaderClient->setLoader(WTFMove(loader));
}
-#if ENABLE(WEB_SOCKETS)
-
WebSocket* InspectorNetworkAgent::webSocketForRequestId(const String& requestId)
{
LockHolder lock(WebSocket::allActiveWebSocketsMutex());
@@ -851,8 +845,6 @@
result = injectedScript.wrapObject(webSocketAsScriptValue(state, webSocket), objectGroupName);
}
-#endif // ENABLE(WEB_SOCKETS)
-
static Ref<Inspector::Protocol::Page::SearchResult> buildObjectForSearchResult(const String& requestId, const String& frameId, const String& url, int matchesCount)
{
auto searchResult = Inspector::Protocol::Page::SearchResult::create()
Modified: trunk/Source/WebCore/inspector/InspectorNetworkAgent.h (220249 => 220250)
--- trunk/Source/WebCore/inspector/InspectorNetworkAgent.h 2017-08-04 02:37:53 UTC (rev 220249)
+++ trunk/Source/WebCore/inspector/InspectorNetworkAgent.h 2017-08-04 02:41:16 UTC (rev 220250)
@@ -57,11 +57,9 @@
class ResourceRequest;
class ResourceResponse;
class URL;
+class WebSocket;
-#if ENABLE(WEB_SOCKETS)
-class WebSocket;
struct WebSocketFrame;
-#endif
typedef String ErrorString;
@@ -89,7 +87,6 @@
void didLoadXHRSynchronously();
void didReceiveScriptResponse(unsigned long identifier);
void willDestroyCachedResource(CachedResource&);
-#if ENABLE(WEB_SOCKETS)
void didCreateWebSocket(unsigned long identifier, const URL& requestURL);
void willSendWebSocketHandshakeRequest(unsigned long identifier, const ResourceRequest&);
void didReceiveWebSocketHandshakeResponse(unsigned long identifier, const ResourceResponse&);
@@ -97,7 +94,6 @@
void didReceiveWebSocketFrame(unsigned long identifier, const WebSocketFrame&);
void didSendWebSocketFrame(unsigned long identifier, const WebSocketFrame&);
void didReceiveWebSocketFrameError(unsigned long identifier, const String&);
-#endif
void mainFrameNavigated(DocumentLoader&);
void setInitialScriptContent(unsigned long identifier, const String& sourceString);
void didScheduleStyleRecalculation(Document&);
@@ -114,16 +110,12 @@
void getResponseBody(ErrorString&, const String& requestId, String* content, bool* base64Encoded) override;
void setResourceCachingDisabled(ErrorString&, bool disabled) override;
void loadResource(ErrorString&, const String& frameId, const String& url, Ref<LoadResourceCallback>&&) override;
-#if ENABLE(WEB_SOCKETS)
void resolveWebSocket(ErrorString&, const String& requestId, const String* const objectGroup, RefPtr<Inspector::Protocol::Runtime::RemoteObject>&) override;
-#endif
private:
void enable();
-#if ENABLE(WEB_SOCKETS)
WebSocket* webSocketForRequestId(const String& requestId);
-#endif
Ref<Inspector::Protocol::Network::ResourceTiming> buildObjectForTiming(const NetworkLoadMetrics&, ResourceLoader&);
Ref<Inspector::Protocol::Network::Metrics> buildObjectForMetrics(const NetworkLoadMetrics&);
Modified: trunk/Source/WebCore/page/RuntimeEnabledFeatures.cpp (220249 => 220250)
--- trunk/Source/WebCore/page/RuntimeEnabledFeatures.cpp 2017-08-04 02:37:53 UTC (rev 220249)
+++ trunk/Source/WebCore/page/RuntimeEnabledFeatures.cpp 2017-08-04 02:41:16 UTC (rev 220250)
@@ -59,11 +59,9 @@
}
#endif
-#if ENABLE(WEB_SOCKETS)
bool RuntimeEnabledFeatures::webSocketEnabled() const
{
return WebSocket::isAvailable();
}
-#endif
} // namespace WebCore
Modified: trunk/Source/WebCore/page/RuntimeEnabledFeatures.h (220249 => 220250)
--- trunk/Source/WebCore/page/RuntimeEnabledFeatures.h 2017-08-04 02:37:53 UTC (rev 220249)
+++ trunk/Source/WebCore/page/RuntimeEnabledFeatures.h 2017-08-04 02:41:16 UTC (rev 220250)
@@ -204,9 +204,7 @@
bool audioEnabled() const;
#endif
-#if ENABLE(WEB_SOCKETS)
bool webSocketEnabled() const;
-#endif
WEBCORE_EXPORT static RuntimeEnabledFeatures& sharedFeatures();
Modified: trunk/Source/WebCore/page/SocketProvider.cpp (220249 => 220250)
--- trunk/Source/WebCore/page/SocketProvider.cpp 2017-08-04 02:37:53 UTC (rev 220249)
+++ trunk/Source/WebCore/page/SocketProvider.cpp 2017-08-04 02:41:16 UTC (rev 220250)
@@ -26,8 +26,6 @@
#include "config.h"
#include "SocketProvider.h"
-#if ENABLE(WEB_SOCKETS)
-
#include "SocketStreamHandleImpl.h"
namespace WebCore {
@@ -38,5 +36,3 @@
}
}
-
-#endif // ENABLE(WEB_SOCKETS)
Modified: trunk/Source/WebCore/page/SocketProvider.h (220249 => 220250)
--- trunk/Source/WebCore/page/SocketProvider.h 2017-08-04 02:37:53 UTC (rev 220249)
+++ trunk/Source/WebCore/page/SocketProvider.h 2017-08-04 02:41:16 UTC (rev 220250)
@@ -39,9 +39,7 @@
class WEBCORE_EXPORT SocketProvider : public ThreadSafeRefCounted<SocketProvider> {
public:
static Ref<SocketProvider> create() { return adoptRef(*new SocketProvider); }
-#if ENABLE(WEB_SOCKETS)
virtual Ref<SocketStreamHandle> createSocketStreamHandle(const URL&, SocketStreamHandleClient&, SessionID, const String& credentialPartition);
-#endif
virtual ~SocketProvider() { };
};
Modified: trunk/Source/WebCore/workers/WorkerGlobalScope.cpp (220249 => 220250)
--- trunk/Source/WebCore/workers/WorkerGlobalScope.cpp 2017-08-04 02:37:53 UTC (rev 220249)
+++ trunk/Source/WebCore/workers/WorkerGlobalScope.cpp 2017-08-04 02:41:16 UTC (rev 220250)
@@ -65,17 +65,12 @@
#if ENABLE(INDEXED_DATABASE)
, m_connectionProxy(connectionProxy)
#endif
-#if ENABLE(WEB_SOCKETS)
, m_socketProvider(socketProvider)
-#endif
, m_performance(Performance::create(*this, timeOrigin))
{
#if !ENABLE(INDEXED_DATABASE)
UNUSED_PARAM(connectionProxy);
#endif
-#if !ENABLE(WEB_SOCKETS)
- UNUSED_PARAM(socketProvider);
-#endif
auto origin = SecurityOrigin::create(url);
if (m_topOrigin->hasUniversalAccess())
@@ -145,15 +140,11 @@
m_script->disableWebAssembly(errorMessage);
}
-#if ENABLE(WEB_SOCKETS)
-
SocketProvider* WorkerGlobalScope::socketProvider()
{
return m_socketProvider.get();
}
-#endif
-
#if ENABLE(INDEXED_DATABASE)
IDBClient::IDBConnectionProxy* WorkerGlobalScope::idbConnectionProxy()
Modified: trunk/Source/WebCore/workers/WorkerGlobalScope.h (220249 => 220250)
--- trunk/Source/WebCore/workers/WorkerGlobalScope.h 2017-08-04 02:37:53 UTC (rev 220249)
+++ trunk/Source/WebCore/workers/WorkerGlobalScope.h 2017-08-04 02:41:16 UTC (rev 220250)
@@ -135,10 +135,7 @@
EventTarget* errorEventTarget() final;
WorkerEventQueue& eventQueue() const final;
String resourceRequestIdentifier() const final { return m_identifier; }
-
-#if ENABLE(WEB_SOCKETS)
SocketProvider* socketProvider() final;
-#endif
bool shouldBypassMainWorldContentSecurityPolicy() const final { return m_shouldBypassMainWorldContentSecurityPolicy; }
bool isJSExecutionForbidden() const final;
@@ -178,9 +175,7 @@
RefPtr<IDBClient::IDBConnectionProxy> m_connectionProxy;
#endif
-#if ENABLE(WEB_SOCKETS)
RefPtr<SocketProvider> m_socketProvider;
-#endif
RefPtr<Performance> m_performance;
mutable RefPtr<Crypto> m_crypto;
Modified: trunk/Source/WebCore/workers/WorkerMessagingProxy.cpp (220249 => 220250)
--- trunk/Source/WebCore/workers/WorkerMessagingProxy.cpp 2017-08-04 02:37:53 UTC (rev 220249)
+++ trunk/Source/WebCore/workers/WorkerMessagingProxy.cpp 2017-08-04 02:41:16 UTC (rev 220250)
@@ -84,11 +84,7 @@
IDBClient::IDBConnectionProxy* proxy = nullptr;
#endif
-#if ENABLE(WEB_SOCKETS)
SocketProvider* socketProvider = document.socketProvider();
-#else
- SocketProvider* socketProvider = nullptr;
-#endif
auto thread = DedicatedWorkerThread::create(scriptURL, identifier, userAgent, sourceCode, *this, *this, startMode, contentSecurityPolicyResponseHeaders, shouldBypassMainWorldContentSecurityPolicy, document.topOrigin(), timeOrigin, proxy, socketProvider, runtimeFlags);
Modified: trunk/Source/WebCore/workers/WorkerThread.cpp (220249 => 220250)
--- trunk/Source/WebCore/workers/WorkerThread.cpp 2017-08-04 02:37:53 UTC (rev 220249)
+++ trunk/Source/WebCore/workers/WorkerThread.cpp 2017-08-04 02:41:16 UTC (rev 220250)
@@ -106,16 +106,11 @@
#if ENABLE(INDEXED_DATABASE)
, m_idbConnectionProxy(connectionProxy)
#endif
-#if ENABLE(WEB_SOCKETS)
, m_socketProvider(socketProvider)
-#endif
{
#if !ENABLE(INDEXED_DATABASE)
UNUSED_PARAM(connectionProxy);
#endif
-#if !ENABLE(WEB_SOCKETS)
- UNUSED_PARAM(socketProvider);
-#endif
std::lock_guard<StaticLock> lock(threadSetMutex);
@@ -307,11 +302,7 @@
SocketProvider* WorkerThread::socketProvider()
{
-#if ENABLE(WEB_SOCKETS)
return m_socketProvider.get();
-#else
- return nullptr;
-#endif
}
} // namespace WebCore
Modified: trunk/Source/WebCore/workers/WorkerThread.h (220249 => 220250)
--- trunk/Source/WebCore/workers/WorkerThread.h 2017-08-04 02:37:53 UTC (rev 220249)
+++ trunk/Source/WebCore/workers/WorkerThread.h 2017-08-04 02:41:16 UTC (rev 220250)
@@ -115,9 +115,7 @@
#if ENABLE(INDEXED_DATABASE)
RefPtr<IDBClient::IDBConnectionProxy> m_idbConnectionProxy;
#endif
-#if ENABLE(WEB_SOCKETS)
RefPtr<SocketProvider> m_socketProvider;
-#endif
};
} // namespace WebCore
Modified: trunk/Source/WebKit/ChangeLog (220249 => 220250)
--- trunk/Source/WebKit/ChangeLog 2017-08-04 02:37:53 UTC (rev 220249)
+++ trunk/Source/WebKit/ChangeLog 2017-08-04 02:41:16 UTC (rev 220250)
@@ -1,3 +1,14 @@
+2017-08-03 Brian Burg <[email protected]>
+
+ Remove ENABLE(WEB_SOCKET) guards
+ https://bugs.webkit.org/show_bug.cgi?id=167044
+
+ Reviewed by Joseph Pecoraro.
+
+ * Configurations/FeatureDefines.xcconfig:
+ * WebProcess/Network/WebSocketProvider.cpp:
+ * WebProcess/Network/WebSocketProvider.h:
+
2017-08-03 Chris Dumez <[email protected]>
Multiple Layout tests from web-platform-tests/beacon/ are timing out.
Modified: trunk/Source/WebKit/Configurations/FeatureDefines.xcconfig (220249 => 220250)
--- trunk/Source/WebKit/Configurations/FeatureDefines.xcconfig 2017-08-04 02:37:53 UTC (rev 220249)
+++ trunk/Source/WebKit/Configurations/FeatureDefines.xcconfig 2017-08-04 02:41:16 UTC (rev 220250)
@@ -213,7 +213,6 @@
ENABLE_WEBGPU[sdk=iphonesimulator*] = ;
ENABLE_WEB_ANIMATIONS = ENABLE_WEB_ANIMATIONS;
ENABLE_WEB_AUDIO = ENABLE_WEB_AUDIO;
-ENABLE_WEB_SOCKETS = ENABLE_WEB_SOCKETS;
ENABLE_XSLT = ENABLE_XSLT;
@@ -243,4 +242,4 @@
ENABLE_DATA_INTERACTION[sdk=iphoneos11*] = ENABLE_DATA_INTERACTION;
ENABLE_DATA_INTERACTION[sdk=iphonesimulator11*] = ENABLE_DATA_INTERACTION;
-FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS3_TEXT) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FILTERS
_LEVEL_2) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_KEYBOARD_KEY_ATTRIBUTE) $(ENABLE_KEYBOARD_CODE_ATTRIBUTE) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_MET
ER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_RTC) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_W
EBGPU) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT);
+FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS3_TEXT) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FILTERS_
LEVEL_2) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_KEYBOARD_KEY_ATTRIBUTE) $(ENABLE_KEYBOARD_CODE_ATTRIBUTE) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METE
R_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_RTC) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WIRELES
S_PLAYBACK_TARGET) $(ENABLE_XSLT);
Modified: trunk/Source/WebKit/WebProcess/Network/WebSocketProvider.cpp (220249 => 220250)
--- trunk/Source/WebKit/WebProcess/Network/WebSocketProvider.cpp 2017-08-04 02:37:53 UTC (rev 220249)
+++ trunk/Source/WebKit/WebProcess/Network/WebSocketProvider.cpp 2017-08-04 02:41:16 UTC (rev 220250)
@@ -31,8 +31,6 @@
#include "config.h"
#include "WebSocketProvider.h"
-#if ENABLE(WEB_SOCKETS)
-
#include "WebSocketStream.h"
using namespace WebCore;
@@ -45,5 +43,3 @@
}
} // namespace WebKit
-
-#endif // ENABLE(WEB_SOCKETS)
Modified: trunk/Source/WebKit/WebProcess/Network/WebSocketProvider.h (220249 => 220250)
--- trunk/Source/WebKit/WebProcess/Network/WebSocketProvider.h 2017-08-04 02:37:53 UTC (rev 220249)
+++ trunk/Source/WebKit/WebProcess/Network/WebSocketProvider.h 2017-08-04 02:41:16 UTC (rev 220250)
@@ -32,9 +32,7 @@
class WebSocketProvider final : public WebCore::SocketProvider {
public:
static Ref<WebSocketProvider> create() { return adoptRef(*new WebSocketProvider); }
-#if ENABLE(WEB_SOCKETS)
Ref<WebCore::SocketStreamHandle> createSocketStreamHandle(const WebCore::URL&, WebCore::SocketStreamHandleClient&, WebCore::SessionID, const String& credentialPartition) final;
-#endif
virtual ~WebSocketProvider() { }
};
Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (220249 => 220250)
--- trunk/Source/WebKitLegacy/mac/ChangeLog 2017-08-04 02:37:53 UTC (rev 220249)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog 2017-08-04 02:41:16 UTC (rev 220250)
@@ -1,3 +1,13 @@
+2017-08-03 Brian Burg <[email protected]>
+
+ Remove ENABLE(WEB_SOCKET) guards
+ https://bugs.webkit.org/show_bug.cgi?id=167044
+
+ Reviewed by Joseph Pecoraro.
+
+ * Configurations/FeatureDefines.xcconfig:
+ * WebView/WebPreferencesPrivate.h:
+
2017-08-03 Yoshiaki Jitsukawa <[email protected]>
[PAL] Move spi/cf directory into PAL
Modified: trunk/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig (220249 => 220250)
--- trunk/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig 2017-08-04 02:37:53 UTC (rev 220249)
+++ trunk/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig 2017-08-04 02:41:16 UTC (rev 220250)
@@ -213,7 +213,6 @@
ENABLE_WEBGPU[sdk=iphonesimulator*] = ;
ENABLE_WEB_ANIMATIONS = ENABLE_WEB_ANIMATIONS;
ENABLE_WEB_AUDIO = ENABLE_WEB_AUDIO;
-ENABLE_WEB_SOCKETS = ENABLE_WEB_SOCKETS;
ENABLE_XSLT = ENABLE_XSLT;
@@ -243,4 +242,4 @@
ENABLE_DATA_INTERACTION[sdk=iphoneos11*] = ENABLE_DATA_INTERACTION;
ENABLE_DATA_INTERACTION[sdk=iphonesimulator11*] = ENABLE_DATA_INTERACTION;
-FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS3_TEXT) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FILTERS
_LEVEL_2) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_KEYBOARD_KEY_ATTRIBUTE) $(ENABLE_KEYBOARD_CODE_ATTRIBUTE) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_MET
ER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_RTC) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_W
EBGPU) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT);
+FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS3_TEXT) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FILTERS_
LEVEL_2) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_KEYBOARD_KEY_ATTRIBUTE) $(ENABLE_KEYBOARD_CODE_ATTRIBUTE) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METE
R_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_RTC) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WIRELES
S_PLAYBACK_TARGET) $(ENABLE_XSLT);
Modified: trunk/Source/WebKitLegacy/mac/WebView/WebPreferencesPrivate.h (220249 => 220250)
--- trunk/Source/WebKitLegacy/mac/WebView/WebPreferencesPrivate.h 2017-08-04 02:37:53 UTC (rev 220249)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebPreferencesPrivate.h 2017-08-04 02:41:16 UTC (rev 220250)
@@ -433,7 +433,6 @@
- (void)setVideoPluginProxyEnabled:(BOOL)flag;
- (BOOL)isVideoPluginProxyEnabled;
-// WebSocket support depends on ENABLE(WEB_SOCKETS).
- (void)setHixie76WebSocketProtocolEnabled:(BOOL)flag;
- (BOOL)isHixie76WebSocketProtocolEnabled;
Modified: trunk/Source/cmake/OptionsMac.cmake (220249 => 220250)
--- trunk/Source/cmake/OptionsMac.cmake 2017-08-04 02:37:53 UTC (rev 220249)
+++ trunk/Source/cmake/OptionsMac.cmake 2017-08-04 02:41:16 UTC (rev 220250)
@@ -92,7 +92,6 @@
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBGL2 PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBGPU PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_AUDIO PRIVATE ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_SOCKETS PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBVTT_REGIONS PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_XSLT PRIVATE ON)
Modified: trunk/Source/cmake/OptionsWin.cmake (220249 => 220250)
--- trunk/Source/cmake/OptionsWin.cmake 2017-08-04 02:37:53 UTC (rev 220249)
+++ trunk/Source/cmake/OptionsWin.cmake 2017-08-04 02:41:16 UTC (rev 220250)
@@ -67,7 +67,6 @@
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBASSEMBLY PRIVATE OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_ANIMATIONS PUBLIC ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_AUDIO PUBLIC OFF)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_SOCKETS PUBLIC ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBVTT_REGIONS PUBLIC ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_XSLT PUBLIC ON)
Modified: trunk/Source/cmake/WebKitFeatures.cmake (220249 => 220250)
--- trunk/Source/cmake/WebKitFeatures.cmake 2017-08-04 02:37:53 UTC (rev 220249)
+++ trunk/Source/cmake/WebKitFeatures.cmake 2017-08-04 02:41:16 UTC (rev 220250)
@@ -190,7 +190,6 @@
WEBKIT_OPTION_DEFINE(ENABLE_WEB_ANIMATIONS "Toggle Web Animations support" PRIVATE OFF)
WEBKIT_OPTION_DEFINE(ENABLE_WEB_AUDIO "Toggle Web Audio support" PRIVATE OFF)
WEBKIT_OPTION_DEFINE(ENABLE_WEB_RTC "Toggle WebRTC API support" PRIVATE OFF)
- WEBKIT_OPTION_DEFINE(ENABLE_WEB_SOCKETS "Toggle Web Sockets support" PRIVATE ON)
WEBKIT_OPTION_DEFINE(ENABLE_XSLT "Toggle XSLT support" PRIVATE ON)
WEBKIT_OPTION_DEFINE(USE_SYSTEM_MALLOC "Toggle system allocator instead of WebKit's custom allocator" PRIVATE OFF)
Modified: trunk/Source/cmake/tools/vsprops/FeatureDefines.props (220249 => 220250)
--- trunk/Source/cmake/tools/vsprops/FeatureDefines.props 2017-08-04 02:37:53 UTC (rev 220249)
+++ trunk/Source/cmake/tools/vsprops/FeatureDefines.props 2017-08-04 02:41:16 UTC (rev 220250)
@@ -72,7 +72,6 @@
<ENABLE_VIEW_MODE_CSS_MEDIA>ENABLE_VIEW_MODE_CSS_MEDIA</ENABLE_VIEW_MODE_CSS_MEDIA>
<ENABLE_WEB_ANIMATIONS />
<ENABLE_WEB_AUDIO />
- <ENABLE_WEB_SOCKETS>ENABLE_WEB_SOCKETS</ENABLE_WEB_SOCKETS>
<ENABLE_WEBGL />
<ENABLE_WEBGPU />
<ENABLE_WEBVTT_REGIONS>ENABLE_WEBVTT_REGIONS</ENABLE_WEBVTT_REGIONS>
@@ -84,7 +83,7 @@
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
- <PreprocessorDefinitions>$(ENABLE_3D_TRANSFORMS);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_ACCELERATED_OVERFLOW_SCROLLING);$(ENABLE_ATTACHMENT_ELEMENT);$(ENABLE_CANVAS_PATH);$(ENABLE_CANVAS_PROXY);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CSS3_CONDITIONAL_RULES);$(ENABLE_CSS_IMAGE_SET);$(ENABLE_CSS3_TEXT);$(ENABLE_CSS_BOX_DECORATION_BREAK);$(ENABLE_CSS_SHADERS);$(ENABLE_CSS_COMPOSITING);$(ENABLE_CSS_REGIONS);$(ENABLE_CSS_SELECTORS_LEVEL4);$(ENABLE_CSS_SHAPE_INSIDE);$(ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED);$(ENABLE_CURSOR_VISIBILITY);$(ENABLE_CUSTOM_SCHEME_HANDLER);$(ENABLE_DATAGRID);$(ENABLE_DATALIST_ELEMENT);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_ENCRYPTED_MEDIA);$(ENABLE_FETCH_API);$(ENABLE_FILE_SYSTEM);$(ENABLE_FULLSCREEN_API);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(ENABLE_HIGH_DPI_CANVAS);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_TYPE_COLOR);$(ENABLE_INPUT_SPEECH)
;$(ENABLE_INPUT_TYPE_DATE);$(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE);$(ENABLE_INPUT_TYPE_DATETIMELOCAL);$(ENABLE_INPUT_TYPE_MONTH);$(ENABLE_INPUT_TYPE_TIME);$(ENABLE_INPUT_TYPE_WEEK);$(ENABLE_INTL);$(ENABLE_LEGACY_CSS_VENDOR_PREFIXES);$(ENABLE_LEGACY_ENCRYPTED_MEDIA);$(ENABLE_LINK_PREFETCH);$(ENABLE_LINK_PRERENDER);$(ENABLE_MATHML);$(ENABLE_METER_ELEMENT);$(ENABLE_MICRODATA);$(ENABLE_MOUSE_CURSOR_SCALE);$(ENABLE_NOTIFICATIONS);$(ENABLE_PROXIMITY_EVENTS);$(ENABLE_QUOTA);$(ENABLE_NAVIGATOR_CONTENT_UTILS);$(ENABLE_STREAMS_API);$(ENABLE_SCRIPTED_SPEECH);$(ENABLE_SHARED_WORKERS);$(ENABLE_MEDIA_CONTROLS_SCRIPT);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_SQL_DATABASE);$(ENABLE_STYLE_SCOPED);$(ENABLE_SUBPIXEL_LAYOUT);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_VIDEO);$(ENABLE_VIDEO_TRACK);$(ENABLE_VIEW_MODE_CSS_MEDIA);$(ENABLE_WEB_ANIMATIONS);$(ENABLE_WEB_AUDIO);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEBGL);$(ENABLE_WEBGPU);$(ENABLE_WEBVTT_REGIONS);$(ENABLE_XHR_TIMEO
UT);$(ENABLE_XSLT);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>$(ENABLE_3D_TRANSFORMS);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_ACCELERATED_OVERFLOW_SCROLLING);$(ENABLE_ATTACHMENT_ELEMENT);$(ENABLE_CANVAS_PATH);$(ENABLE_CANVAS_PROXY);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CSS3_CONDITIONAL_RULES);$(ENABLE_CSS_IMAGE_SET);$(ENABLE_CSS3_TEXT);$(ENABLE_CSS_BOX_DECORATION_BREAK);$(ENABLE_CSS_SHADERS);$(ENABLE_CSS_COMPOSITING);$(ENABLE_CSS_REGIONS);$(ENABLE_CSS_SELECTORS_LEVEL4);$(ENABLE_CSS_SHAPE_INSIDE);$(ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED);$(ENABLE_CURSOR_VISIBILITY);$(ENABLE_CUSTOM_SCHEME_HANDLER);$(ENABLE_DATAGRID);$(ENABLE_DATALIST_ELEMENT);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_ENCRYPTED_MEDIA);$(ENABLE_FETCH_API);$(ENABLE_FILE_SYSTEM);$(ENABLE_FULLSCREEN_API);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(ENABLE_HIGH_DPI_CANVAS);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_TYPE_COLOR);$(ENABLE_INPUT_SPEECH);
$(ENABLE_INPUT_TYPE_DATE);$(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE);$(ENABLE_INPUT_TYPE_DATETIMELOCAL);$(ENABLE_INPUT_TYPE_MONTH);$(ENABLE_INPUT_TYPE_TIME);$(ENABLE_INPUT_TYPE_WEEK);$(ENABLE_INTL);$(ENABLE_LEGACY_CSS_VENDOR_PREFIXES);$(ENABLE_LEGACY_ENCRYPTED_MEDIA);$(ENABLE_LINK_PREFETCH);$(ENABLE_LINK_PRERENDER);$(ENABLE_MATHML);$(ENABLE_METER_ELEMENT);$(ENABLE_MICRODATA);$(ENABLE_MOUSE_CURSOR_SCALE);$(ENABLE_NOTIFICATIONS);$(ENABLE_PROXIMITY_EVENTS);$(ENABLE_QUOTA);$(ENABLE_NAVIGATOR_CONTENT_UTILS);$(ENABLE_STREAMS_API);$(ENABLE_SCRIPTED_SPEECH);$(ENABLE_SHARED_WORKERS);$(ENABLE_MEDIA_CONTROLS_SCRIPT);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_SQL_DATABASE);$(ENABLE_STYLE_SCOPED);$(ENABLE_SUBPIXEL_LAYOUT);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_VIDEO);$(ENABLE_VIDEO_TRACK);$(ENABLE_VIEW_MODE_CSS_MEDIA);$(ENABLE_WEB_ANIMATIONS);$(ENABLE_WEB_AUDIO);$(ENABLE_WEBGL);$(ENABLE_WEBGPU);$(ENABLE_WEBVTT_REGIONS);$(ENABLE_XHR_TIMEOUT);$(ENABLE_XSLT);%(Pr
eprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup>
@@ -368,10 +367,6 @@
<Value>$(ENABLE_WEB_AUDIO)</Value>
<EnvironmentVariable>true</EnvironmentVariable>
</BuildMacro>
- <BuildMacro Include="ENABLE_WEB_SOCKETS">
- <Value>$(ENABLE_WEB_SOCKETS)</Value>
- <EnvironmentVariable>true</EnvironmentVariable>
- </BuildMacro>
<BuildMacro Include="ENABLE_WEBGL">
<Value>$(ENABLE_WEBGL)</Value>
<EnvironmentVariable>true</EnvironmentVariable>
Modified: trunk/Source/cmake/tools/vsprops/FeatureDefinesCairo.props (220249 => 220250)
--- trunk/Source/cmake/tools/vsprops/FeatureDefinesCairo.props 2017-08-04 02:37:53 UTC (rev 220249)
+++ trunk/Source/cmake/tools/vsprops/FeatureDefinesCairo.props 2017-08-04 02:41:16 UTC (rev 220250)
@@ -71,7 +71,6 @@
<ENABLE_VIEW_MODE_CSS_MEDIA>ENABLE_VIEW_MODE_CSS_MEDIA</ENABLE_VIEW_MODE_CSS_MEDIA>
<ENABLE_WEB_ANIMATIONS />
<ENABLE_WEB_AUDIO />
- <ENABLE_WEB_SOCKETS>ENABLE_WEB_SOCKETS</ENABLE_WEB_SOCKETS>
<ENABLE_WEBGL>ENABLE_WEBGL</ENABLE_WEBGL>
<ENABLE_WEBGPU />
<ENABLE_WEBVTT_REGIONS>ENABLE_WEBVTT_REGIONS</ENABLE_WEBVTT_REGIONS>
@@ -83,7 +82,7 @@
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
- <PreprocessorDefinitions>$(ENABLE_3D_TRANSFORMS);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_ACCELERATED_OVERFLOW_SCROLLING);$(ENABLE_ATTACHMENT_ELEMENT);$(ENABLE_CANVAS_PATH);$(ENABLE_CANVAS_PROXY);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CSS3_CONDITIONAL_RULES);$(ENABLE_CSS_IMAGE_SET);$(ENABLE_CSS3_TEXT);$(ENABLE_CSS_BOX_DECORATION_BREAK);$(ENABLE_CSS_SHADERS);$(ENABLE_CSS_COMPOSITING);$(ENABLE_CSS_REGIONS);$(ENABLE_CSS_SELECTORS_LEVEL4);$(ENABLE_CSS_SHAPE_INSIDE);$(ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED);$(ENABLE_CURSOR_VISIBILITY);$(ENABLE_CUSTOM_SCHEME_HANDLER);$(ENABLE_DATAGRID);$(ENABLE_DATALIST_ELEMENT);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_ENCRYPTED_MEDIA);$(ENABLE_FETCH_API);$(ENABLE_FILE_SYSTEM);$(ENABLE_FULLSCREEN_API);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(ENABLE_HIGH_DPI_CANVAS);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_TYPE_COLOR);$(ENABLE_INPUT_SPEECH)
;$(ENABLE_INPUT_TYPE_DATE);$(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE);$(ENABLE_INPUT_TYPE_DATETIMELOCAL);$(ENABLE_INPUT_TYPE_MONTH);$(ENABLE_INPUT_TYPE_TIME);$(ENABLE_INPUT_TYPE_WEEK);$(ENABLE_INTL);$(ENABLE_LEGACY_CSS_VENDOR_PREFIXES);$(ENABLE_LEGACY_ENCRYPTED_MEDIA);$(ENABLE_LINK_PREFETCH);$(ENABLE_LINK_PRERENDER);$(ENABLE_MATHML);$(ENABLE_METER_ELEMENT);$(ENABLE_MICRODATA);$(ENABLE_MOUSE_CURSOR_SCALE);$(ENABLE_NOTIFICATIONS);$(ENABLE_PROXIMITY_EVENTS);$(ENABLE_QUOTA);$(ENABLE_NAVIGATOR_CONTENT_UTILS);$(ENABLE_SCRIPTED_SPEECH);$(ENABLE_SHARED_WORKERS);$(ENABLE_MEDIA_CONTROLS_SCRIPT);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_SQL_DATABASE);$(ENABLE_STYLE_SCOPED);$(ENABLE_SUBPIXEL_LAYOUT);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_VIDEO);$(ENABLE_VIDEO_TRACK);$(ENABLE_VIEW_MODE_CSS_MEDIA);$(ENABLE_WEB_ANIMATIONS);$(ENABLE_WEB_AUDIO);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEBGL);$(ENABLE_WEBVTT_REGIONS);$(ENABLE_XHR_TIMEOUT);$(ENABLE_XSLT);%(PreprocessorDefini
tions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>$(ENABLE_3D_TRANSFORMS);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_ACCELERATED_OVERFLOW_SCROLLING);$(ENABLE_ATTACHMENT_ELEMENT);$(ENABLE_CANVAS_PATH);$(ENABLE_CANVAS_PROXY);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CSS3_CONDITIONAL_RULES);$(ENABLE_CSS_IMAGE_SET);$(ENABLE_CSS3_TEXT);$(ENABLE_CSS_BOX_DECORATION_BREAK);$(ENABLE_CSS_SHADERS);$(ENABLE_CSS_COMPOSITING);$(ENABLE_CSS_REGIONS);$(ENABLE_CSS_SELECTORS_LEVEL4);$(ENABLE_CSS_SHAPE_INSIDE);$(ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED);$(ENABLE_CURSOR_VISIBILITY);$(ENABLE_CUSTOM_SCHEME_HANDLER);$(ENABLE_DATAGRID);$(ENABLE_DATALIST_ELEMENT);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_ENCRYPTED_MEDIA);$(ENABLE_FETCH_API);$(ENABLE_FILE_SYSTEM);$(ENABLE_FULLSCREEN_API);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(ENABLE_HIGH_DPI_CANVAS);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_TYPE_COLOR);$(ENABLE_INPUT_SPEECH);
$(ENABLE_INPUT_TYPE_DATE);$(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE);$(ENABLE_INPUT_TYPE_DATETIMELOCAL);$(ENABLE_INPUT_TYPE_MONTH);$(ENABLE_INPUT_TYPE_TIME);$(ENABLE_INPUT_TYPE_WEEK);$(ENABLE_INTL);$(ENABLE_LEGACY_CSS_VENDOR_PREFIXES);$(ENABLE_LEGACY_ENCRYPTED_MEDIA);$(ENABLE_LINK_PREFETCH);$(ENABLE_LINK_PRERENDER);$(ENABLE_MATHML);$(ENABLE_METER_ELEMENT);$(ENABLE_MICRODATA);$(ENABLE_MOUSE_CURSOR_SCALE);$(ENABLE_NOTIFICATIONS);$(ENABLE_PROXIMITY_EVENTS);$(ENABLE_QUOTA);$(ENABLE_NAVIGATOR_CONTENT_UTILS);$(ENABLE_SCRIPTED_SPEECH);$(ENABLE_SHARED_WORKERS);$(ENABLE_MEDIA_CONTROLS_SCRIPT);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_SQL_DATABASE);$(ENABLE_STYLE_SCOPED);$(ENABLE_SUBPIXEL_LAYOUT);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_VIDEO);$(ENABLE_VIDEO_TRACK);$(ENABLE_VIEW_MODE_CSS_MEDIA);$(ENABLE_WEB_ANIMATIONS);$(ENABLE_WEB_AUDIO);$(ENABLE_WEBGL);$(ENABLE_WEBVTT_REGIONS);$(ENABLE_XHR_TIMEOUT);$(ENABLE_XSLT);%(PreprocessorDefinitions)</Preprocessor
Definitions>
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup>
@@ -363,10 +362,6 @@
<Value>$(ENABLE_WEB_AUDIO)</Value>
<EnvironmentVariable>true</EnvironmentVariable>
</BuildMacro>
- <BuildMacro Include="ENABLE_WEB_SOCKETS">
- <Value>$(ENABLE_WEB_SOCKETS)</Value>
- <EnvironmentVariable>true</EnvironmentVariable>
- </BuildMacro>
<BuildMacro Include="ENABLE_WEBGL">
<Value>$(ENABLE_WEBGL)</Value>
<EnvironmentVariable>true</EnvironmentVariable>
Modified: trunk/Tools/ChangeLog (220249 => 220250)
--- trunk/Tools/ChangeLog 2017-08-04 02:37:53 UTC (rev 220249)
+++ trunk/Tools/ChangeLog 2017-08-04 02:41:16 UTC (rev 220250)
@@ -1,3 +1,13 @@
+2017-08-03 Brian Burg <[email protected]>
+
+ Remove ENABLE(WEB_SOCKET) guards
+ https://bugs.webkit.org/show_bug.cgi?id=167044
+
+ Reviewed by Joseph Pecoraro.
+
+ * Scripts/webkitperl/FeatureList.pm:
+ * TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
+
2017-08-03 Carlos Alberto Lopez Perez <[email protected]>
REGRESSION(r219850): run-benchmark script broken on Linux
Modified: trunk/Tools/Scripts/webkitperl/FeatureList.pm (220249 => 220250)
--- trunk/Tools/Scripts/webkitperl/FeatureList.pm 2017-08-04 02:37:53 UTC (rev 220249)
+++ trunk/Tools/Scripts/webkitperl/FeatureList.pm 2017-08-04 02:41:16 UTC (rev 220250)
@@ -134,9 +134,6 @@
$webAssemblySupport,
$webAudioSupport,
$webRTCSupport,
- $webReplaySupport,
- $webSocketsSupport,
- $webTimingSupport,
$writableStreamAPISupport,
$webglSupport,
$webgl2Support,
@@ -386,9 +383,6 @@
{ option => "web-rtc", desc => "Toggle WebRTC support",
define => "ENABLE_WEB_RTC", default => (isAppleCocoaWebKit() || isIOSWebKit() || isGtk()), value => \$webRTCSupport },
- { option => "web-sockets", desc => "Toggle Web Sockets support",
- define => "ENABLE_WEB_SOCKETS", default => 1, value => \$webSocketsSupport },
-
{ option => "webassembly", desc => "Toggle WebAssembly support",
define => "ENABLE_WEBASSEMBLY", default => ((isARM64() || isX86_64()) && (isGtk() || isJSCOnly() || isWPE())) , value => \$webAssemblySupport },
Modified: trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig (220249 => 220250)
--- trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig 2017-08-04 02:37:53 UTC (rev 220249)
+++ trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig 2017-08-04 02:41:16 UTC (rev 220250)
@@ -213,7 +213,6 @@
ENABLE_WEBGPU[sdk=iphonesimulator*] = ;
ENABLE_WEB_ANIMATIONS = ENABLE_WEB_ANIMATIONS;
ENABLE_WEB_AUDIO = ENABLE_WEB_AUDIO;
-ENABLE_WEB_SOCKETS = ENABLE_WEB_SOCKETS;
ENABLE_XSLT = ENABLE_XSLT;
@@ -243,4 +242,4 @@
ENABLE_DATA_INTERACTION[sdk=iphoneos11*] = ENABLE_DATA_INTERACTION;
ENABLE_DATA_INTERACTION[sdk=iphonesimulator11*] = ENABLE_DATA_INTERACTION;
-FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS3_TEXT) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FILTERS
_LEVEL_2) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_KEYBOARD_KEY_ATTRIBUTE) $(ENABLE_KEYBOARD_CODE_ATTRIBUTE) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_MET
ER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_RTC) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_W
EBGPU) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_XSLT);
+FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_APPLE_PAY) $(ENABLE_APPLE_PAY_SESSION_V3) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_AVF_CAPTIONS) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_CSS3_TEXT) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATA_INTERACTION) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DATACUE_VALUE) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DRAG_SUPPORT) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_FAST_JIT_PERMISSIONS) $(ENABLE_FILTERS_
LEVEL_2) $(ENABLE_FTL_JIT) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_ICONDATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_INTERSECTION_OBSERVER) $(ENABLE_INTL) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_JIT) $(ENABLE_KEYBOARD_KEY_ATTRIBUTE) $(ENABLE_KEYBOARD_CODE_ATTRIBUTE) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_ENCRYPTED_MEDIA) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MAC_GESTURE_EVENTS) $(ENABLE_MATHML) $(ENABLE_MEDIA_CAPTURE) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METE
R_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_STANDALONE) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RESOURCE_USAGE) $(ENABLE_RUBBER_BANDING) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_SERVICE_WORKER) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VARIATION_FONTS) $(ENABLE_VIDEO_PRESENTATION_MODE) $(ENABLE_MAC_VIDEO_TOOLBOX) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIDEO) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_RTC) $(ENABLE_WEBASSEMBLY) $(ENABLE_WEBGL) $(ENABLE_WEBGL2) $(ENABLE_WEBGPU) $(ENABLE_WIRELES
S_PLAYBACK_TARGET) $(ENABLE_XSLT);
