Move websockets to Modules/websockets
authorabarth@webkit.org <abarth@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 26 Feb 2012 07:28:37 +0000 (07:28 +0000)
committerabarth@webkit.org <abarth@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 26 Feb 2012 07:28:37 +0000 (07:28 +0000)
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: https://svn.webkit.org/repository/webkit/trunk@108930 268f45cc-cd09-0410-ab3c-d52691b4dbfc

43 files changed:
Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebCore/DerivedSources.make
Source/WebCore/DerivedSources.pri
Source/WebCore/GNUmakefile.am
Source/WebCore/GNUmakefile.list.am
Source/WebCore/Modules/websockets/CloseEvent.h [moved from Source/WebCore/websockets/CloseEvent.h with 100% similarity]
Source/WebCore/Modules/websockets/CloseEvent.idl [moved from Source/WebCore/websockets/CloseEvent.idl with 100% similarity]
Source/WebCore/Modules/websockets/DOMWindowWebSocket.idl [moved from Source/WebCore/websockets/DOMWindowWebSocket.idl with 100% similarity]
Source/WebCore/Modules/websockets/ThreadableWebSocketChannel.cpp [moved from Source/WebCore/websockets/ThreadableWebSocketChannel.cpp with 100% similarity]
Source/WebCore/Modules/websockets/ThreadableWebSocketChannel.h [moved from Source/WebCore/websockets/ThreadableWebSocketChannel.h with 100% similarity]
Source/WebCore/Modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp [moved from Source/WebCore/websockets/ThreadableWebSocketChannelClientWrapper.cpp with 100% similarity]
Source/WebCore/Modules/websockets/ThreadableWebSocketChannelClientWrapper.h [moved from Source/WebCore/websockets/ThreadableWebSocketChannelClientWrapper.h with 100% similarity]
Source/WebCore/Modules/websockets/WebSocket.cpp [moved from Source/WebCore/websockets/WebSocket.cpp with 100% similarity]
Source/WebCore/Modules/websockets/WebSocket.h [moved from Source/WebCore/websockets/WebSocket.h with 100% similarity]
Source/WebCore/Modules/websockets/WebSocket.idl [moved from Source/WebCore/websockets/WebSocket.idl with 100% similarity]
Source/WebCore/Modules/websockets/WebSocketChannel.cpp [moved from Source/WebCore/websockets/WebSocketChannel.cpp with 100% similarity]
Source/WebCore/Modules/websockets/WebSocketChannel.h [moved from Source/WebCore/websockets/WebSocketChannel.h with 100% similarity]
Source/WebCore/Modules/websockets/WebSocketChannelClient.h [moved from Source/WebCore/websockets/WebSocketChannelClient.h with 100% similarity]
Source/WebCore/Modules/websockets/WebSocketDeflater.cpp [moved from Source/WebCore/websockets/WebSocketDeflater.cpp with 100% similarity]
Source/WebCore/Modules/websockets/WebSocketDeflater.h [moved from Source/WebCore/websockets/WebSocketDeflater.h with 100% similarity]
Source/WebCore/Modules/websockets/WebSocketExtensionDispatcher.cpp [moved from Source/WebCore/websockets/WebSocketExtensionDispatcher.cpp with 100% similarity]
Source/WebCore/Modules/websockets/WebSocketExtensionDispatcher.h [moved from Source/WebCore/websockets/WebSocketExtensionDispatcher.h with 100% similarity]
Source/WebCore/Modules/websockets/WebSocketExtensionProcessor.h [moved from Source/WebCore/websockets/WebSocketExtensionProcessor.h with 100% similarity]
Source/WebCore/Modules/websockets/WebSocketFrame.h [moved from Source/WebCore/websockets/WebSocketFrame.h with 100% similarity]
Source/WebCore/Modules/websockets/WebSocketHandshake.cpp [moved from Source/WebCore/websockets/WebSocketHandshake.cpp with 100% similarity]
Source/WebCore/Modules/websockets/WebSocketHandshake.h [moved from Source/WebCore/websockets/WebSocketHandshake.h with 100% similarity]
Source/WebCore/Modules/websockets/WebSocketHandshakeRequest.cpp [moved from Source/WebCore/websockets/WebSocketHandshakeRequest.cpp with 100% similarity]
Source/WebCore/Modules/websockets/WebSocketHandshakeRequest.h [moved from Source/WebCore/websockets/WebSocketHandshakeRequest.h with 100% similarity]
Source/WebCore/Modules/websockets/WebSocketHandshakeResponse.cpp [moved from Source/WebCore/websockets/WebSocketHandshakeResponse.cpp with 100% similarity]
Source/WebCore/Modules/websockets/WebSocketHandshakeResponse.h [moved from Source/WebCore/websockets/WebSocketHandshakeResponse.h with 100% similarity]
Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.cpp [moved from Source/WebCore/websockets/WorkerThreadableWebSocketChannel.cpp with 100% similarity]
Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.h [moved from Source/WebCore/websockets/WorkerThreadableWebSocketChannel.h with 100% similarity]
Source/WebCore/Target.pri
Source/WebCore/WebCore.gyp/WebCore.gyp
Source/WebCore/WebCore.gypi
Source/WebCore/WebCore.pri
Source/WebCore/WebCore.vcproj/WebCore.vcproj
Source/WebCore/WebCore.vcproj/WebCoreCommon.vsprops
Source/WebCore/WebCore.vcproj/copyForwardingHeaders.cmd
Source/WebCore/WebCore.xcodeproj/project.pbxproj
Source/WebKit/chromium/src/WebRuntimeFeatures.cpp
Tools/waf/build/settings.py

index 617630b..89a752e 100644 (file)
@@ -1,6 +1,7 @@
 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 ()
 
index f58c35c..700a6fe 100644 (file)
@@ -1,3 +1,57 @@
+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()
index 828d9b2..8ec896e 100644 (file)
@@ -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 \
index a6976b4..8325b33 100644 (file)
@@ -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 \
index 78851b8..8064d52 100644 (file)
@@ -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 \
index cc53a47..3be5889 100644 (file)
@@ -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
 
 # ---
index 3826696..4e0cd8d 100644 (file)
@@ -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
     }
 }
 
index deb7e26..2fcbaa4 100644 (file)
@@ -56,6 +56,7 @@
       '../Modules/intents',
       '../Modules/indexeddb',
       '../Modules/mediastream',
+      '../Modules/websockets',
       '../accessibility',
       '../accessibility/chromium',
       '../bindings',
index 536fe3e..96238f6 100644 (file)
             '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',
             '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',
             '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',
             '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',
index a3b7be4..83da7e6 100644 (file)
@@ -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 \
index 4ed7950..06a7645 100755 (executable)
                                        >
                                </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"
                        </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"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\websockets\WebSocketDeflater.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\websockets\WebSocketDeflater.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\websockets\WebSocketExtensionDispatcher.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\websockets\WebSocketExtensionDispatcher.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\websockets\WebSocketExtensionProcessor.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\websockets\WebSocketFrame.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\websockets\WebSocketHandshake.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\websockets\WebSocketHandshake.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\websockets\WebSocketHandshakeRequest.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\websockets\WebSocketHandshakeRequest.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\websockets\WebSocketHandshakeResponse.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\websockets\WebSocketHandshakeResponse.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\websockets\WorkerThreadableWebSocketChannel.cpp"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\websockets\WorkerThreadableWebSocketChannel.h"
-                               >
-                       </File>
-               </Filter>
-               <Filter
                        Name="mathml"
                        >
                        <File
index 838c080..c967027 100644 (file)
@@ -7,7 +7,7 @@
        >
        <Tool
                Name="VCCLCompilerTool"
