Commit 1b18b622 authored by abarth@webkit.org's avatar abarth@webkit.org

Move websockets to Modules/websockets

https://bugs.webkit.org/show_bug.cgi?id=79598

Reviewed by Eric Seidel.

Nowadays, the only ENABLE(WEB_SOCKETS) ifdef in WebCore proper is in
WebCore::Settings, and that will be removed (soon?) once Apple drops
support for the old WebSockets protocol.

* CMakeLists.txt:
* DerivedSources.make:
* DerivedSources.pri:
* GNUmakefile.am:
* GNUmakefile.list.am:
* Modules/websockets: Copied from Source/WebCore/websockets.
* Target.pri:
* WebCore.gyp/WebCore.gyp:
* WebCore.gypi:
* WebCore.pri:
* WebCore.vcproj/WebCore.vcproj:
* WebCore.vcproj/WebCoreCommon.vsprops:
* WebCore.vcproj/copyForwardingHeaders.cmd:
* WebCore.xcodeproj/project.pbxproj:
* websockets: Removed.
* websockets/CloseEvent.h: Removed.
* websockets/CloseEvent.idl: Removed.
* websockets/DOMWindowWebSocket.idl: Removed.
* websockets/ThreadableWebSocketChannel.cpp: Removed.
* websockets/ThreadableWebSocketChannel.h: Removed.
* websockets/ThreadableWebSocketChannelClientWrapper.cpp: Removed.
* websockets/ThreadableWebSocketChannelClientWrapper.h: Removed.
* websockets/WebSocket.cpp: Removed.
* websockets/WebSocket.h: Removed.
* websockets/WebSocket.idl: Removed.
* websockets/WebSocketChannel.cpp: Removed.
* websockets/WebSocketChannel.h: Removed.
* websockets/WebSocketChannelClient.h: Removed.
* websockets/WebSocketDeflater.cpp: Removed.
* websockets/WebSocketDeflater.h: Removed.
* websockets/WebSocketExtensionDispatcher.cpp: Removed.
* websockets/WebSocketExtensionDispatcher.h: Removed.
* websockets/WebSocketExtensionProcessor.h: Removed.
* websockets/WebSocketFrame.h: Removed.
* websockets/WebSocketHandshake.cpp: Removed.
* websockets/WebSocketHandshake.h: Removed.
* websockets/WebSocketHandshakeRequest.cpp: Removed.
* websockets/WebSocketHandshakeRequest.h: Removed.
* websockets/WebSocketHandshakeResponse.cpp: Removed.
* websockets/WebSocketHandshakeResponse.h: Removed.
* websockets/WorkerThreadableWebSocketChannel.cpp: Removed.
* websockets/WorkerThreadableWebSocketChannel.h: Removed.


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@108930 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent ca8591a8
SET(WebCore_INCLUDE_DIRECTORIES
"${WEBCORE_DIR}"
"${WEBCORE_DIR}/Modules/geolocation"
"${WEBCORE_DIR}/Modules/websockets"
"${WEBCORE_DIR}/accessibility"
"${WEBCORE_DIR}/bindings"
"${WEBCORE_DIR}/bindings/generic"
......@@ -90,6 +91,7 @@ SET(WebCore_INCLUDE_DIRECTORIES
SET(WebCore_IDL_INCLUDES
Modules/geolocation
Modules/websockets
bindings/generic
css
dom
......@@ -115,6 +117,9 @@ SET(WebCore_IDL_FILES
Modules/geolocation/PositionError.idl
Modules/geolocation/PositionErrorCallback.idl
Modules/websockets/CloseEvent.idl
Modules/websockets/DOMWindowWebSocket.idl
css/Counter.idl
css/CSSCharsetRule.idl
css/CSSFontFaceRule.idl
......@@ -388,9 +393,6 @@ SET(WebCore_IDL_FILES
webaudio/LowPass2FilterNode.idl
webaudio/RealtimeAnalyserNode.idl
websockets/CloseEvent.idl
websockets/DOMWindowWebSocket.idl
xml/DOMWindowXML.idl
xml/DOMParser.idl
xml/XMLHttpRequest.idl
......@@ -2059,24 +2061,24 @@ ENDIF()
IF (ENABLE_WEB_SOCKETS)
LIST(APPEND WebCore_SOURCES
websockets/ThreadableWebSocketChannel.cpp
websockets/ThreadableWebSocketChannelClientWrapper.cpp
websockets/WebSocket.cpp
websockets/WebSocketChannel.cpp
websockets/WebSocketExtensionDispatcher.cpp
websockets/WebSocketHandshake.cpp
websockets/WebSocketHandshakeRequest.cpp
websockets/WebSocketHandshakeResponse.cpp
Modules/websockets/ThreadableWebSocketChannel.cpp
Modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp
Modules/websockets/WebSocket.cpp
Modules/websockets/WebSocketChannel.cpp
Modules/websockets/WebSocketExtensionDispatcher.cpp
Modules/websockets/WebSocketHandshake.cpp
Modules/websockets/WebSocketHandshakeRequest.cpp
Modules/websockets/WebSocketHandshakeResponse.cpp
)
LIST(APPEND WebCore_IDL_FILES
websockets/WebSocket.idl
Modules/websockets/WebSocket.idl
)
ENDIF ()
IF (ENABLE_WEB_SOCKETS AND ENABLE_WORKERS)
LIST(APPEND WebCore_SOURCES
websockets/WorkerThreadableWebSocketChannel.cpp
Modules/websockets/WorkerThreadableWebSocketChannel.cpp
)
ENDIF ()
......
2012-02-25 Adam Barth <abarth@webkit.org>
Move websockets to Modules/websockets
https://bugs.webkit.org/show_bug.cgi?id=79598
Reviewed by Eric Seidel.
Nowadays, the only ENABLE(WEB_SOCKETS) ifdef in WebCore proper is in
WebCore::Settings, and that will be removed (soon?) once Apple drops
support for the old WebSockets protocol.
* CMakeLists.txt:
* DerivedSources.make:
* DerivedSources.pri:
* GNUmakefile.am:
* GNUmakefile.list.am:
* Modules/websockets: Copied from Source/WebCore/websockets.
* Target.pri:
* WebCore.gyp/WebCore.gyp:
* WebCore.gypi:
* WebCore.pri:
* WebCore.vcproj/WebCore.vcproj:
* WebCore.vcproj/WebCoreCommon.vsprops:
* WebCore.vcproj/copyForwardingHeaders.cmd:
* WebCore.xcodeproj/project.pbxproj:
* websockets: Removed.
* websockets/CloseEvent.h: Removed.
* websockets/CloseEvent.idl: Removed.
* websockets/DOMWindowWebSocket.idl: Removed.
* websockets/ThreadableWebSocketChannel.cpp: Removed.
* websockets/ThreadableWebSocketChannel.h: Removed.
* websockets/ThreadableWebSocketChannelClientWrapper.cpp: Removed.
* websockets/ThreadableWebSocketChannelClientWrapper.h: Removed.
* websockets/WebSocket.cpp: Removed.
* websockets/WebSocket.h: Removed.
* websockets/WebSocket.idl: Removed.
* websockets/WebSocketChannel.cpp: Removed.
* websockets/WebSocketChannel.h: Removed.
* websockets/WebSocketChannelClient.h: Removed.
* websockets/WebSocketDeflater.cpp: Removed.
* websockets/WebSocketDeflater.h: Removed.
* websockets/WebSocketExtensionDispatcher.cpp: Removed.
* websockets/WebSocketExtensionDispatcher.h: Removed.
* websockets/WebSocketExtensionProcessor.h: Removed.
* websockets/WebSocketFrame.h: Removed.
* websockets/WebSocketHandshake.cpp: Removed.
* websockets/WebSocketHandshake.h: Removed.
* websockets/WebSocketHandshakeRequest.cpp: Removed.
* websockets/WebSocketHandshakeRequest.h: Removed.
* websockets/WebSocketHandshakeResponse.cpp: Removed.
* websockets/WebSocketHandshakeResponse.h: Removed.
* websockets/WorkerThreadableWebSocketChannel.cpp: Removed.
* websockets/WorkerThreadableWebSocketChannel.h: Removed.
2012-02-25 Benjamin Poulain <benjamin@webkit.org>
Get rid of KURL::deprecatedString()
......@@ -29,6 +29,7 @@
VPATH = \
$(WebCore) \
$(WebCore)/Modules/geolocation \
$(WebCore)/Modules/websockets \
$(WebCore)/bindings/generic \
$(WebCore)/bindings/js \
$(WebCore)/bindings/objc \
......@@ -60,6 +61,9 @@ BINDING_IDLS = \
$(WebCore)/Modules/geolocation/PositionCallback.idl \
$(WebCore)/Modules/geolocation/PositionError.idl \
$(WebCore)/Modules/geolocation/PositionErrorCallback.idl \
$(WebCore)/Modules/websockets/CloseEvent.idl \
$(WebCore)/Modules/websockets/DOMWindowWebSocket.idl \
$(WebCore)/Modules/websockets/WebSocket.idl \
$(WebCore)/css/CSSCharsetRule.idl \
$(WebCore)/css/CSSFontFaceRule.idl \
$(WebCore)/css/CSSImportRule.idl \
......@@ -561,9 +565,6 @@ BINDING_IDLS = \
$(WebCore)/webaudio/OfflineAudioCompletionEvent.idl \
$(WebCore)/webaudio/RealtimeAnalyserNode.idl \
$(WebCore)/webaudio/WaveShaperNode.idl \
$(WebCore)/websockets/CloseEvent.idl \
$(WebCore)/websockets/DOMWindowWebSocket.idl \
$(WebCore)/websockets/WebSocket.idl \
$(WebCore)/workers/AbstractWorker.idl \
$(WebCore)/workers/DOMWindowWorker.idl \
$(WebCore)/workers/DedicatedWorkerContext.idl \
......
......@@ -92,6 +92,9 @@ IDL_BINDINGS += \
$$PWD/Modules/geolocation/PositionCallback.idl \
$$PWD/Modules/geolocation/PositionError.idl \
$$PWD/Modules/geolocation/PositionErrorCallback.idl \
$$PWD/Modules/websockets/CloseEvent.idl \
$$PWD/Modules/websockets/DOMWindowWebSocket.idl \
$$PWD/Modules/websockets/WebSocket.idl \
$$PWD/css/Counter.idl \
$$PWD/css/CSSCharsetRule.idl \
$$PWD/css/CSSFontFaceRule.idl \
......@@ -426,9 +429,6 @@ IDL_BINDINGS += \
$$PWD/webaudio/JavaScriptAudioNode.idl \
$$PWD/webaudio/LowPass2FilterNode.idl \
$$PWD/webaudio/RealtimeAnalyserNode.idl \
$$PWD/websockets/CloseEvent.idl \
$$PWD/websockets/DOMWindowWebSocket.idl \
$$PWD/websockets/WebSocket.idl \
$$PWD/workers/AbstractWorker.idl \
$$PWD/workers/DOMWindowWorker.idl \
$$PWD/workers/DedicatedWorkerContext.idl \
......@@ -692,6 +692,7 @@ generateBindings.commands = perl -I$$PWD/bindings/scripts $$generateBindings.scr
--defines \"$${FEATURE_DEFINES_JAVASCRIPT}\" \
--generator $$generator \
--include $$PWD/Modules/geolocation \
--include $$PWD/Modules/websockets \
--include $$PWD/dom \
--include $$PWD/fileapi \
--include $$PWD/html \
......
......@@ -13,6 +13,7 @@ webcore_cppflags += \
-I$(srcdir)/Source/WebCore \
-I$(srcdir)/Source/WebCore/Modules/geolocation \
-I$(srcdir)/Source/WebCore/Modules/mediastream \
-I$(srcdir)/Source/WebCore/Modules/websockets \
-I$(srcdir)/Source/WebCore/accessibility \
-I$(srcdir)/Source/WebCore/bindings \
-I$(srcdir)/Source/WebCore/bindings/generic \
......@@ -761,6 +762,7 @@ DerivedSources/ANGLE/glslang_tab.h: DerivedSources/ANGLE/glslang_tab.cpp
IDL_PATH := \
$(WebCore)/Modules/geolocation \
$(WebCore)/Modules/mediastream \
$(WebCore)/Modules/websockets \
$(WebCore)/bindings/js \
$(WebCore)/css \
$(WebCore)/dom \
......@@ -900,6 +902,7 @@ libWebCoreGtk_la_CPPFLAGS = \
EXTRA_DIST += \
$(shell ls $(srcdir)/Source/WebCore/Modules/mediastream/*.idl) \
$(shell ls $(srcdir)/Source/WebCore/Modules/websockets/*.idl) \
$(shell ls $(srcdir)/Source/WebCore/css/*.idl) \
$(shell ls $(srcdir)/Source/WebCore/dom/*.idl) \
$(shell ls $(srcdir)/Source/WebCore/fileapi/*.idl) \
......@@ -916,7 +919,6 @@ EXTRA_DIST += \
$(shell ls $(srcdir)/Source/WebCore/svg/*.idl) \
$(shell ls $(srcdir)/Source/WebCore/testing/*.idl) \
$(shell ls $(srcdir)/Source/WebCore/webaudio/*.idl) \
$(shell ls $(srcdir)/Source/WebCore/websockets/*.idl) \
$(shell ls $(srcdir)/Source/WebCore/workers/*.idl) \
$(shell ls $(srcdir)/Source/WebCore/xml/*.idl) \
Source/ThirdParty/ANGLE/src/compiler/glslang.l \
......
......@@ -997,6 +997,30 @@ webcore_sources += \
Source/WebCore/Modules/mediastream/UserMediaController.cpp \
Source/WebCore/Modules/mediastream/UserMediaRequest.cpp \
Source/WebCore/Modules/mediastream/UserMediaRequest.h \
Source/WebCore/Modules/websockets/CloseEvent.h \
Source/WebCore/Modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp \
Source/WebCore/Modules/websockets/ThreadableWebSocketChannelClientWrapper.h \
Source/WebCore/Modules/websockets/ThreadableWebSocketChannel.cpp \
Source/WebCore/Modules/websockets/ThreadableWebSocketChannel.h \
Source/WebCore/Modules/websockets/WebSocketChannelClient.h \
Source/WebCore/Modules/websockets/WebSocketChannel.cpp \
Source/WebCore/Modules/websockets/WebSocketChannel.h \
Source/WebCore/Modules/websockets/WebSocket.cpp \
Source/WebCore/Modules/websockets/WebSocket.h \
Source/WebCore/Modules/websockets/WebSocketDeflater.cpp \
Source/WebCore/Modules/websockets/WebSocketDeflater.h \
Source/WebCore/Modules/websockets/WebSocketExtensionDispatcher.cpp \
Source/WebCore/Modules/websockets/WebSocketExtensionDispatcher.h \
Source/WebCore/Modules/websockets/WebSocketExtensionProcessor.h \
Source/WebCore/Modules/websockets/WebSocketFrame.h \
Source/WebCore/Modules/websockets/WebSocketHandshake.cpp \
Source/WebCore/Modules/websockets/WebSocketHandshake.h \
Source/WebCore/Modules/websockets/WebSocketHandshakeRequest.cpp \
Source/WebCore/Modules/websockets/WebSocketHandshakeRequest.h \
Source/WebCore/Modules/websockets/WebSocketHandshakeResponse.cpp \
Source/WebCore/Modules/websockets/WebSocketHandshakeResponse.h \
Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.cpp \
Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.h \
Source/WebCore/accessibility/AccessibilityARIAGridCell.cpp \
Source/WebCore/accessibility/AccessibilityARIAGridCell.h \
Source/WebCore/accessibility/AccessibilityARIAGrid.cpp \
......@@ -4341,30 +4365,6 @@ webcore_sources += \
Source/WebCore/svg/SVGZoomEvent.cpp \
Source/WebCore/svg/SVGZoomEvent.h \
Source/WebCore/WebCorePrefix.h \
Source/WebCore/websockets/CloseEvent.h \
Source/WebCore/websockets/ThreadableWebSocketChannelClientWrapper.cpp \
Source/WebCore/websockets/ThreadableWebSocketChannelClientWrapper.h \
Source/WebCore/websockets/ThreadableWebSocketChannel.cpp \
Source/WebCore/websockets/ThreadableWebSocketChannel.h \
Source/WebCore/websockets/WebSocketChannelClient.h \
Source/WebCore/websockets/WebSocketChannel.cpp \
Source/WebCore/websockets/WebSocketChannel.h \
Source/WebCore/websockets/WebSocket.cpp \
Source/WebCore/websockets/WebSocket.h \
Source/WebCore/websockets/WebSocketDeflater.cpp \
Source/WebCore/websockets/WebSocketDeflater.h \
Source/WebCore/websockets/WebSocketExtensionDispatcher.cpp \
Source/WebCore/websockets/WebSocketExtensionDispatcher.h \
Source/WebCore/websockets/WebSocketExtensionProcessor.h \
Source/WebCore/websockets/WebSocketFrame.h \
Source/WebCore/websockets/WebSocketHandshake.cpp \
Source/WebCore/websockets/WebSocketHandshake.h \
Source/WebCore/websockets/WebSocketHandshakeRequest.cpp \
Source/WebCore/websockets/WebSocketHandshakeRequest.h \
Source/WebCore/websockets/WebSocketHandshakeResponse.cpp \
Source/WebCore/websockets/WebSocketHandshakeResponse.h \
Source/WebCore/websockets/WorkerThreadableWebSocketChannel.cpp \
Source/WebCore/websockets/WorkerThreadableWebSocketChannel.h \
Source/WebCore/workers/AbstractWorker.cpp \
Source/WebCore/workers/AbstractWorker.h \
Source/WebCore/workers/DedicatedWorkerContext.cpp \
......@@ -5564,9 +5564,9 @@ webcore_built_sources += \
DerivedSources/WebCore/JSWebSocket.h
dom_binding_idls += \
$(WebCore)/websockets/CloseEvent.idl \
$(WebCore)/websockets/DOMWindowWebSocket.idl \
$(WebCore)/websockets/WebSocket.idl
$(WebCore)/Modules/websockets/CloseEvent.idl \
$(WebCore)/Modules/websockets/DOMWindowWebSocket.idl \
$(WebCore)/Modules/websockets/WebSocket.idl
endif # END ENABLE_WEB_SOCKETS
# ---
......
......@@ -3671,29 +3671,29 @@ contains(DEFINES, ENABLE_VIDEO_TRACK=1) {
contains(DEFINES, ENABLE_WEB_SOCKETS=1) {
HEADERS += \
websockets/CloseEvent.h \
websockets/ThreadableWebSocketChannel.h \
websockets/ThreadableWebSocketChannelClientWrapper.h \
websockets/WebSocket.h \
websockets/WebSocketChannel.h \
websockets/WebSocketChannelClient.h \
websockets/WebSocketExtensionDispatcher.h \
websockets/WebSocketExtensionProcessor.h \
websockets/WebSocketFrame.h \
websockets/WebSocketHandshake.h \
websockets/WebSocketHandshakeRequest.h \
websockets/WebSocketHandshakeResponse.h \
Modules/websockets/CloseEvent.h \
Modules/websockets/ThreadableWebSocketChannel.h \
Modules/websockets/ThreadableWebSocketChannelClientWrapper.h \
Modules/websockets/WebSocket.h \
Modules/websockets/WebSocketChannel.h \
Modules/websockets/WebSocketChannelClient.h \
Modules/websockets/WebSocketExtensionDispatcher.h \
Modules/websockets/WebSocketExtensionProcessor.h \
Modules/websockets/WebSocketFrame.h \
Modules/websockets/WebSocketHandshake.h \
Modules/websockets/WebSocketHandshakeRequest.h \
Modules/websockets/WebSocketHandshakeResponse.h \
platform/network/qt/SocketStreamHandlePrivate.h
SOURCES += \
websockets/WebSocket.cpp \
websockets/WebSocketChannel.cpp \
websockets/WebSocketExtensionDispatcher.cpp \
websockets/WebSocketHandshake.cpp \
websockets/WebSocketHandshakeRequest.cpp \
websockets/WebSocketHandshakeResponse.cpp \
websockets/ThreadableWebSocketChannel.cpp \
websockets/ThreadableWebSocketChannelClientWrapper.cpp \
Modules/websockets/WebSocket.cpp \
Modules/websockets/WebSocketChannel.cpp \
Modules/websockets/WebSocketExtensionDispatcher.cpp \
Modules/websockets/WebSocketHandshake.cpp \
Modules/websockets/WebSocketHandshakeRequest.cpp \
Modules/websockets/WebSocketHandshakeResponse.cpp \
Modules/websockets/ThreadableWebSocketChannel.cpp \
Modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp \
platform/network/SocketStreamErrorBase.cpp \
platform/network/SocketStreamHandleBase.cpp \
platform/network/qt/SocketStreamHandleQt.cpp
......@@ -3705,10 +3705,10 @@ contains(DEFINES, ENABLE_WEB_SOCKETS=1) {
contains(DEFINES, ENABLE_WORKERS=1) {
HEADERS += \
websockets/WorkerThreadableWebSocketChannel.h
Modules/websockets/WorkerThreadableWebSocketChannel.h
SOURCES += \
websockets/WorkerThreadableWebSocketChannel.cpp
Modules/websockets/WorkerThreadableWebSocketChannel.cpp
}
}
......
......@@ -56,6 +56,7 @@
'../Modules/intents',
'../Modules/indexeddb',
'../Modules/mediastream',
'../Modules/websockets',
'../accessibility',
'../accessibility/chromium',
'../bindings',
......
......@@ -745,6 +745,9 @@
'Modules/mediastream/NavigatorUserMediaSuccessCallback.idl',
'Modules/mediastream/PeerConnection.idl',
'Modules/mediastream/SignalingCallback.idl',
'Modules/websockets/CloseEvent.idl',
'Modules/websockets/DOMWindowWebSocket.idl',
'Modules/websockets/WebSocket.idl',
'css/CSSCharsetRule.idl',
'css/CSSFontFaceRule.idl',
'css/CSSImportRule.idl',
......@@ -1100,9 +1103,6 @@
'webaudio/OfflineAudioCompletionEvent.idl',
'webaudio/RealtimeAnalyserNode.idl',
'webaudio/WaveShaperNode.idl',
'websockets/CloseEvent.idl',
'websockets/DOMWindowWebSocket.idl',
'websockets/WebSocket.idl',
'workers/AbstractWorker.idl',
'workers/DOMWindowWorker.idl',
'workers/DedicatedWorkerContext.idl',
......@@ -1327,6 +1327,30 @@
'Modules/mediastream/UserMediaController.cpp',
'Modules/mediastream/UserMediaRequest.cpp',
'Modules/mediastream/UserMediaRequest.h',
'Modules/websockets/CloseEvent.h',
'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/WebSocketChannel.cpp',
'Modules/websockets/WebSocketChannel.h',
'Modules/websockets/WebSocketChannelClient.h',
'Modules/websockets/WebSocketDeflater.cpp',
'Modules/websockets/WebSocketDeflater.h',
'Modules/websockets/WebSocketExtensionDispatcher.cpp',
'Modules/websockets/WebSocketExtensionDispatcher.h',
'Modules/websockets/WebSocketExtensionProcessor.h',
'Modules/websockets/WebSocketFrame.h',
'Modules/websockets/WebSocketHandshake.cpp',
'Modules/websockets/WebSocketHandshake.h',
'Modules/websockets/WebSocketHandshakeRequest.cpp',
'Modules/websockets/WebSocketHandshakeRequest.h',
'Modules/websockets/WebSocketHandshakeResponse.cpp',
'Modules/websockets/WebSocketHandshakeResponse.h',
'Modules/websockets/WorkerThreadableWebSocketChannel.cpp',
'Modules/websockets/WorkerThreadableWebSocketChannel.h',
'accessibility/AXObjectCache.cpp',
'accessibility/AccessibilityARIAGrid.cpp',
'accessibility/AccessibilityARIAGrid.h',
......@@ -4831,30 +4855,6 @@
'webaudio/WaveShaperNode.h',
'webaudio/WaveShaperProcessor.cpp',
'webaudio/WaveShaperProcessor.h',
'websockets/CloseEvent.h',
'websockets/ThreadableWebSocketChannel.cpp',
'websockets/ThreadableWebSocketChannel.h',
'websockets/ThreadableWebSocketChannelClientWrapper.cpp',
'websockets/ThreadableWebSocketChannelClientWrapper.h',
'websockets/WebSocket.cpp',
'websockets/WebSocket.h',
'websockets/WebSocketChannel.cpp',
'websockets/WebSocketChannel.h',
'websockets/WebSocketChannelClient.h',
'websockets/WebSocketDeflater.cpp',
'websockets/WebSocketDeflater.h',
'websockets/WebSocketExtensionDispatcher.cpp',
'websockets/WebSocketExtensionDispatcher.h',
'websockets/WebSocketExtensionProcessor.h',
'websockets/WebSocketFrame.h',
'websockets/WebSocketHandshake.cpp',
'websockets/WebSocketHandshake.h',
'websockets/WebSocketHandshakeRequest.cpp',
'websockets/WebSocketHandshakeRequest.h',
'websockets/WebSocketHandshakeResponse.cpp',
'websockets/WebSocketHandshakeResponse.h',
'websockets/WorkerThreadableWebSocketChannel.cpp',
'websockets/WorkerThreadableWebSocketChannel.h',
'workers/AbstractWorker.cpp',
'workers/AbstractWorker.h',
'workers/DedicatedWorkerContext.cpp',
......
......@@ -19,6 +19,7 @@ WEBCORE_GENERATED_SOURCES_DIR = $${ROOT_BUILD_DIR}/Source/WebCore/$${GENERATED_S
INCLUDEPATH += \
$$SOURCE_DIR \
$$SOURCE_DIR/Modules/geolocation \
$$SOURCE_DIR/Modules/websockets \
$$SOURCE_DIR/accessibility \
$$SOURCE_DIR/bindings \
$$SOURCE_DIR/bindings/generic \
......
......@@ -24109,6 +24109,106 @@
>
</File>
</Filter>
<Filter
Name="websockets"
>
<File
RelativePath="..\Modules\websockets\CloseEvent.h"
>
</File>
<File
RelativePath="..\Modules\websockets\ThreadableWebSocketChannel.cpp"
>
</File>
<File
RelativePath="..\Modules\websockets\ThreadableWebSocketChannel.h"
>
</File>
<File
RelativePath="..\Modules\websockets\ThreadableWebSocketChannelClientWrapper.cpp"
>
</File>
<File
RelativePath="..\Modules\websockets\ThreadableWebSocketChannelClientWrapper.h"
>
</File>
<File
RelativePath="..\Modules\websockets\WebSocket.cpp"
>
</File>
<File
RelativePath="..\Modules\websockets\WebSocket.h"
>
</File>
<File
RelativePath="..\Modules\websockets\WebSocketChannel.cpp"
>
</File>
<File
RelativePath="..\Modules\websockets\WebSocketChannel.h"
>
</File>
<File
RelativePath="..\Modules\websockets\WebSocketChannelClient.h"
>
</File>
<File
RelativePath="..\Modules\websockets\WebSocketDeflater.cpp"
>
</File>
<File
RelativePath="..\Modules\websockets\WebSocketDeflater.h"
>
</File>
<File
RelativePath="..\Modules\websockets\WebSocketExtensionDispatcher.cpp"
>
</File>
<File
RelativePath="..\Modules\websockets\WebSocketExtensionDispatcher.h"
>
</File>
<File
RelativePath="..\Modules\websockets\WebSocketExtensionProcessor.h"
>
</File>
<File
RelativePath="..\Modules\websockets\WebSocketFrame.h"
>
</File>
<File
RelativePath="..\Modules\websockets\WebSocketHandshake.cpp"
>
</File>
<File
RelativePath="..\Modules\websockets\WebSocketHandshake.h"
>
</File>
<File
RelativePath="..\Modules\websockets\WebSocketHandshakeRequest.cpp"
>
</File>
<File
RelativePath="..\Modules\websockets\WebSocketHandshakeRequest.h"
>
</File>
<File
RelativePath="..\Modules\websockets\WebSocketHandshakeResponse.cpp"
>
</File>
<File
RelativePath="..\Modules\websockets\WebSocketHandshakeResponse.h"
>
</File>
<File
RelativePath="..\Modules\websockets\WorkerThreadableWebSocketChannel.cpp"
>
</File>
<File
RelativePath="..\Modules\websockets\WorkerThreadableWebSocketChannel.h"
>
</File>
</Filter>
</Filter>
<Filter
Name="accessibility"
......@@ -73494,106 +73594,6 @@
</File>
</Filter>
</Filter>
<Filter
Name="websockets"
>
<File
RelativePath="..\websockets\CloseEvent.h"
>
</File>
<File
RelativePath="..\websockets\ThreadableWebSocketChannel.cpp"
>
</File>
<File
RelativePath="..\websockets\ThreadableWebSocketChannel.h"
>
</File>
<File
RelativePath="..\websockets\ThreadableWebSocketChannelClientWrapper.cpp"
>
</File>
<File
RelativePath="..\websockets\ThreadableWebSocketChannelClientWrapper.h"
>
</File>
<File
RelativePath="..\websockets\WebSocket.cpp"
>
</File>
<File
RelativePath="..\websockets\WebSocket.h"
>
</File>
<File
RelativePath="..\websockets\WebSocketChannel.cpp"
>
</File>
<File
RelativePath="..\websockets\WebSocketChannel.h"
>
</File>
<File
RelativePath="..\websockets\WebSocketChannelClient.h"
>