Bug 254221 – Move SocketStreamHandle and WebSocketChannel to WebKitLegacy

• Status: RESOLVED
• Resolution: FIXED
• Component: WebKit Misc.

[Alex Christensen]

...

[Radar WebKit Bug Importer]

<rdar://problem/107003946>

[Alex Christensen]

Pull request: https://github.com/WebKit/WebKit/pull/11764

[EWS]

Committed 261973@main (b1f1fbf2ed7c): <https://commits.webkit.org/261973@main>

Reviewed commits have been landed. Closing PR #11764 and removing active labels.

[Fujii Hironori]

Re-opening for pull request https://github.com/WebKit/WebKit/pull/11823

[EWS]

Committed 261992@main (85e2965af7e4): <https://commits.webkit.org/261992@main>

Reviewed commits have been landed. Closing PR #11823 and removing active labels.

[Fujii Hironori]

*** Bug 254201 has been marked as a duplicate of this bug. ***

[Diego Pino]

Re-opening for pull request https://github.com/webkit/webkit/pull/11839

[Diego Pino]

Debian Stable post-commit bot was failing after this patch:

https://build.webkit.org/#/builders/46/builds/28601

```
FAILED: Source/WebKit/CMakeFiles/WebKit.dir/__/__/DerivedSources/WebKit/unified-sources/UnifiedSource-72468c22-11.cpp.o 
/bin/ccache /usr/lib/ccache/c++ -DBUILDING_GTK__=1 -DBUILDING_WEBKIT=1 -DBUILDING_WITH_CMAKE=1 -DBUILDING_WebKit -DBWRAP_EXECUTABLE=\"/bin/bwrap\" -DDATADIR=\"/app/webkit/WebKitBuild/Release/install/share\" -DDBUS_PROXY_EXECUTABLE=\"/bin/xdg-dbus-proxy\" -DGETTEXT_PACKAGE=\"WebKitGTK-4.0\" -DHAVE_CONFIG_H=1 -DJSC_GLIB_API_ENABLED -DLIBDIR=\"/app/webkit/WebKitBuild/Release/install/lib\" -DLOCALEDIR=\"/app/webkit/WebKitBuild/Release/install/share/locale\" -DPAS_BMALLOC=1 -DPKGLIBDIR=\"/app/webkit/WebKitBuild/Release/install/lib/webkit2gtk-4.0\" -DPKGLIBEXECDIR=\"/app/webkit/WebKitBuild/Release/install/libexec/webkit2gtk-4.0\" -DSTATICALLY_LINKED_WITH_PAL -DSTATICALLY_LINKED_WITH_WebCore -DUSE_SYSTEM_EGL -DWEBKIT_DOM_USE_UNSTABLE_API -DWebKit_EXPORTS -IWebKitGTK/Headers -IWebKitGTK/Headers/webkitgtk-4.0 -IWebKitGTK/Headers/webkitgtk-web-process-extension -IWebKitGTK/DerivedSources/webkit -IWebKitGTK/DerivedSources -IPAL/Headers -IWebCore/PrivateHeaders -IDerivedSources/ForwardingHeaders -IDerivedSources/WebKit -IDerivedSources/WebKit/include -I../../Source/WebKit -I../../Source/WebKit/GPUProcess -I../../Source/WebKit/GPUProcess/graphics -I../../Source/WebKit/GPUProcess/graphics/WebGPU -I../../Source/WebKit/GPUProcess/media -I../../Source/WebKit/GPUProcess/webrtc -I../../Source/WebKit/NetworkProcess -I../../Source/WebKit/NetworkProcess/Classifier -I../../Source/WebKit/NetworkProcess/Cookies -I../../Source/WebKit/NetworkProcess/CustomProtocols -I../../Source/WebKit/NetworkProcess/Downloads -I../../Source/WebKit/NetworkProcess/FileAPI -I../../Source/WebKit/NetworkProcess/IndexedDB -I../../Source/WebKit/NetworkProcess/Notifications -I../../Source/WebKit/NetworkProcess/PrivateClickMeasurement -I../../Source/WebKit/NetworkProcess/ServiceWorker -I../../Source/WebKit/NetworkProcess/SharedWorker -I../../Source/WebKit/NetworkProcess/cache -I../../Source/WebKit/NetworkProcess/storage -I../../Source/WebKit/NetworkProcess/watchos -I../../Source/WebKit/NetworkProcess/webrtc -I../../Source/WebKit/Platform -I../../Source/WebKit/Platform/IPC -I../../Source/WebKit/PluginProcess -I../../Source/WebKit/Shared -I../../Source/WebKit/Shared/API -I../../Source/WebKit/Shared/API/c -I../../Source/WebKit/Shared/ApplePay -I../../Source/WebKit/Shared/Authentication -I../../Source/WebKit/Shared/CoreIPCSupport -I../../Source/WebKit/Shared/Databases -I../../Source/WebKit/Shared/Databases/IndexedDB -I../../Source/WebKit/Shared/FileAPI -I../../Source/WebKit/Shared/Gamepad -I../../Source/WebKit/Shared/Notifications -I../../Source/WebKit/Shared/Plugins -I../../Source/WebKit/Shared/Plugins/Netscape -I../../Source/WebKit/Shared/Plugins/Netscape/x11 -I../../Source/WebKit/Shared/RemoteLayerTree -I../../Source/WebKit/Shared/WebGPU -I../../Source/WebKit/Shared/WebsiteData -I../../Source/WebKit/Shared/XR -I../../Source/WebKit/UIProcess -I../../Source/WebKit/UIProcess/API -I../../Source/WebKit/UIProcess/API/C -I../../Source/WebKit/UIProcess/API/cpp -I../../Source/WebKit/UIProcess/Authentication -I../../Source/WebKit/UIProcess/Automation -I../../Source/WebKit/UIProcess/Downloads -I../../Source/WebKit/UIProcess/Gamepad -I../../Source/WebKit/UIProcess/GPU -I../../Source/WebKit/UIProcess/Inspector -I../../Source/WebKit/UIProcess/Inspector/Agents -I../../Source/WebKit/UIProcess/Launcher -I../../Source/WebKit/UIProcess/Media -I../../Source/WebKit/UIProcess/Network -I../../Source/WebKit/UIProcess/Network/CustomProtocols -I../../Source/WebKit/UIProcess/Notifications -I../../Source/WebKit/UIProcess/Plugins -I../../Source/WebKit/UIProcess/RemoteLayerTree -I../../Source/WebKit/UIProcess/UserContent -I../../Source/WebKit/UIProcess/WebAuthentication -I../../Source/WebKit/UIProcess/WebAuthentication/Mock -I../../Source/WebKit/UIProcess/WebsiteData -I../../Source/WebKit/UIProcess/XR -I../../Source/WebKit/WebProcess -I../../Source/WebKit/WebProcess/ApplePay -I../../Source/WebKit/WebProcess/ApplicationCache -I../../Source/WebKit/WebProcess/Automation -I../../Source/WebKit/WebProcess/Cache -I../../Source/WebKit/WebProcess/Databases -I../../Source/WebKit/WebProcess/Databases/IndexedDB -I../../Source/WebKit/WebProcess/EncryptedMedia -I../../Source/WebKit/WebProcess/FileAPI -I../../Source/WebKit/WebProcess/FullScreen -I../../Source/WebKit/WebProcess/Gamepad -I../../Source/WebKit/WebProcess/Geolocation -I../../Source/WebKit/WebProcess/GPU -I../../Source/WebKit/WebProcess/GPU/graphics -I../../Source/WebKit/WebProcess/GPU/graphics/WebGPU -I../../Source/WebKit/WebProcess/GPU/media -I../../Source/WebKit/WebProcess/GPU/webrtc -I../../Source/WebKit/WebProcess/IconDatabase -I../../Source/WebKit/WebProcess/InjectedBundle -I../../Source/WebKit/WebProcess/InjectedBundle/API -I../../Source/WebKit/WebProcess/InjectedBundle/API/c -I../../Source/WebKit/WebProcess/InjectedBundle/DOM -I../../Source/WebKit/WebProcess/Inspector -I../../Source/WebKit/WebProcess/Launching -I../../Source/WebKit/WebProcess/MediaCache -I../../Source/WebKit/WebProcess/MediaStream -I../../Source/WebKit/WebProcess/Model -I../../Source/WebKit/WebProcess/Network -I../../Source/WebKit/WebProcess/Network/webrtc -I../../Source/WebKit/WebProcess/Notifications -I../../Source/WebKit/WebProcess/OriginData -I../../Source/WebKit/WebProcess/Plugins -I../../Source/WebKit/WebProcess/Plugins/Netscape -I../../Source/WebKit/WebProcess/ResourceCache -I../../Source/WebKit/WebProcess/Speech -I../../Source/WebKit/WebProcess/Storage -I../../Source/WebKit/WebProcess/UserContent -I../../Source/WebKit/WebProcess/WebCoreSupport -I../../Source/WebKit/WebProcess/WebPage -I../../Source/WebKit/WebProcess/WebPage/RemoteLayerTree -I../../Source/WebKit/WebProcess/WebStorage -I../../Source/WebKit/WebProcess/XR -I../../Source -I../../WebKitLibraries -I../../Source/WebKit/WebProcess/InjectedBundle/API/glib/DOM -I../../Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM -I../../Source/WebKit/NetworkProcess/glib -I../../Source/WebKit/NetworkProcess/gtk -I../../Source/WebKit/NetworkProcess/soup -I../../Source/WebKit/Platform/IPC/glib -I../../Source/WebKit/Platform/IPC/unix -I../../Source/WebKit/Platform/classifier -I../../Source/WebKit/Platform/generic -I../../Source/WebKit/Shared/API/c/gtk -I../../Source/WebKit/Shared/API/glib -I../../Source/WebKit/Shared/CoordinatedGraphics -I../../Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor -I../../Source/WebKit/Shared/glib -I../../Source/WebKit/Shared/gtk -I../../Source/WebKit/Shared/linux -I../../Source/WebKit/Shared/soup -I../../Source/WebKit/UIProcess/API/C/cairo -I../../Source/WebKit/UIProcess/API/C/glib -I../../Source/WebKit/UIProcess/API/C/gtk -I../../Source/WebKit/UIProcess/API/glib -I../../Source/WebKit/UIProcess/API/gtk -I../../Source/WebKit/UIProcess/CoordinatedGraphics -I../../Source/WebKit/UIProcess/Inspector/glib -I../../Source/WebKit/UIProcess/Inspector/gtk -I../../Source/WebKit/UIProcess/Notifications/glib -I../../Source/WebKit/UIProcess/geoclue -I../../Source/WebKit/UIProcess/glib -I../../Source/WebKit/UIProcess/gstreamer -I../../Source/WebKit/UIProcess/gtk -I../../Source/WebKit/UIProcess/linux -I../../Source/WebKit/UIProcess/soup -I../../Source/WebKit/WebProcess/InjectedBundle/API/glib -I../../Source/WebKit/WebProcess/InjectedBundle/API/gtk -I../../Source/WebKit/WebProcess/Inspector/gtk -I../../Source/WebKit/WebProcess/glib -I../../Source/WebKit/WebProcess/gtk -I../../Source/WebKit/WebProcess/soup -I../../Source/WebKit/WebProcess/WebCoreSupport/gtk -I../../Source/WebKit/WebProcess/WebCoreSupport/soup -I../../Source/WebKit/WebProcess/WebPage/CoordinatedGraphics -I../../Source/WebKit/WebProcess/WebPage/gtk -I../../Source/WebKit/WebProcess/WebPage/libwpe -I. -IJavaScriptCoreGLib/DerivedSources/jsc -IJavaScriptCore/Headers -IJavaScriptCore/PrivateHeaders -IJavaScriptCoreGLib/Headers -IJavaScriptCoreGLib/DerivedSources -IWTF/Headers -Ibmalloc/Headers -IANGLE/Headers -isystem /usr/include/enchant -isystem /usr/include/gio-unix-2.0 -isystem /usr/include/libmount -isystem /usr/include/blkid -isystem /usr/include/glib-2.0 -isystem /usr/lib/x86_64-linux-gnu/glib-2.0/include -isystem /usr/include/gstreamer-1.0 -isystem /usr/include/orc-0.4 -isystem /usr/include/gtk-3.0 -isystem /usr/include/at-spi2-atk/2.0 -isystem /usr/include/at-spi-2.0 -isystem /usr/include/dbus-1.0 -isystem /usr/lib/x86_64-linux-gnu/dbus-1.0/include -isystem /usr/include/cairo -isystem /usr/include/pango-1.0 -isystem /usr/include/fribidi -isystem /usr/include/harfbuzz -isystem /usr/include/atk-1.0 -isystem /usr/include/pixman-1 -isystem /usr/include/uuid -isystem /usr/include/freetype2 -isystem /usr/include/libpng16 -isystem /usr/include/gdk-pixbuf-2.0 -isystem /usr/include/libsoup-2.4 -isystem /usr/include/wpe-fdo-1.0 -isystem /usr/include/wpe-1.0 -isystem /usr/include/gtk-3.0/unix-print -isystem /usr/include/libxml2 -isystem /usr/include/openjpeg-2.4 -fdiagnostics-color=always -Wextra -Wall -pipe -fmax-errors=20 -Wno-odr -Wno-stringop-overflow -Wno-nonnull -Wno-array-bounds -Wno-expansion-to-defined -Wno-noexcept-type -Wno-uninitialized -Wno-psabi -Wno-misleading-indentation -Wno-maybe-uninitialized -Wundef -Wpointer-arith -Wmissing-format-attribute -Wformat-security -Wcast-align -Wno-tautological-compare  -fno-strict-aliasing -fno-exceptions -fno-rtti -O3 -DNDEBUG -fPIC -fvisibility=hidden  -include /home/buildbot/worker/GTK-Linux-64-bit-Release-Debian-Stable-Build/build/Source/WebKit/WebKit2Prefix.h -Wno-unused-parameter -DWPE_ENABLE_XKB=1 -pthread -std=c++2a -MD -MT Source/WebKit/CMakeFiles/WebKit.dir/__/__/DerivedSources/WebKit/unified-sources/UnifiedSource-72468c22-11.cpp.o -MF Source/WebKit/CMakeFiles/WebKit.dir/__/__/DerivedSources/WebKit/unified-sources/UnifiedSource-72468c22-11.cpp.o.d -o Source/WebKit/CMakeFiles/WebKit.dir/__/__/DerivedSources/WebKit/unified-sources/UnifiedSource-72468c22-11.cpp.o -c DerivedSources/WebKit/unified-sources/UnifiedSource-72468c22-11.cpp
In file included from DerivedSources/WebKit/unified-sources/UnifiedSource-72468c22-11.cpp:3:
../../Source/WebKit/NetworkProcess/soup/WebSocketTaskSoup.cpp:37:10: fatal error: WebCore/WebSocketChannel.h: No such file or directory
   37 | #include <WebCore/WebSocketChannel.h>
      |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
compilation terminated.
```

[EWS]

Committed 261997@main (42e03d8a173e): <https://commits.webkit.org/261997@main>

Reviewed commits have been landed. Closing PR #11839 and removing active labels.