-               AdditionalIncludeDirectories="&quot;$(ProjectDir)..&quot;;&quot;$(ProjectDir)..\Modules\geolocation&quot;;&quot;$(ProjectDir)..\accessibility&quot;;&quot;$(ProjectDir)..\accessibility\win&quot;;&quot;$(ProjectDir)..\bridge&quot;;&quot;$(ProjectDir)..\bridge\c&quot;;&quot;$(ProjectDir)..\bridge\jsc&quot;;&quot;$(ProjectDir)..\css&quot;;&quot;$(ProjectDir)..\editing&quot;;&quot;$(ProjectDir)..\fileapi&quot;;&quot;$(ProjectDir)..\rendering&quot;;&quot;$(ProjectDir)..\rendering\mathml&quot;;&quot;$(ProjectDir)..\rendering\style&quot;;&quot;$(ProjectDir)..\rendering\svg&quot;;&quot;$(ProjectDir)..\bindings&quot;;&quot;$(ProjectDir)..\bindings\generic&quot;;&quot;$(ProjectDir)..\bindings\js&quot;;&quot;$(ProjectDir)..\bindings\js\specialization&quot;;&quot;$(ProjectDir)..\dom&quot;;&quot;$(ProjectDir)..\dom\default&quot;;&quot;$(ProjectDir)..\history&quot;;&quot;$(ProjectDir)..\html&quot;;&quot;$(ProjectDir)..\html\canvas&quot;;&quot;$(ProjectDir)..\html\parser&quot;;&quot;$(ProjectDir)..\html\shadow&quot;;&quot;$(ProjectDir)..\inspector&quot;;&quot;$(ProjectDir)..\loader&quot;;&quot;$(ProjectDir)..\loader\appcache&quot;;&quot;$(ProjectDir)..\loader\archive&quot;;&quot;$(ProjectDir)..\loader\archive\cf&quot;;&quot;$(ProjectDir)..\loader\cache&quot;;&quot;$(ProjectDir)..\loader\icon&quot;;&quot;$(ProjectDir)..\mathml&quot;;&quot;$(ProjectDir)..\notifications&quot;;&quot;$(ProjectDir)..\page&quot;;&quot;$(ProjectDir)..\page\animation&quot;;&quot;$(ProjectDir)..\page\scrolling&quot;;&quot;$(ProjectDir)..\page\win&quot;;&quot;$(ProjectDir)..\platform&quot;;&quot;$(ProjectDir)..\platform\animation&quot;;&quot;$(ProjectDir)..\platform\mock&quot;;&quot;$(ProjectDir)..\platform\sql&quot;;&quot;$(ProjectDir)..\platform\win&quot;;&quot;$(ProjectDir)..\platform\network&quot;;&quot;$(ProjectDir)..\platform\network\win&quot;;&quot;$(ProjectDir)..\platform\cf&quot;;&quot;$(ProjectDir)..\platform\graphics&quot;;&quot;$(ProjectDir)..\platform\graphics\ca&quot;;&quot;$(ProjectDir)..\platform\graphics\filters&quot;;&quot;$(ProjectDir)..\platform\graphics\filters\arm&quot;;&quot;$(ProjectDir)..\platform\graphics\opentype&quot;;&quot;$(ProjectDir)..\platform\graphics\transforms&quot;;&quot;$(ProjectDir)..\platform\text&quot;;&quot;$(ProjectDir)..\platform\text\transcoder&quot;;&quot;$(ProjectDir)..\platform\graphics\win&quot;;&quot;$(ProjectDir)..\xml&quot;;&quot;$(ProjectDir)..\xml\parser&quot;;&quot;$(ConfigurationBuildDir)\obj\WebCore\DerivedSources&quot;;&quot;$(ProjectDir)..\plugins&quot;;&quot;$(ProjectDir)..\plugins\win&quot;;&quot;$(ProjectDir)..\svg\animation&quot;;&quot;$(ProjectDir)..\svg\graphics&quot;;&quot;$(ProjectDir)..\svg\properties&quot;;&quot;$(ProjectDir)..\svg\graphics\filters&quot;;&quot;$(ProjectDir)..\svg&quot;;&quot;$(ProjectDir)..\testing&quot;;&quot;$(ProjectDir)..\wml&quot;;&quot;$(ProjectDir)..\storage&quot;;&quot;$(ProjectDir)..\websockets&quot;;&quot;$(ProjectDir)..\workers&quot;;&quot;$(ConfigurationBuildDir)\include&quot;;&quot;$(ConfigurationBuildDir)\include\private&quot;;&quot;$(ConfigurationBuildDir)\include\JavaScriptCore&quot;;&quot;$(ConfigurationBuildDir)\include\private\JavaScriptCore&quot;;&quot;$(ProjectDir)..\ForwardingHeaders&quot;;&quot;$(WebKitLibrariesDir)\include&quot;;&quot;$(WebKitLibrariesDir)\include\private&quot;;&quot;$(WebKitLibrariesDir)\include\private\JavaScriptCore&quot;;&quot;$(WebKitLibrariesDir)\include\pthreads&quot;;&quot;$(WebKitLibrariesDir)\include\sqlite&quot;;&quot;$(WebKitLibrariesDir)\include\JavaScriptCore&quot;;&quot;$(WebKitLibrariesDir)\include\zlib&quot;"
+               AdditionalIncludeDirectories="&quot;$(ProjectDir)..&quot;;&quot;$(ProjectDir)..\Modules\geolocation&quot;;&quot;$(ProjectDir)..\Modules\websockets&quot;;&quot;$(ProjectDir)..\accessibility&quot;;&quot;$(ProjectDir)..\accessibility\win&quot;;&quot;$(ProjectDir)..\bridge&quot;;&quot;$(ProjectDir)..\bridge\c&quot;;&quot;$(ProjectDir)..\bridge\jsc&quot;;&quot;$(ProjectDir)..\css&quot;;&quot;$(ProjectDir)..\editing&quot;;&quot;$(ProjectDir)..\fileapi&quot;;&quot;$(ProjectDir)..\rendering&quot;;&quot;$(ProjectDir)..\rendering\mathml&quot;;&quot;$(ProjectDir)..\rendering\style&quot;;&quot;$(ProjectDir)..\rendering\svg&quot;;&quot;$(ProjectDir)..\bindings&quot;;&quot;$(ProjectDir)..\bindings\generic&quot;;&quot;$(ProjectDir)..\bindings\js&quot;;&quot;$(ProjectDir)..\bindings\js\specialization&quot;;&quot;$(ProjectDir)..\dom&quot;;&quot;$(ProjectDir)..\dom\default&quot;;&quot;$(ProjectDir)..\history&quot;;&quot;$(ProjectDir)..\html&quot;;&quot;$(ProjectDir)..\html\canvas&quot;;&quot;$(ProjectDir)..\html\parser&quot;;&quot;$(ProjectDir)..\html\shadow&quot;;&quot;$(ProjectDir)..\inspector&quot;;&quot;$(ProjectDir)..\loader&quot;;&quot;$(ProjectDir)..\loader\appcache&quot;;&quot;$(ProjectDir)..\loader\archive&quot;;&quot;$(ProjectDir)..\loader\archive\cf&quot;;&quot;$(ProjectDir)..\loader\cache&quot;;&quot;$(ProjectDir)..\loader\icon&quot;;&quot;$(ProjectDir)..\mathml&quot;;&quot;$(ProjectDir)..\notifications&quot;;&quot;$(ProjectDir)..\page&quot;;&quot;$(ProjectDir)..\page\animation&quot;;&quot;$(ProjectDir)..\page\scrolling&quot;;&quot;$(ProjectDir)..\page\win&quot;;&quot;$(ProjectDir)..\platform&quot;;&quot;$(ProjectDir)..\platform\animation&quot;;&quot;$(ProjectDir)..\platform\mock&quot;;&quot;$(ProjectDir)..\platform\sql&quot;;&quot;$(ProjectDir)..\platform\win&quot;;&quot;$(ProjectDir)..\platform\network&quot;;&quot;$(ProjectDir)..\platform\network\win&quot;;&quot;$(ProjectDir)..\platform\cf&quot;;&quot;$(ProjectDir)..\platform\graphics&quot;;&quot;$(ProjectDir)..\platform\graphics\ca&quot;;&quot;$(ProjectDir)..\platform\graphics\filters&quot;;&quot;$(ProjectDir)..\platform\graphics\filters\arm&quot;;&quot;$(ProjectDir)..\platform\graphics\opentype&quot;;&quot;$(ProjectDir)..\platform\graphics\transforms&quot;;&quot;$(ProjectDir)..\platform\text&quot;;&quot;$(ProjectDir)..\platform\text\transcoder&quot;;&quot;$(ProjectDir)..\platform\graphics\win&quot;;&quot;$(ProjectDir)..\xml&quot;;&quot;$(ProjectDir)..\xml\parser&quot;;&quot;$(ConfigurationBuildDir)\obj\WebCore\DerivedSources&quot;;&quot;$(ProjectDir)..\plugins&quot;;&quot;$(ProjectDir)..\plugins\win&quot;;&quot;$(ProjectDir)..\svg\animation&quot;;&quot;$(ProjectDir)..\svg\graphics&quot;;&quot;$(ProjectDir)..\svg\properties&quot;;&quot;$(ProjectDir)..\svg\graphics\filters&quot;;&quot;$(ProjectDir)..\svg&quot;;&quot;$(ProjectDir)..\testing&quot;;&quot;$(ProjectDir)..\wml&quot;;&quot;$(ProjectDir)..\storage&quot;;&quot;$(ProjectDir)..\websockets&quot;;&quot;$(ProjectDir)..\workers&quot;;&quot;$(ConfigurationBuildDir)\include&quot;;&quot;$(ConfigurationBuildDir)\include\private&quot;;&quot;$(ConfigurationBuildDir)\include\JavaScriptCore&quot;;&quot;$(ConfigurationBuildDir)\include\private\JavaScriptCore&quot;;&quot;$(ProjectDir)..\ForwardingHeaders&quot;;&quot;$(WebKitLibrariesDir)\include&quot;;&quot;$(WebKitLibrariesDir)\include\private&quot;;&quot;$(WebKitLibrariesDir)\include\private\JavaScriptCore&quot;;&quot;$(WebKitLibrariesDir)\include\pthreads&quot;;&quot;$(WebKitLibrariesDir)\include\sqlite&quot;;&quot;$(WebKitLibrariesDir)\include\JavaScriptCore&quot;;&quot;$(WebKitLibrariesDir)\include\zlib&quot;"
                PreprocessorDefinitions="__WIN32__;DISABLE_3D_RENDERING;WEBCORE_CONTEXT_MENUS"
                UsePrecompiledHeader="2"
                PrecompiledHeaderThrough="WebCorePrefix.h"
index dfd62b1..f198bd0 100755 (executable)
@@ -20,6 +20,7 @@ mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\include\WebCoreTestSupport"
 xcopy /y /d "%ProjectDir%..\config.h" "%CONFIGURATIONBUILDDIR%\include\WebCore"
 xcopy /y /d "%CONFIGURATIONBUILDDIR%\obj\WebCore\DerivedSources\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore"
 xcopy /y /d "%ProjectDir%..\Modules\geolocation\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore"
+xcopy /y /d "%ProjectDir%..\Modules\websockets\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore"
 xcopy /y /d "%ProjectDir%..\accessibility\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore"
 xcopy /y /d "%ProjectDir%..\accessibility\win\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore"
 xcopy /y /d "%ProjectDir%..\inspector\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore"
@@ -77,7 +78,6 @@ xcopy /y /d "%ProjectDir%..\svg\graphics\*.h" "%CONFIGURATIONBUILDDIR%\include\W
 xcopy /y /d "%ProjectDir%..\svg\properties\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore"
 xcopy /y /d "%ProjectDir%..\svg\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore"
 xcopy /y /d "%ProjectDir%..\storage\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore"
-xcopy /y /d "%ProjectDir%..\websockets\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore"
 xcopy /y /d "%ProjectDir%..\workers\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore"
 xcopy /y /d "%ProjectDir%..\ForwardingHeaders\bindings\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore\ForwardingHeaders\bindings"
 xcopy /y /d "%ProjectDir%..\ForwardingHeaders\parser\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore\ForwardingHeaders\parser"
index a75e2f4..e952b0c 100644 (file)
                4A1E719614E101F900626F9D /* JSHTMLShadowElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A1E719414E101F900626F9D /* JSHTMLShadowElement.h */; };
                4A1E71A514E106AC00626F9D /* JSShadowRoot.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A1E71A314E106AC00626F9D /* JSShadowRoot.cpp */; };
                4A1E71A614E106AC00626F9D /* JSShadowRoot.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A1E71A414E106AC00626F9D /* JSShadowRoot.h */; };
-               4A4A234614F1E1440046FBF1 /* WebSocketFrame.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A4A234514F1E1440046FBF1 /* WebSocketFrame.h */; };
                4A6E9FC313C17D1D0046A7F8 /* FontFeatureValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A6E9FC113C17D1D0046A7F8 /* FontFeatureValue.cpp */; };
                4A6E9FC413C17D1D0046A7F8 /* FontFeatureValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A6E9FC213C17D1D0046A7F8 /* FontFeatureValue.h */; settings = {ATTRIBUTES = (Private, ); }; };
                4A6E9FC713C17D570046A7F8 /* FontFeatureSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A6E9FC513C17D570046A7F8 /* FontFeatureSettings.cpp */; };
                4A6E9FC813C17D570046A7F8 /* FontFeatureSettings.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A6E9FC613C17D570046A7F8 /* FontFeatureSettings.h */; settings = {ATTRIBUTES = (Private, ); }; };
                4A8C96EB0BE69032004EEFF0 /* FrameSelectionMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4A8C96EA0BE69032004EEFF0 /* FrameSelectionMac.mm */; };
-               4A957F0614E2412A0049DBFB /* WebSocketExtensionDispatcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A957F0314E241100049DBFB /* WebSocketExtensionDispatcher.cpp */; };
-               4A957F0714E241300049DBFB /* WebSocketExtensionDispatcher.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A957F0414E241100049DBFB /* WebSocketExtensionDispatcher.h */; };
                4ABDFF0B14DBE385004D117D /* HTMLShadowElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4ABDFF0714DBE312004D117D /* HTMLShadowElement.cpp */; };
                4ABDFF0C14DBE385004D117D /* HTMLShadowElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 4ABDFF0814DBE312004D117D /* HTMLShadowElement.h */; };
                4ACBC0BE12713CBD0094F9B2 /* ClassList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4ACBC0BC12713CBD0094F9B2 /* ClassList.cpp */; };
                4AD01009127E642A0015035F /* HTMLOutputElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 4AD01006127E642A0015035F /* HTMLOutputElement.h */; };
                4AD0173C127E82860015035F /* JSHTMLOutputElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4AD0173A127E82860015035F /* JSHTMLOutputElement.cpp */; };
                4AD0173D127E82860015035F /* JSHTMLOutputElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 4AD0173B127E82860015035F /* JSHTMLOutputElement.h */; };
-               4ADE25FA14E3BB4C004C2213 /* WebSocketExtensionProcessor.h in Headers */ = {isa = PBXBuildFile; fileRef = 4ADE25F914E3BB4C004C2213 /* WebSocketExtensionProcessor.h */; };
-               4AE02ABD14E8A9D200BC3BA7 /* WebSocketDeflater.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4AE02ABB14E8A9D200BC3BA7 /* WebSocketDeflater.cpp */; };
-               4AE02ABE14E8A9D200BC3BA7 /* WebSocketDeflater.h in Headers */ = {isa = PBXBuildFile; fileRef = 4AE02ABC14E8A9D200BC3BA7 /* WebSocketDeflater.h */; };
                4AF1AD3E13FD23A400AA9590 /* EventDispatchMediator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4AF1AD3C13FD23A400AA9590 /* EventDispatchMediator.cpp */; };
                4AF1AD3F13FD23A400AA9590 /* EventDispatchMediator.h in Headers */ = {isa = PBXBuildFile; fileRef = 4AF1AD3D13FD23A400AA9590 /* EventDispatchMediator.h */; settings = {ATTRIBUTES = (Private, ); }; };
                4B2708C70AF19EE40065127F /* Pasteboard.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B2708C50AF19EE40065127F /* Pasteboard.h */; };
                510D4A36103165EE0049EA54 /* SocketStreamHandleBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 510D4A30103165EE0049EA54 /* SocketStreamHandleBase.cpp */; };
                510D4A37103165EE0049EA54 /* SocketStreamHandleBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 510D4A31103165EE0049EA54 /* SocketStreamHandleBase.h */; };
                510D4A38103165EE0049EA54 /* SocketStreamHandleClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 510D4A32103165EE0049EA54 /* SocketStreamHandleClient.h */; };
-               510D4A4E103177A20049EA54 /* WebSocketChannel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 510D4A47103177A20049EA54 /* WebSocketChannel.cpp */; };
-               510D4A4F103177A20049EA54 /* WebSocketChannel.h in Headers */ = {isa = PBXBuildFile; fileRef = 510D4A48103177A20049EA54 /* WebSocketChannel.h */; };
-               510D4A50103177A20049EA54 /* WebSocketChannelClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 510D4A49103177A20049EA54 /* WebSocketChannelClient.h */; };
-               510F079B11FEE9C000B8EE49 /* ThreadableWebSocketChannelClientWrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 510F078111FEBE7500B8EE49 /* ThreadableWebSocketChannelClientWrapper.cpp */; };
-               5112247210CFB8C6008099D7 /* ThreadableWebSocketChannel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5112247110CFB8C6008099D7 /* ThreadableWebSocketChannel.cpp */; };
-               5112247410CFB8D8008099D7 /* ThreadableWebSocketChannel.h in Headers */ = {isa = PBXBuildFile; fileRef = 5112247310CFB8D8008099D7 /* ThreadableWebSocketChannel.h */; };
-               5112247610CFB8E8008099D7 /* ThreadableWebSocketChannelClientWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 5112247510CFB8E8008099D7 /* ThreadableWebSocketChannelClientWrapper.h */; };
-               5112247810CFB8F4008099D7 /* WorkerThreadableWebSocketChannel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5112247710CFB8F4008099D7 /* WorkerThreadableWebSocketChannel.cpp */; };
-               5112247A10CFB8FF008099D7 /* WorkerThreadableWebSocketChannel.h in Headers */ = {isa = PBXBuildFile; fileRef = 5112247910CFB8FF008099D7 /* WorkerThreadableWebSocketChannel.h */; };
                5116D9770CF177BD00C2B84D /* DatabaseDetails.h in Headers */ = {isa = PBXBuildFile; fileRef = 5116D9750CF177BD00C2B84D /* DatabaseDetails.h */; settings = {ATTRIBUTES = (Private, ); }; };
                511F23170DC160DA004F0032 /* StorageTask.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 511F23130DC160DA004F0032 /* StorageTask.cpp */; };
                511F23180DC160DA004F0032 /* StorageTask.h in Headers */ = {isa = PBXBuildFile; fileRef = 511F23140DC160DA004F0032 /* StorageTask.h */; };
                5189F01D10B37BD900F3C739 /* JSPopStateEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5189F01B10B37BD900F3C739 /* JSPopStateEvent.cpp */; };
                5189F01E10B37BD900F3C739 /* JSPopStateEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 5189F01C10B37BD900F3C739 /* JSPopStateEvent.h */; };
                5189F0DE10B46B0E00F3C739 /* PopStateEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5189F0DD10B46B0E00F3C739 /* PopStateEvent.cpp */; };
-               518A34C11026C831001B6896 /* WebSocket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 518A34BE1026C831001B6896 /* WebSocket.cpp */; };
-               518A34C21026C831001B6896 /* WebSocket.h in Headers */ = {isa = PBXBuildFile; fileRef = 518A34BF1026C831001B6896 /* WebSocket.h */; };
                518A34C91026C8C9001B6896 /* JSWebSocketCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 518A34C61026C8C9001B6896 /* JSWebSocketCustom.cpp */; };
                5196116A0CAC56570010A80C /* Database.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5196115E0CAC56570010A80C /* Database.cpp */; };
                5196116B0CAC56570010A80C /* Database.h in Headers */ = {isa = PBXBuildFile; fileRef = 5196115F0CAC56570010A80C /* Database.h */; settings = {ATTRIBUTES = (Private, ); }; };
                51ABAE1B103C18FF008C5260 /* SocketStreamError.h in Headers */ = {isa = PBXBuildFile; fileRef = 51ABAE1A103C18FF008C5260 /* SocketStreamError.h */; };
                51ABAE1E103C1913008C5260 /* SocketStreamHandle.h in Headers */ = {isa = PBXBuildFile; fileRef = 51ABAE1C103C1913008C5260 /* SocketStreamHandle.h */; };
                51ABAE1F103C1913008C5260 /* SocketStreamHandleCFNet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51ABAE1D103C1913008C5260 /* SocketStreamHandleCFNet.cpp */; };
-               51ABAE441043AB4A008C5260 /* WebSocketHandshake.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51ABAE421043AB4A008C5260 /* WebSocketHandshake.cpp */; };
-               51ABAE451043AB4A008C5260 /* WebSocketHandshake.h in Headers */ = {isa = PBXBuildFile; fileRef = 51ABAE431043AB4A008C5260 /* WebSocketHandshake.h */; };
                51B2417B0D931F3F00E83F5C /* LegacyWebArchiveMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51B2417A0D931F3F00E83F5C /* LegacyWebArchiveMac.mm */; };
                51BE37E00DAEE00E001085FC /* StorageArea.h in Headers */ = {isa = PBXBuildFile; fileRef = 51BE37DE0DAEE00E001085FC /* StorageArea.h */; };
                51C0AA390F2AA10A001648C2 /* CachedFrame.h in Headers */ = {isa = PBXBuildFile; fileRef = 51C0AA380F2AA10A001648C2 /* CachedFrame.h */; settings = {ATTRIBUTES = (Private, ); }; };
                51EC92590CE90DB400F90308 /* SQLError.h in Headers */ = {isa = PBXBuildFile; fileRef = 51EC92570CE90DB400F90308 /* SQLError.h */; settings = {ATTRIBUTES = (Private, ); }; };
                51EC92650CE90DD400F90308 /* JSCustomSQLStatementErrorCallback.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51EC925D0CE90DD400F90308 /* JSCustomSQLStatementErrorCallback.cpp */; };
                51FAFE340CECBF2D00BB3F24 /* DatabaseTrackerClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 51FAFE330CECBF2D00BB3F24 /* DatabaseTrackerClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               51FB54F5113E364200821176 /* CloseEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 51FB54F4113E364200821176 /* CloseEvent.h */; };
                51FB5504113E3E9100821176 /* JSCloseEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 51FB5502113E3E9100821176 /* JSCloseEvent.h */; };
                51FB5505113E3E9100821176 /* JSCloseEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51FB5503113E3E9100821176 /* JSCloseEvent.cpp */; };
                521D46F611AEC98100514613 /* KillRingMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 521D46F511AEC98100514613 /* KillRingMac.mm */; };
                758978EC127090D60076D5A9 /* SpeechInputResult.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 758978EA127090D60076D5A9 /* SpeechInputResult.cpp */; };
                7633A72613D8B33A008501B6 /* LocaleToScriptMapping.h in Headers */ = {isa = PBXBuildFile; fileRef = 7633A72413D8B33A008501B6 /* LocaleToScriptMapping.h */; };
                7633A72713D8B33A008501B6 /* LocaleToScriptMappingDefault.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7633A72513D8B33A008501B6 /* LocaleToScriptMappingDefault.cpp */; };
-               7637C541112E7B74003D6CDC /* WebSocketHandshakeRequest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7637C540112E7B74003D6CDC /* WebSocketHandshakeRequest.cpp */; };
-               7637C543112E7B7E003D6CDC /* WebSocketHandshakeRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 7637C542112E7B7E003D6CDC /* WebSocketHandshakeRequest.h */; };
-               767F99BE11A1194A0080C51D /* WebSocketHandshakeResponse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 767F99BD11A1194A0080C51D /* WebSocketHandshakeResponse.cpp */; };
-               767F99C011A119560080C51D /* WebSocketHandshakeResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 767F99BF11A119560080C51D /* WebSocketHandshakeResponse.h */; };
                7694563C1214D97C0007CBAE /* JSDOMTokenList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7694563A1214D97C0007CBAE /* JSDOMTokenList.cpp */; };
                7694563D1214D97C0007CBAE /* JSDOMTokenList.h in Headers */ = {isa = PBXBuildFile; fileRef = 7694563B1214D97C0007CBAE /* JSDOMTokenList.h */; };
                7694565B1214DB630007CBAE /* DOMDOMTokenList.h in Headers */ = {isa = PBXBuildFile; fileRef = 769456591214DB630007CBAE /* DOMDOMTokenList.h */; };
                979F43D41075E44A0000F83B /* NavigationScheduler.h in Headers */ = {isa = PBXBuildFile; fileRef = 979F43D21075E44A0000F83B /* NavigationScheduler.h */; settings = {ATTRIBUTES = (Private, ); }; };
                97AA3CA5145237CC003E1DA6 /* EventTargetHeaders.h in Headers */ = {isa = PBXBuildFile; fileRef = 97AA3CA3145237CC003E1DA6 /* EventTargetHeaders.h */; };
                97AA3CA6145237CC003E1DA6 /* EventTargetInterfaces.h in Headers */ = {isa = PBXBuildFile; fileRef = 97AA3CA4145237CC003E1DA6 /* EventTargetInterfaces.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               97AABD1314FA09D5007457AE /* CloseEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 97AABCF814FA09D5007457AE /* CloseEvent.h */; };
+               97AABD1614FA09D5007457AE /* ThreadableWebSocketChannel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97AABCFB14FA09D5007457AE /* ThreadableWebSocketChannel.cpp */; };
+               97AABD1714FA09D5007457AE /* ThreadableWebSocketChannel.h in Headers */ = {isa = PBXBuildFile; fileRef = 97AABCFC14FA09D5007457AE /* ThreadableWebSocketChannel.h */; };
+               97AABD1814FA09D5007457AE /* ThreadableWebSocketChannelClientWrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97AABCFD14FA09D5007457AE /* ThreadableWebSocketChannelClientWrapper.cpp */; };
+               97AABD1914FA09D5007457AE /* ThreadableWebSocketChannelClientWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 97AABCFE14FA09D5007457AE /* ThreadableWebSocketChannelClientWrapper.h */; };
+               97AABD1A14FA09D5007457AE /* WebSocket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97AABCFF14FA09D5007457AE /* WebSocket.cpp */; };
+               97AABD1B14FA09D5007457AE /* WebSocket.h in Headers */ = {isa = PBXBuildFile; fileRef = 97AABD0014FA09D5007457AE /* WebSocket.h */; };
+               97AABD1D14FA09D5007457AE /* WebSocketChannel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97AABD0214FA09D5007457AE /* WebSocketChannel.cpp */; };
+               97AABD1E14FA09D5007457AE /* WebSocketChannel.h in Headers */ = {isa = PBXBuildFile; fileRef = 97AABD0314FA09D5007457AE /* WebSocketChannel.h */; };
+               97AABD1F14FA09D5007457AE /* WebSocketChannelClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 97AABD0414FA09D5007457AE /* WebSocketChannelClient.h */; };
+               97AABD2014FA09D5007457AE /* WebSocketDeflater.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97AABD0514FA09D5007457AE /* WebSocketDeflater.cpp */; };
+               97AABD2114FA09D5007457AE /* WebSocketDeflater.h in Headers */ = {isa = PBXBuildFile; fileRef = 97AABD0614FA09D5007457AE /* WebSocketDeflater.h */; };
+               97AABD2214FA09D5007457AE /* WebSocketExtensionDispatcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97AABD0714FA09D5007457AE /* WebSocketExtensionDispatcher.cpp */; };
+               97AABD2314FA09D5007457AE /* WebSocketExtensionDispatcher.h in Headers */ = {isa = PBXBuildFile; fileRef = 97AABD0814FA09D5007457AE /* WebSocketExtensionDispatcher.h */; };
+               97AABD2414FA09D5007457AE /* WebSocketExtensionProcessor.h in Headers */ = {isa = PBXBuildFile; fileRef = 97AABD0914FA09D5007457AE /* WebSocketExtensionProcessor.h */; };
+               97AABD2514FA09D5007457AE /* WebSocketFrame.h in Headers */ = {isa = PBXBuildFile; fileRef = 97AABD0A14FA09D5007457AE /* WebSocketFrame.h */; };
+               97AABD2614FA09D5007457AE /* WebSocketHandshake.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97AABD0B14FA09D5007457AE /* WebSocketHandshake.cpp */; };
+               97AABD2714FA09D5007457AE /* WebSocketHandshake.h in Headers */ = {isa = PBXBuildFile; fileRef = 97AABD0C14FA09D5007457AE /* WebSocketHandshake.h */; };
+               97AABD2814FA09D5007457AE /* WebSocketHandshakeRequest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97AABD0D14FA09D5007457AE /* WebSocketHandshakeRequest.cpp */; };
+               97AABD2914FA09D5007457AE /* WebSocketHandshakeRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 97AABD0E14FA09D5007457AE /* WebSocketHandshakeRequest.h */; };
+               97AABD2A14FA09D5007457AE /* WebSocketHandshakeResponse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97AABD0F14FA09D5007457AE /* WebSocketHandshakeResponse.cpp */; };
+               97AABD2B14FA09D5007457AE /* WebSocketHandshakeResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 97AABD1014FA09D5007457AE /* WebSocketHandshakeResponse.h */; };
+               97AABD2C14FA09D5007457AE /* WorkerThreadableWebSocketChannel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97AABD1114FA09D5007457AE /* WorkerThreadableWebSocketChannel.cpp */; };
+               97AABD2D14FA09D5007457AE /* WorkerThreadableWebSocketChannel.h in Headers */ = {isa = PBXBuildFile; fileRef = 97AABD1214FA09D5007457AE /* WorkerThreadableWebSocketChannel.h */; };
                97B1F02E13B025CA00F5103F /* SharedBufferChunkReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 37569E0013AF172C00CDBA8E /* SharedBufferChunkReader.cpp */; };
                97B1F02F13B025D200F5103F /* SharedBufferChunkReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 37569E0213AF172C00CDBA8E /* SharedBufferChunkReader.h */; };
                97BC84831236FD93000C6161 /* TextDocumentParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97BC84811236FD93000C6161 /* TextDocumentParser.cpp */; };
                A10BB58B1484E3B300B2E87A /* RenderSVGShape.h in Headers */ = {isa = PBXBuildFile; fileRef = A10BB5891484E3B300B2E87A /* RenderSVGShape.h */; };
                A10DC76A14747BAB005E2471 /* StyleGridData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A10DC76814747BAB005E2471 /* StyleGridData.cpp */; };
                A10DC76B14747BAB005E2471 /* StyleGridData.h in Headers */ = {isa = PBXBuildFile; fileRef = A10DC76914747BAB005E2471 /* StyleGridData.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               A110DB9D14F5DF8700A03B93 /* StyleGridItemData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A110DB9C14F5DF8700A03B93 /* StyleGridItemData.cpp */; };
                A110DB9B14F5DF7700A03B93 /* StyleGridItemData.h in Headers */ = {isa = PBXBuildFile; fileRef = A110DB9A14F5DF7700A03B93 /* StyleGridItemData.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               A110DB9D14F5DF8700A03B93 /* StyleGridItemData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A110DB9C14F5DF8700A03B93 /* StyleGridItemData.cpp */; };
                A120ACA413F998CA00FE4AC7 /* LayoutRepainter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A120ACA113F9984600FE4AC7 /* LayoutRepainter.cpp */; };
                A12538D413F9B60A00024754 /* LayoutRepainter.h in Headers */ = {isa = PBXBuildFile; fileRef = A120ACA013F9983700FE4AC7 /* LayoutRepainter.h */; settings = {ATTRIBUTES = (Private, ); }; };
                A136A00C1134DBD200CC8D50 /* XMLHttpRequestProgressEventThrottle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A136A00A1134DBD200CC8D50 /* XMLHttpRequestProgressEventThrottle.cpp */; };
                4A1E719414E101F900626F9D /* JSHTMLShadowElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSHTMLShadowElement.h; sourceTree = "<group>"; };
                4A1E71A314E106AC00626F9D /* JSShadowRoot.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSShadowRoot.cpp; sourceTree = "<group>"; };
                4A1E71A414E106AC00626F9D /* JSShadowRoot.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSShadowRoot.h; sourceTree = "<group>"; };
-               4A4A234514F1E1440046FBF1 /* WebSocketFrame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebSocketFrame.h; sourceTree = "<group>"; };
                4A6E9FC113C17D1D0046A7F8 /* FontFeatureValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FontFeatureValue.cpp; sourceTree = "<group>"; };
                4A6E9FC213C17D1D0046A7F8 /* FontFeatureValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FontFeatureValue.h; sourceTree = "<group>"; };
                4A6E9FC513C17D570046A7F8 /* FontFeatureSettings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FontFeatureSettings.cpp; sourceTree = "<group>"; };
                4A6E9FC613C17D570046A7F8 /* FontFeatureSettings.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; path = FontFeatureSettings.h; sourceTree = "<group>"; };
                4A8C96EA0BE69032004EEFF0 /* FrameSelectionMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; name = FrameSelectionMac.mm; path = mac/FrameSelectionMac.mm; sourceTree = "<group>"; };
-               4A957F0314E241100049DBFB /* WebSocketExtensionDispatcher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebSocketExtensionDispatcher.cpp; sourceTree = "<group>"; };
-               4A957F0414E241100049DBFB /* WebSocketExtensionDispatcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebSocketExtensionDispatcher.h; sourceTree = "<group>"; };
                4ABDFF0714DBE312004D117D /* HTMLShadowElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLShadowElement.cpp; sourceTree = "<group>"; };
                4ABDFF0814DBE312004D117D /* HTMLShadowElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTMLShadowElement.h; sourceTree = "<group>"; };
                4ABDFF0914DBE312004D117D /* HTMLShadowElement.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HTMLShadowElement.idl; sourceTree = "<group>"; };
                4AD01007127E642A0015035F /* HTMLOutputElement.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HTMLOutputElement.idl; sourceTree = "<group>"; };
                4AD0173A127E82860015035F /* JSHTMLOutputElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSHTMLOutputElement.cpp; sourceTree = "<group>"; };
                4AD0173B127E82860015035F /* JSHTMLOutputElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSHTMLOutputElement.h; sourceTree = "<group>"; };
-               4ADE25F914E3BB4C004C2213 /* WebSocketExtensionProcessor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebSocketExtensionProcessor.h; sourceTree = "<group>"; };
-               4AE02ABB14E8A9D200BC3BA7 /* WebSocketDeflater.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebSocketDeflater.cpp; sourceTree = "<group>"; };
-               4AE02ABC14E8A9D200BC3BA7 /* WebSocketDeflater.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebSocketDeflater.h; sourceTree = "<group>"; };
                4AF1AD3C13FD23A400AA9590 /* EventDispatchMediator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EventDispatchMediator.cpp; sourceTree = "<group>"; };
                4AF1AD3D13FD23A400AA9590 /* EventDispatchMediator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EventDispatchMediator.h; sourceTree = "<group>"; };
                4B2708C50AF19EE40065127F /* Pasteboard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Pasteboard.h; sourceTree = "<group>"; };
                510D4A30103165EE0049EA54 /* SocketStreamHandleBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SocketStreamHandleBase.cpp; sourceTree = "<group>"; };
                510D4A31103165EE0049EA54 /* SocketStreamHandleBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SocketStreamHandleBase.h; sourceTree = "<group>"; };
                510D4A32103165EE0049EA54 /* SocketStreamHandleClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SocketStreamHandleClient.h; sourceTree = "<group>"; };
-               510D4A47103177A20049EA54 /* WebSocketChannel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebSocketChannel.cpp; sourceTree = "<group>"; };
-               510D4A48103177A20049EA54 /* WebSocketChannel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebSocketChannel.h; sourceTree = "<group>"; };
-               510D4A49103177A20049EA54 /* WebSocketChannelClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebSocketChannelClient.h; sourceTree = "<group>"; };
-               510F078111FEBE7500B8EE49 /* ThreadableWebSocketChannelClientWrapper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ThreadableWebSocketChannelClientWrapper.cpp; sourceTree = "<group>"; };
-               5112247110CFB8C6008099D7 /* ThreadableWebSocketChannel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ThreadableWebSocketChannel.cpp; sourceTree = "<group>"; };
-               5112247310CFB8D8008099D7 /* ThreadableWebSocketChannel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThreadableWebSocketChannel.h; sourceTree = "<group>"; };
-               5112247510CFB8E8008099D7 /* ThreadableWebSocketChannelClientWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThreadableWebSocketChannelClientWrapper.h; sourceTree = "<group>"; };
-               5112247710CFB8F4008099D7 /* WorkerThreadableWebSocketChannel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WorkerThreadableWebSocketChannel.cpp; sourceTree = "<group>"; };
-               5112247910CFB8FF008099D7 /* WorkerThreadableWebSocketChannel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WorkerThreadableWebSocketChannel.h; sourceTree = "<group>"; };
                5116D9750CF177BD00C2B84D /* DatabaseDetails.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DatabaseDetails.h; sourceTree = "<group>"; };
                511F23130DC160DA004F0032 /* StorageTask.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StorageTask.cpp; sourceTree = "<group>"; };
                511F23140DC160DA004F0032 /* StorageTask.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StorageTask.h; sourceTree = "<group>"; };
                5189F01B10B37BD900F3C739 /* JSPopStateEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSPopStateEvent.cpp; sourceTree = "<group>"; };
                5189F01C10B37BD900F3C739 /* JSPopStateEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSPopStateEvent.h; sourceTree = "<group>"; };
                5189F0DD10B46B0E00F3C739 /* PopStateEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PopStateEvent.cpp; sourceTree = "<group>"; };
-               518A34BE1026C831001B6896 /* WebSocket.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebSocket.cpp; sourceTree = "<group>"; };
-               518A34BF1026C831001B6896 /* WebSocket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebSocket.h; sourceTree = "<group>"; };
-               518A34C01026C831001B6896 /* WebSocket.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WebSocket.idl; sourceTree = "<group>"; };
                518A34C61026C8C9001B6896 /* JSWebSocketCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWebSocketCustom.cpp; sourceTree = "<group>"; };
                5196115E0CAC56570010A80C /* Database.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Database.cpp; sourceTree = "<group>"; };
                5196115F0CAC56570010A80C /* Database.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Database.h; sourceTree = "<group>"; };
                51ABAE1A103C18FF008C5260 /* SocketStreamError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SocketStreamError.h; sourceTree = "<group>"; };
                51ABAE1C103C1913008C5260 /* SocketStreamHandle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SocketStreamHandle.h; sourceTree = "<group>"; };
                51ABAE1D103C1913008C5260 /* SocketStreamHandleCFNet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SocketStreamHandleCFNet.cpp; sourceTree = "<group>"; };
-               51ABAE421043AB4A008C5260 /* WebSocketHandshake.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebSocketHandshake.cpp; sourceTree = "<group>"; };
-               51ABAE431043AB4A008C5260 /* WebSocketHandshake.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebSocketHandshake.h; sourceTree = "<group>"; };
                51B2417A0D931F3F00E83F5C /* LegacyWebArchiveMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = LegacyWebArchiveMac.mm; sourceTree = "<group>"; };
                51BE37DE0DAEE00E001085FC /* StorageArea.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StorageArea.h; sourceTree = "<group>"; };
                51C0AA380F2AA10A001648C2 /* CachedFrame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CachedFrame.h; sourceTree = "<group>"; };
                51F6A3D50663BF04004D2919 /* HTMLCanvasElement.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLCanvasElement.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                51F6A3D60663BF04004D2919 /* HTMLCanvasElement.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = HTMLCanvasElement.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                51FAFE330CECBF2D00BB3F24 /* DatabaseTrackerClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DatabaseTrackerClient.h; sourceTree = "<group>"; };
-               51FB54F4113E364200821176 /* CloseEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CloseEvent.h; sourceTree = "<group>"; };
-               51FB54F6113E365900821176 /* CloseEvent.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CloseEvent.idl; sourceTree = "<group>"; };
                51FB5502113E3E9100821176 /* JSCloseEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCloseEvent.h; sourceTree = "<group>"; };
                51FB5503113E3E9100821176 /* JSCloseEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCloseEvent.cpp; sourceTree = "<group>"; };
                521D46F511AEC98100514613 /* KillRingMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KillRingMac.mm; sourceTree = "<group>"; };
                758978EB127090D60076D5A9 /* SpeechInputResult.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SpeechInputResult.h; sourceTree = "<group>"; };
                7633A72413D8B33A008501B6 /* LocaleToScriptMapping.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LocaleToScriptMapping.h; sourceTree = "<group>"; };
                7633A72513D8B33A008501B6 /* LocaleToScriptMappingDefault.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LocaleToScriptMappingDefault.cpp; sourceTree = "<group>"; };
-               7637C540112E7B74003D6CDC /* WebSocketHandshakeRequest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebSocketHandshakeRequest.cpp; sourceTree = "<group>"; };
-               7637C542112E7B7E003D6CDC /* WebSocketHandshakeRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebSocketHandshakeRequest.h; sourceTree = "<group>"; };
-               767F99BD11A1194A0080C51D /* WebSocketHandshakeResponse.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebSocketHandshakeResponse.cpp; sourceTree = "<group>"; };
-               767F99BF11A119560080C51D /* WebSocketHandshakeResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebSocketHandshakeResponse.h; sourceTree = "<group>"; };
                7694563A1214D97C0007CBAE /* JSDOMTokenList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDOMTokenList.cpp; sourceTree = "<group>"; };
                7694563B1214D97C0007CBAE /* JSDOMTokenList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSDOMTokenList.h; sourceTree = "<group>"; };
                769456591214DB630007CBAE /* DOMDOMTokenList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMDOMTokenList.h; sourceTree = "<group>"; };
                979F43D21075E44A0000F83B /* NavigationScheduler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NavigationScheduler.h; sourceTree = "<group>"; };
                97AA3CA3145237CC003E1DA6 /* EventTargetHeaders.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EventTargetHeaders.h; sourceTree = "<group>"; };
                97AA3CA4145237CC003E1DA6 /* EventTargetInterfaces.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EventTargetInterfaces.h; sourceTree = "<group>"; };
+               97AABCF814FA09D5007457AE /* CloseEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CloseEvent.h; path = Modules/websockets/CloseEvent.h; sourceTree = "<group>"; };
+               97AABCF914FA09D5007457AE /* CloseEvent.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CloseEvent.idl; path = Modules/websockets/CloseEvent.idl; sourceTree = "<group>"; };
+               97AABCFA14FA09D5007457AE /* DOMWindowWebSocket.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DOMWindowWebSocket.idl; path = Modules/websockets/DOMWindowWebSocket.idl; sourceTree = "<group>"; };
+               97AABCFB14FA09D5007457AE /* ThreadableWebSocketChannel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ThreadableWebSocketChannel.cpp; path = Modules/websockets/ThreadableWebSocketChannel.cpp; sourceTree = "<group>"; };
+               97AABCFC14FA09D5007457AE /* ThreadableWebSocketChannel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ThreadableWebSocketChannel.h; path = Modules/websockets/ThreadableWebSocketChannel.h; sourceTree = "<group>"; };
+               97AABCFD14FA09D5007457AE /* ThreadableWebSocketChannelClientWrapper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ThreadableWebSocketChannelClientWrapper.cpp; path = Modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp; sourceTree = "<group>"; };
+               97AABCFE14FA09D5007457AE /* ThreadableWebSocketChannelClientWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ThreadableWebSocketChannelClientWrapper.h; path = Modules/websockets/ThreadableWebSocketChannelClientWrapper.h; sourceTree = "<group>"; };
+               97AABCFF14FA09D5007457AE /* WebSocket.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebSocket.cpp; path = Modules/websockets/WebSocket.cpp; sourceTree = "<group>"; };
+               97AABD0014FA09D5007457AE /* WebSocket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebSocket.h; path = Modules/websockets/WebSocket.h; sourceTree = "<group>"; };
+               97AABD0114FA09D5007457AE /* WebSocket.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = WebSocket.idl; path = Modules/websockets/WebSocket.idl; sourceTree = "<group>"; };
+               97AABD0214FA09D5007457AE /* WebSocketChannel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebSocketChannel.cpp; path = Modules/websockets/WebSocketChannel.cpp; sourceTree = "<group>"; };
+               97AABD0314FA09D5007457AE /* WebSocketChannel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebSocketChannel.h; path = Modules/websockets/WebSocketChannel.h; sourceTree = "<group>"; };
+               97AABD0414FA09D5007457AE /* WebSocketChannelClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebSocketChannelClient.h; path = Modules/websockets/WebSocketChannelClient.h; sourceTree = "<group>"; };
+               97AABD0514FA09D5007457AE /* WebSocketDeflater.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebSocketDeflater.cpp; path = Modules/websockets/WebSocketDeflater.cpp; sourceTree = "<group>"; };
+               97AABD0614FA09D5007457AE /* WebSocketDeflater.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebSocketDeflater.h; path = Modules/websockets/WebSocketDeflater.h; sourceTree = "<group>"; };
+               97AABD0714FA09D5007457AE /* WebSocketExtensionDispatcher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebSocketExtensionDispatcher.cpp; path = Modules/websockets/WebSocketExtensionDispatcher.cpp; sourceTree = "<group>"; };
+               97AABD0814FA09D5007457AE /* WebSocketExtensionDispatcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebSocketExtensionDispatcher.h; path = Modules/websockets/WebSocketExtensionDispatcher.h; sourceTree = "<group>"; };
+               97AABD0914FA09D5007457AE /* WebSocketExtensionProcessor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebSocketExtensionProcessor.h; path = Modules/websockets/WebSocketExtensionProcessor.h; sourceTree = "<group>"; };
+               97AABD0A14FA09D5007457AE /* WebSocketFrame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebSocketFrame.h; path = Modules/websockets/WebSocketFrame.h; sourceTree = "<group>"; };
+               97AABD0B14FA09D5007457AE /* WebSocketHandshake.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebSocketHandshake.cpp; path = Modules/websockets/WebSocketHandshake.cpp; sourceTree = "<group>"; };
+               97AABD0C14FA09D5007457AE /* WebSocketHandshake.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebSocketHandshake.h; path = Modules/websockets/WebSocketHandshake.h; sourceTree = "<group>"; };
+               97AABD0D14FA09D5007457AE /* WebSocketHandshakeRequest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebSocketHandshakeRequest.cpp; path = Modules/websockets/WebSocketHandshakeRequest.cpp; sourceTree = "<group>"; };
+               97AABD0E14FA09D5007457AE /* WebSocketHandshakeRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebSocketHandshakeRequest.h; path = Modules/websockets/WebSocketHandshakeRequest.h; sourceTree = "<group>"; };
+               97AABD0F14FA09D5007457AE /* WebSocketHandshakeResponse.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebSocketHandshakeResponse.cpp; path = Modules/websockets/WebSocketHandshakeResponse.cpp; sourceTree = "<group>"; };
+               97AABD1014FA09D5007457AE /* WebSocketHandshakeResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebSocketHandshakeResponse.h; path = Modules/websockets/WebSocketHandshakeResponse.h; sourceTree = "<group>"; };
+               97AABD1114FA09D5007457AE /* WorkerThreadableWebSocketChannel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WorkerThreadableWebSocketChannel.cpp; path = Modules/websockets/WorkerThreadableWebSocketChannel.cpp; sourceTree = "<group>"; };
+               97AABD1214FA09D5007457AE /* WorkerThreadableWebSocketChannel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WorkerThreadableWebSocketChannel.h; path = Modules/websockets/WorkerThreadableWebSocketChannel.h; sourceTree = "<group>"; };
                97BC84811236FD93000C6161 /* TextDocumentParser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = TextDocumentParser.cpp; path = parser/TextDocumentParser.cpp; sourceTree = "<group>"; };
                97BC84821236FD93000C6161 /* TextDocumentParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TextDocumentParser.h; path = parser/TextDocumentParser.h; sourceTree = "<group>"; };
                97BC849A12370A4B000C6161 /* HTMLInputStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HTMLInputStream.h; path = parser/HTMLInputStream.h; sourceTree = "<group>"; };
                                B22277CA0D00BF1E0071B782 /* svg */,
                                417DA4CD13734204007C57FB /* testing */,
                                FD315FA212B025B100C1A359 /* webaudio */,
-                               518A34BD1026C831001B6896 /* websockets */,
                                2E4346310F546A6800B0F1BA /* workers */,
                                E1F0424309839389006694EA /* xml */,
                                656580EC09D12B20000E61D7 /* Derived Sources */,
                                B6566268120B115A006EA85C /* IDBTransaction.h */,
                                B6566269120B115A006EA85C /* IDBTransaction.idl */,
                                B656626D120B116B006EA85C /* IDBTransactionBackendInterface.h */,
-                               511F23130DC160DA004F0032 /* StorageTask.cpp */,
-                               511F23140DC160DA004F0032 /* StorageTask.h */,
-                               511F23150DC160DA004F0032 /* StorageThread.cpp */,
-                               511F23160DC160DA004F0032 /* StorageThread.h */,
                                51A926780D53F0570063ECC2 /* OriginQuotaManager.cpp */,
                                51A926790D53F0570063ECC2 /* OriginQuotaManager.h */,
                                51A9267A0D53F0570063ECC2 /* OriginUsageRecord.cpp */,
                                C55E38BB10040D5D00A56BDB /* StorageNamespaceImpl.h */,
                                C5102D930FD9AA2D00FAFF04 /* StorageSyncManager.cpp */,
                                C5102D920FD9AA2D00FAFF04 /* StorageSyncManager.h */,
+                               511F23130DC160DA004F0032 /* StorageTask.cpp */,
+                               511F23140DC160DA004F0032 /* StorageTask.h */,
+                               511F23150DC160DA004F0032 /* StorageThread.cpp */,
+                               511F23160DC160DA004F0032 /* StorageThread.h */,
                                3AB02D2912D4F91600FBB694 /* StorageTracker.cpp */,
                                3AB02D2812D4F91600FBB694 /* StorageTracker.h */,
                                3AC367FE12EF7A09006A3D6F /* StorageTrackerClient.h */,
                49484FAE102CF01E00187DD3 /* canvas */ = {
                        isa = PBXGroup;
                        children = (
-                               A83B535B14F7413A00720D9D /* DOMWindowWebGL.idl */,
                                49EECDCC10503C2300099FAB /* ArrayBuffer.idl */,
                                49EECDC910503C2300099FAB /* ArrayBufferView.idl */,
                                6E4E91A710F7FB3100A2779C /* CanvasContextAttributes.cpp */,
                                2E97CCE712939CB800C5C8FF /* DataView.cpp */,
                                2E97CCE812939CB800C5C8FF /* DataView.h */,
                                2E97CCE912939CB800C5C8FF /* DataView.idl */,
+                               A83B535B14F7413A00720D9D /* DOMWindowWebGL.idl */,
                                49EECDCF10503C2300099FAB /* Float32Array.idl */,
                                6EBC5D80138B4C4E00A0CF8A /* Float64Array.idl */,
                                49EECDD510503C2300099FAB /* Int16Array.idl */,
                        tabWidth = 4;
                        usesTabs = 0;
                };
-               518A34BD1026C831001B6896 /* websockets */ = {
-                       isa = PBXGroup;
-                       children = (
-                               51FB54F4113E364200821176 /* CloseEvent.h */,
-                               51FB54F6113E365900821176 /* CloseEvent.idl */,
-                               5112247110CFB8C6008099D7 /* ThreadableWebSocketChannel.cpp */,
-                               5112247310CFB8D8008099D7 /* ThreadableWebSocketChannel.h */,
-                               510F078111FEBE7500B8EE49 /* ThreadableWebSocketChannelClientWrapper.cpp */,
-                               5112247510CFB8E8008099D7 /* ThreadableWebSocketChannelClientWrapper.h */,
-                               518A34BE1026C831001B6896 /* WebSocket.cpp */,
-                               518A34BF1026C831001B6896 /* WebSocket.h */,
-                               518A34C01026C831001B6896 /* WebSocket.idl */,
-                               510D4A47103177A20049EA54 /* WebSocketChannel.cpp */,
-                               510D4A48103177A20049EA54 /* WebSocketChannel.h */,
-                               510D4A49103177A20049EA54 /* WebSocketChannelClient.h */,
-                               4AE02ABB14E8A9D200BC3BA7 /* WebSocketDeflater.cpp */,
-                               4AE02ABC14E8A9D200BC3BA7 /* WebSocketDeflater.h */,
-                               4A957F0314E241100049DBFB /* WebSocketExtensionDispatcher.cpp */,
-                               4A957F0414E241100049DBFB /* WebSocketExtensionDispatcher.h */,
-                               4ADE25F914E3BB4C004C2213 /* WebSocketExtensionProcessor.h */,
-                               4A4A234514F1E1440046FBF1 /* WebSocketFrame.h */,
-                               51ABAE421043AB4A008C5260 /* WebSocketHandshake.cpp */,
-                               51ABAE431043AB4A008C5260 /* WebSocketHandshake.h */,
-                               7637C540112E7B74003D6CDC /* WebSocketHandshakeRequest.cpp */,
-                               7637C542112E7B7E003D6CDC /* WebSocketHandshakeRequest.h */,
-                               767F99BD11A1194A0080C51D /* WebSocketHandshakeResponse.cpp */,
-                               767F99BF11A119560080C51D /* WebSocketHandshakeResponse.h */,
-                               5112247710CFB8F4008099D7 /* WorkerThreadableWebSocketChannel.cpp */,
-                               5112247910CFB8FF008099D7 /* WorkerThreadableWebSocketChannel.h */,
-                       );
-                       path = websockets;
-                       sourceTree = "<group>";
-               };
                599D1E2F10C97D4C00E0EF12 /* jsc */ = {
                        isa = PBXGroup;
                        children = (
                        isa = PBXGroup;
                        children = (
                                971145FF14EF007900674FD9 /* geolocation */,
+                               97AABCF714FA09B5007457AE /* websockets */,
                        );
                        name = Modules;
                        sourceTree = "<group>";
                        name = fileapi;
                        sourceTree = "<group>";
                };
+               97AABCF714FA09B5007457AE /* websockets */ = {
+                       isa = PBXGroup;
+                       children = (
+                               97AABCF814FA09D5007457AE /* CloseEvent.h */,
+                               97AABCF914FA09D5007457AE /* CloseEvent.idl */,
+                               97AABCFA14FA09D5007457AE /* DOMWindowWebSocket.idl */,
+                               97AABCFB14FA09D5007457AE /* ThreadableWebSocketChannel.cpp */,
+                               97AABCFC14FA09D5007457AE /* ThreadableWebSocketChannel.h */,
+                               97AABCFD14FA09D5007457AE /* ThreadableWebSocketChannelClientWrapper.cpp */,
+                               97AABCFE14FA09D5007457AE /* ThreadableWebSocketChannelClientWrapper.h */,
+                               97AABCFF14FA09D5007457AE /* WebSocket.cpp */,
+                               97AABD0014FA09D5007457AE /* WebSocket.h */,
+                               97AABD0114FA09D5007457AE /* WebSocket.idl */,
+                               97AABD0214FA09D5007457AE /* WebSocketChannel.cpp */,
+                               97AABD0314FA09D5007457AE /* WebSocketChannel.h */,
+                               97AABD0414FA09D5007457AE /* WebSocketChannelClient.h */,
+                               97AABD0514FA09D5007457AE /* WebSocketDeflater.cpp */,
+                               97AABD0614FA09D5007457AE /* WebSocketDeflater.h */,
+                               97AABD0714FA09D5007457AE /* WebSocketExtensionDispatcher.cpp */,
+                               97AABD0814FA09D5007457AE /* WebSocketExtensionDispatcher.h */,
+                               97AABD0914FA09D5007457AE /* WebSocketExtensionProcessor.h */,
+                               97AABD0A14FA09D5007457AE /* WebSocketFrame.h */,
+                               97AABD0B14FA09D5007457AE /* WebSocketHandshake.cpp */,
+                               97AABD0C14FA09D5007457AE /* WebSocketHandshake.h */,
+                               97AABD0D14FA09D5007457AE /* WebSocketHandshakeRequest.cpp */,
+                               97AABD0E14FA09D5007457AE /* WebSocketHandshakeRequest.h */,
+                               97AABD0F14FA09D5007457AE /* WebSocketHandshakeResponse.cpp */,
+                               97AABD1014FA09D5007457AE /* WebSocketHandshakeResponse.h */,
+                               97AABD1114FA09D5007457AE /* WorkerThreadableWebSocketChannel.cpp */,
+                               97AABD1214FA09D5007457AE /* WorkerThreadableWebSocketChannel.h */,
+                       );
+                       name = websockets;
+                       sourceTree = "<group>";
+               };
                97C1F5511228558800EDE616 /* parser */ = {
                        isa = PBXGroup;
                        children = (
                A8D2B2521287A56000AF4DDA /* cache */ = {
                        isa = PBXGroup;
                        children = (
-                               A104F24114C71F7A009E2C23 /* CachedSVGDocument.cpp */,
-                               A104F24214C71F7A009E2C23 /* CachedSVGDocument.h */,
                                BCB16C000979C3BD00467741 /* CachedCSSStyleSheet.cpp */,
                                BCB16C010979C3BD00467741 /* CachedCSSStyleSheet.h */,
                                BC64B4C90CB4295D005F2B62 /* CachedFont.cpp */,
                                5038BE3E1472AD980095E0D1 /* CachedShader.cpp */,
                                5038BE3F1472AD980095E0D1 /* CachedShader.h */,
                                D0BC54481443AC4A00E105DA /* CachedStyleSheetClient.h */,
+                               A104F24114C71F7A009E2C23 /* CachedSVGDocument.cpp */,
+                               A104F24214C71F7A009E2C23 /* CachedSVGDocument.h */,
                                0753860014489E9800B78452 /* CachedTextTrack.cpp */,
                                0753860114489E9800B78452 /* CachedTextTrack.h */,
                                BCB16C0E0979C3BD00467741 /* CachedXSLStyleSheet.cpp */,
                E1F0424309839389006694EA /* xml */ = {
                        isa = PBXGroup;
                        children = (
-                               A83B536C14F749E200720D9D /* DOMWindowXML.idl */,
                                00B9318013BA867F0035A948 /* parser */,
                                1ACE53E10A8D18E70022947D /* DOMParser.cpp */,
                                1ACE53E20A8D18E70022947D /* DOMParser.h */,
                                1ACE53E30A8D18E70022947D /* DOMParser.idl */,
+                               A83B536C14F749E200720D9D /* DOMWindowXML.idl */,
                                E10B9B6B0B747599003ED890 /* NativeXPathNSResolver.cpp */,
                                E10B9B6A0B747599003ED890 /* NativeXPathNSResolver.h */,
                                A833C7F60A2CF1D800D57664 /* xmlattrs.in */,
                                4B8AF4AA0B1CE02B00687690 /* ClipboardAccessPolicy.h in Headers */,
                                85031B400A44EFC700F992E0 /* ClipboardEvent.h in Headers */,
                                93F199E708245E59001E9ABC /* ClipboardMac.h in Headers */,
-                               51FB54F5113E364200821176 /* CloseEvent.h in Headers */,
+                               97AABD1314FA09D5007457AE /* CloseEvent.h in Headers */,
                                C0C054CB1118C8E400CE2636 /* CodeGenerator.pm in Headers */,
                                BC5EB5DF0E81B9AB00B25965 /* CollapsedBorderValue.h in Headers */,
                                93C442000F813AE100C1A634 /* CollectionType.h in Headers */,
                                A5732B0D136A16C4005C8D7C /* LocalizedDate.h in Headers */,
                                F5142C69123F12B000F5BD4C /* LocalizedNumber.h in Headers */,
                                935207BE09BD410A00F2038D /* LocalizedStrings.h in Headers */,
-                               511F23180DC160DA004F0032 /* StorageTask.h in Headers */,
-                               511F231A0DC160DA004F0032 /* StorageThread.h in Headers */,
                                BCE1C41B0D982980003B02F2 /* Location.h in Headers */,
                                A8239E0109B3CF8A00B60641 /* Logging.h in Headers */,
                                FD31603912B0267600C1A359 /* LowPass2FilterNode.h in Headers */,
                                C50D0E830FF4272900AC2644 /* StorageNamespace.h in Headers */,
                                C55E38BF10040D5D00A56BDB /* StorageNamespaceImpl.h in Headers */,
                                C5102D940FD9AA2D00FAFF04 /* StorageSyncManager.h in Headers */,
+                               511F23180DC160DA004F0032 /* StorageTask.h in Headers */,
+                               511F231A0DC160DA004F0032 /* StorageThread.h in Headers */,
                                3AB02D2A12D4F91600FBB694 /* StorageTracker.h in Headers */,
                                3AC3680012EF7A09006A3D6F /* StorageTrackerClient.h in Headers */,
                                81AC6C36131C57D30009A7E0 /* StringCallback.h in Headers */,
                                976D6C95122B8A3D001FD1F7 /* ThreadableBlobRegistry.h in Headers */,
                                0B90561B0F2578BF0095FF6A /* ThreadableLoader.h in Headers */,
                                0B90561C0F2578BF0095FF6A /* ThreadableLoaderClient.h in Headers */,
-                               5112247410CFB8D8008099D7 /* ThreadableWebSocketChannel.h in Headers */,
-                               5112247610CFB8E8008099D7 /* ThreadableWebSocketChannelClientWrapper.h in Headers */,
+                               97AABD1714FA09D5007457AE /* ThreadableWebSocketChannel.h in Headers */,
+                               97AABD1914FA09D5007457AE /* ThreadableWebSocketChannelClientWrapper.h in Headers */,
                                51DF6D7E0B92A16D00C2DC85 /* ThreadCheck.h in Headers */,
                                E1FF57A30F01255B00891EBB /* ThreadGlobalData.h in Headers */,
                                185BCF290F3279CE000EA262 /* ThreadTimers.h in Headers */,
                                1CAF34810A6C405200ABE06E /* WebScriptObject.h in Headers */,
                                1A569D1B0D7E2B82007C3983 /* WebScriptObject.h in Headers */,
                                1CAF34830A6C405200ABE06E /* WebScriptObjectPrivate.h in Headers */,
-                               518A34C21026C831001B6896 /* WebSocket.h in Headers */,
-                               510D4A4F103177A20049EA54 /* WebSocketChannel.h in Headers */,
-                               510D4A50103177A20049EA54 /* WebSocketChannelClient.h in Headers */,
-                               4AE02ABE14E8A9D200BC3BA7 /* WebSocketDeflater.h in Headers */,
-                               4A957F0714E241300049DBFB /* WebSocketExtensionDispatcher.h in Headers */,
-                               4ADE25FA14E3BB4C004C2213 /* WebSocketExtensionProcessor.h in Headers */,
-                               4A4A234614F1E1440046FBF1 /* WebSocketFrame.h in Headers */,
-                               51ABAE451043AB4A008C5260 /* WebSocketHandshake.h in Headers */,
-                               7637C543112E7B7E003D6CDC /* WebSocketHandshakeRequest.h in Headers */,
-                               767F99C011A119560080C51D /* WebSocketHandshakeResponse.h in Headers */,
+                               97AABD1B14FA09D5007457AE /* WebSocket.h in Headers */,
+                               97AABD1E14FA09D5007457AE /* WebSocketChannel.h in Headers */,
+                               97AABD1F14FA09D5007457AE /* WebSocketChannelClient.h in Headers */,
+                               97AABD2114FA09D5007457AE /* WebSocketDeflater.h in Headers */,
+                               97AABD2314FA09D5007457AE /* WebSocketExtensionDispatcher.h in Headers */,
+                               97AABD2414FA09D5007457AE /* WebSocketExtensionProcessor.h in Headers */,
+                               97AABD2514FA09D5007457AE /* WebSocketFrame.h in Headers */,
+                               97AABD2714FA09D5007457AE /* WebSocketHandshake.h in Headers */,
+                               97AABD2914FA09D5007457AE /* WebSocketHandshakeRequest.h in Headers */,
+                               97AABD2B14FA09D5007457AE /* WebSocketHandshakeResponse.h in Headers */,
                                0F580FA31496939100FB5BD8 /* WebTileCacheLayer.h in Headers */,
                                0FCF332D0F2B9A25004B6795 /* WebTiledLayer.h in Headers */,
                                CD82030A1395AB6A00F956C6 /* WebVideoFullscreenController.h in Headers */,
                                2EA768040FE7126400AB9C8A /* WorkerScriptLoaderClient.h in Headers */,
                                2E4346550F546A8200B0F1BA /* WorkerThread.h in Headers */,
                                0B9056F90F2685F30095FF6A /* WorkerThreadableLoader.h in Headers */,
-                               5112247A10CFB8FF008099D7 /* WorkerThreadableWebSocketChannel.h in Headers */,
+                               97AABD2D14FA09D5007457AE /* WorkerThreadableWebSocketChannel.h in Headers */,
                                93309E24099E64920056E581 /* WrapContentsInDummySpanCommand.h in Headers */,
                                9BAF3B2412C1A39800014BF1 /* WritingDirection.h in Headers */,
                                6565820209D1508D000E61D7 /* XLinkNames.h in Headers */,
                                F5CC42DC12F801CA00D5F7E3 /* LocalizedNumberMac.mm in Sources */,
                                C046E1AC1208A9FE00BA2CF7 /* LocalizedStrings.cpp in Sources */,
                                BC25B52A131C6D3900180E10 /* LocalizedStringsMac.mm in Sources */,
-                               511F23170DC160DA004F0032 /* StorageTask.cpp in Sources */,
-                               511F23190DC160DA004F0032 /* StorageThread.cpp in Sources */,
                                BCE1C41C0D982981003B02F2 /* Location.cpp in Sources */,
                                A8239E0009B3CF8A00B60641 /* Logging.cpp in Sources */,
                                1402645E0AFDC19B005919E2 /* LoggingMac.mm in Sources */,
                                C50D0E820FF4272900AC2644 /* StorageNamespace.cpp in Sources */,
                                C55E38C010040D5D00A56BDB /* StorageNamespaceImpl.cpp in Sources */,
                                C5102D950FD9AA2D00FAFF04 /* StorageSyncManager.cpp in Sources */,
+                               511F23170DC160DA004F0032 /* StorageTask.cpp in Sources */,
+                               511F23190DC160DA004F0032 /* StorageThread.cpp in Sources */,
                                3AB02D2B12D4F91600FBB694 /* StorageTracker.cpp in Sources */,
                                B2C3DA300D006C1D00EF6F26 /* String.cpp in Sources */,
                                8102C5881325BB1100DDE67A /* StringCallback.cpp in Sources */,
                                BCE659E90EA92FFA007E4533 /* ThemeMac.mm in Sources */,
                                976D6C94122B8A3D001FD1F7 /* ThreadableBlobRegistry.cpp in Sources */,
                                0B90561E0F257E930095FF6A /* ThreadableLoader.cpp in Sources */,
-                               5112247210CFB8C6008099D7 /* ThreadableWebSocketChannel.cpp in Sources */,
-                               510F079B11FEE9C000B8EE49 /* ThreadableWebSocketChannelClientWrapper.cpp in Sources */,
+                               97AABD1614FA09D5007457AE /* ThreadableWebSocketChannel.cpp in Sources */,
+                               97AABD1814FA09D5007457AE /* ThreadableWebSocketChannelClientWrapper.cpp in Sources */,
                                51DF6D800B92A18E00C2DC85 /* ThreadCheck.mm in Sources */,
                                E1FF57A60F01256B00891EBB /* ThreadGlobalData.cpp in Sources */,
                                185BCF280F3279CE000EA262 /* ThreadTimers.cpp in Sources */,
                                0FCF332E0F2B9A25004B6795 /* WebLayer.mm in Sources */,
                                E1A3162E134BC32D007C9A4F /* WebNSAttributedStringExtras.mm in Sources */,
                                1CAF34820A6C405200ABE06E /* WebScriptObject.mm in Sources */,
-                               518A34C11026C831001B6896 /* WebSocket.cpp in Sources */,
-                               510D4A4E103177A20049EA54 /* WebSocketChannel.cpp in Sources */,
-                               4AE02ABD14E8A9D200BC3BA7 /* WebSocketDeflater.cpp in Sources */,
-                               4A957F0614E2412A0049DBFB /* WebSocketExtensionDispatcher.cpp in Sources */,
-                               51ABAE441043AB4A008C5260 /* WebSocketHandshake.cpp in Sources */,
-                               7637C541112E7B74003D6CDC /* WebSocketHandshakeRequest.cpp in Sources */,
-                               767F99BE11A1194A0080C51D /* WebSocketHandshakeResponse.cpp in Sources */,
+                               97AABD1A14FA09D5007457AE /* WebSocket.cpp in Sources */,
+                               97AABD1D14FA09D5007457AE /* WebSocketChannel.cpp in Sources */,
+                               97AABD2014FA09D5007457AE /* WebSocketDeflater.cpp in Sources */,
+                               97AABD2214FA09D5007457AE /* WebSocketExtensionDispatcher.cpp in Sources */,
+                               97AABD2614FA09D5007457AE /* WebSocketHandshake.cpp in Sources */,
+                               97AABD2814FA09D5007457AE /* WebSocketHandshakeRequest.cpp in Sources */,
+                               97AABD2A14FA09D5007457AE /* WebSocketHandshakeResponse.cpp in Sources */,
                                0F580FA41496939100FB5BD8 /* WebTileCacheLayer.mm in Sources */,
                                0FCF332C0F2B9A25004B6795 /* WebTiledLayer.mm in Sources */,
                                1AA7161E149BF2FA0016EC19 /* WebTileLayer.mm in Sources */,
                                A7D6B34A0F61104500B79FD1 /* WorkerScriptLoader.cpp in Sources */,
                                2E4346540F546A8200B0F1BA /* WorkerThread.cpp in Sources */,
                                0B9056F80F2685F30095FF6A /* WorkerThreadableLoader.cpp in Sources */,
-                               5112247810CFB8F4008099D7 /* WorkerThreadableWebSocketChannel.cpp in Sources */,
+                               97AABD2C14FA09D5007457AE /* WorkerThreadableWebSocketChannel.cpp in Sources */,
                                93309E23099E64920056E581 /* WrapContentsInDummySpanCommand.cpp in Sources */,
                                A833C7CC0A2CF07400D57664 /* XLinkNames.cpp in Sources */,
                                00D0464A13C4D14500326FCC /* XMLCharacterReferenceParser.cpp in Sources */,
index f1960eb..14c91fd 100644 (file)
@@ -34,7 +34,7 @@
 #include "AbstractDatabase.h"
 #include "RuntimeEnabledFeatures.h"
 #include "WebMediaPlayerClientImpl.h"
-#include "websockets/WebSocket.h"
+#include "Modules/websockets/WebSocket.h"
 
 #include <wtf/UnusedParam.h>
 
index 0d95206..63f9ff9 100644 (file)
@@ -100,6 +100,7 @@ jscore_dirs = [
 ]
 
 webcore_dirs_common = [
+    'Source/WebCore/Modules/websockets',
     'Source/WebCore/accessibility',
     'Source/WebCore/bindings',
     'Source/WebCore/bindings/cpp',
@@ -161,7 +162,6 @@ webcore_dirs_common = [
     'Source/WebCore/svg/properties',
     'Source/WebCore/testing',
     'Source/WebCore/testing/js',
-    'Source/WebCore/websockets',
     'Source/WebCore/xml',
     'Source/WebCore/xml/parser',
 ]