Branch: refs/heads/main Home: https://github.com/WebKit/WebKit Commit: b1f1fbf2ed7c2415e59354cc49d7e76cff5d9d67 https://github.com/WebKit/WebKit/commit/b1f1fbf2ed7c2415e59354cc49d7e76cff5d9d67 Author: Alex Christensen <achristen...@apple.com> Date: 2023-03-22 (Wed, 22 Mar 2023)
Changed paths: M Source/WebCore/Headers.cmake M Source/WebCore/Modules/websockets/ThreadableWebSocketChannel.cpp M Source/WebCore/Modules/websockets/ThreadableWebSocketChannel.h M Source/WebCore/Modules/websockets/WebSocket.cpp R Source/WebCore/Modules/websockets/WebSocketChannel.cpp R Source/WebCore/Modules/websockets/WebSocketChannel.h M Source/WebCore/Modules/websockets/WebSocketHandshake.h M Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.cpp M Source/WebCore/PlatformMac.cmake M Source/WebCore/Sources.txt M Source/WebCore/SourcesCocoa.txt M Source/WebCore/WebCore.xcodeproj/project.pbxproj M Source/WebCore/dom/Document.h A Source/WebCore/inspector/LegacyWebSocketInspectorInstrumentation.cpp A Source/WebCore/inspector/LegacyWebSocketInspectorInstrumentation.h M Source/WebCore/inspector/agents/InspectorNetworkAgent.cpp M Source/WebCore/inspector/agents/page/PageNetworkAgent.cpp M Source/WebCore/loader/EmptyClients.cpp R Source/WebCore/page/SocketProvider.cpp M Source/WebCore/page/SocketProvider.h M Source/WebCore/platform/Curl.cmake M Source/WebCore/platform/Soup.cmake R Source/WebCore/platform/network/SocketStreamHandle.cpp R Source/WebCore/platform/network/SocketStreamHandle.h R Source/WebCore/platform/network/SocketStreamHandleClient.h R Source/WebCore/platform/network/SocketStreamHandleImpl.cpp R Source/WebCore/platform/network/cf/SocketStreamHandleImpl.h R Source/WebCore/platform/network/cf/SocketStreamHandleImplCFNet.cpp R Source/WebCore/platform/network/curl/SocketStreamHandleImpl.h R Source/WebCore/platform/network/soup/SocketStreamHandleImpl.h M Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm M Source/WebKit/NetworkProcess/cocoa/WebSocketTaskCocoa.mm M Source/WebKit/WebProcess/Network/WebSocketChannel.cpp M Source/WebKitLegacy/Sources.txt A Source/WebKitLegacy/WebCoreSupport/LegacySocketProvider.cpp A Source/WebKitLegacy/WebCoreSupport/LegacySocketProvider.h A Source/WebKitLegacy/WebCoreSupport/SocketStreamHandle.cpp A Source/WebKitLegacy/WebCoreSupport/SocketStreamHandle.h A Source/WebKitLegacy/WebCoreSupport/SocketStreamHandleClient.h A Source/WebKitLegacy/WebCoreSupport/SocketStreamHandleImpl.cpp A Source/WebKitLegacy/WebCoreSupport/SocketStreamHandleImpl.h A Source/WebKitLegacy/WebCoreSupport/SocketStreamHandleImplCFNet.cpp A Source/WebKitLegacy/WebCoreSupport/WebSocketChannel.cpp A Source/WebKitLegacy/WebCoreSupport/WebSocketChannel.h M Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj M Source/WebKitLegacy/mac/WebView/WebView.mm Log Message: ----------- Move SocketStreamHandle and WebSocketChannel to WebKitLegacy https://bugs.webkit.org/show_bug.cgi?id=254221 rdar://107003946 Reviewed by Youenn Fablet. * Source/WebCore/Headers.cmake: * Source/WebCore/Modules/websockets/ThreadableWebSocketChannel.cpp: * Source/WebCore/Modules/websockets/ThreadableWebSocketChannel.h: * Source/WebCore/Modules/websockets/WebSocket.cpp: (WebCore::WebSocket::close): (WebCore::WebSocket::didConnect): (WebCore::WebSocket::didClose): * Source/WebCore/Modules/websockets/WebSocketHandshake.h: * Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.cpp: * Source/WebCore/PlatformMac.cmake: * Source/WebCore/Sources.txt: * Source/WebCore/SourcesCocoa.txt: * Source/WebCore/WebCore.xcodeproj/project.pbxproj: * Source/WebCore/dom/Document.h: * Source/WebCore/inspector/LegacyWebSocketInspectorInstrumentation.cpp: Added. (WebCore::LegacyWebSocketInspectorInstrumentation::hasFrontends): (WebCore::LegacyWebSocketInspectorInstrumentation::didCreateWebSocket): (WebCore::LegacyWebSocketInspectorInstrumentation::willSendWebSocketHandshakeRequest): (WebCore::LegacyWebSocketInspectorInstrumentation::didReceiveWebSocketHandshakeResponse): (WebCore::LegacyWebSocketInspectorInstrumentation::didCloseWebSocket): (WebCore::LegacyWebSocketInspectorInstrumentation::didReceiveWebSocketFrame): (WebCore::LegacyWebSocketInspectorInstrumentation::didSendWebSocketFrame): (WebCore::LegacyWebSocketInspectorInstrumentation::didReceiveWebSocketFrameError): * Source/WebCore/inspector/LegacyWebSocketInspectorInstrumentation.h: Added. * Source/WebCore/inspector/agents/InspectorNetworkAgent.cpp: * Source/WebCore/inspector/agents/page/PageNetworkAgent.cpp: * Source/WebCore/page/SocketProvider.cpp: (WebCore::SocketProvider::createWebSocketChannel): * Source/WebCore/page/SocketProvider.h: * Source/WebCore/platform/Curl.cmake: * Source/WebCore/platform/Soup.cmake: * Source/WebCore/platform/network/curl/SocketStreamHandleImpl.h: Removed. * Source/WebCore/platform/network/soup/SocketStreamHandleImpl.h: Removed. * Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm: * Source/WebKit/NetworkProcess/cocoa/WebSocketTaskCocoa.mm: (WebKit::WebSocketTask::readNextMessage): (WebKit::WebSocketTask::close): * Source/WebKit/WebProcess/Network/WebSocketChannel.cpp: (WebKit::WebSocketChannel::close): (WebKit::WebSocketChannel::fail): (WebKit::WebSocketChannel::disconnect): (WebKit::WebSocketChannel::didClose): * Source/WebKitLegacy/Sources.txt: * Source/WebKitLegacy/WebCoreSupport/LegacySocketProvider.cpp: Copied from Source/WebCore/page/SocketProvider.cpp. (LegacySocketProvider::createWebSocketChannel): * Source/WebKitLegacy/WebCoreSupport/LegacySocketProvider.h: Copied from Source/WebCore/page/SocketProvider.cpp. (LegacySocketProvider::create): * Source/WebKitLegacy/WebCoreSupport/SocketStreamHandle.cpp: Renamed from Source/WebCore/platform/network/SocketStreamHandle.cpp. (WebCore::SocketStreamHandle::SocketStreamHandle): (WebCore::SocketStreamHandle::state const): (WebCore::SocketStreamHandle::sendData): (WebCore::SocketStreamHandle::sendHandshake): (WebCore::SocketStreamHandle::close): (WebCore::SocketStreamHandle::disconnect): * Source/WebKitLegacy/WebCoreSupport/SocketStreamHandle.h: Renamed from Source/WebCore/platform/network/SocketStreamHandle.h. * Source/WebKitLegacy/WebCoreSupport/SocketStreamHandleClient.h: Renamed from Source/WebCore/platform/network/SocketStreamHandleClient.h. * Source/WebKitLegacy/WebCoreSupport/SocketStreamHandleImpl.cpp: Renamed from Source/WebCore/platform/network/SocketStreamHandleImpl.cpp. (WebCore::SocketStreamHandleImpl::platformSend): (WebCore::removeTerminationCharacters): (WebCore::cookieDataForHandshake): (WebCore::SocketStreamHandleImpl::platformSendHandshake): (WebCore::SocketStreamHandleImpl::sendPendingData): (WebCore::SocketStreamHandleImpl::bufferedAmount): * Source/WebKitLegacy/WebCoreSupport/SocketStreamHandleImpl.h: Renamed from Source/WebCore/platform/network/cf/SocketStreamHandleImpl.h. (WebCore::SocketStreamHandleImpl::create): (WebCore::SocketStreamHandleImpl::shouldUseSSL const): * Source/WebKitLegacy/WebCoreSupport/SocketStreamHandleImplCFNet.cpp: Renamed from Source/WebCore/platform/network/cf/SocketStreamHandleImplCFNet.cpp. (WebCore::callbacksRunLoop): (WebCore::callbacksRunLoopMode): (WebCore::SocketStreamHandleImpl::SocketStreamHandleImpl): (WebCore::SocketStreamHandleImpl::scheduleStreams): (WebCore::SocketStreamHandleImpl::retainSocketStreamHandle): (WebCore::SocketStreamHandleImpl::releaseSocketStreamHandle): (WebCore::SocketStreamHandleImpl::copyPACExecutionDescription): (WebCore::MainThreadPACCallbackInfo::MainThreadPACCallbackInfo): (WebCore::SocketStreamHandleImpl::pacExecutionCallback): (WebCore::SocketStreamHandleImpl::executePACFileURL): (WebCore::SocketStreamHandleImpl::removePACRunLoopSource): (WebCore::SocketStreamHandleImpl::chooseProxy): (WebCore::SocketStreamHandleImpl::chooseProxyFromArray): (WebCore::setCONNECTProxyForStream): (WebCore::SocketStreamHandleImpl::setLegacyTLSEnabled): (WebCore::SocketStreamHandleImpl::createStreams): (WebCore::SocketStreamHandleImpl::getStoredCONNECTProxyCredentials): (WebCore::authenticationSchemeFromAuthenticationMethod): (WebCore::setCONNECTProxyAuthorizationForStream): (WebCore::SocketStreamHandleImpl::addCONNECTCredentials): (WebCore::SocketStreamHandleImpl::copyCFStreamDescription): (WebCore::SocketStreamHandleImpl::readStreamCallback): (WebCore::SocketStreamHandleImpl::writeStreamCallback): (WebCore::setResponseProxyURL): (WebCore::copyCONNECTProxyResponse): (WebCore::SocketStreamHandleImpl::reportErrorToClient): (WebCore::SocketStreamHandleImpl::~SocketStreamHandleImpl): (WebCore::SocketStreamHandleImpl::platformSendInternal): (WebCore::SocketStreamHandleImpl::platformClose): (WebCore::SocketStreamHandleImpl::port const): * Source/WebKitLegacy/WebCoreSupport/WebSocketChannel.cpp: Renamed from Source/WebCore/Modules/websockets/WebSocketChannel.cpp. (WebCore::WebSocketChannel::WebSocketChannel): (WebCore::WebSocketChannel::~WebSocketChannel): (WebCore::WebSocketChannel::connect): (WebCore::WebSocketChannel::document): (WebCore::WebSocketChannel::subprotocol): (WebCore::WebSocketChannel::extensions): (WebCore::WebSocketChannel::send): (WebCore::WebSocketChannel::bufferedAmount const): (WebCore::WebSocketChannel::close): (WebCore::WebSocketChannel::fail): (WebCore::WebSocketChannel::disconnect): (WebCore::WebSocketChannel::suspend): (WebCore::WebSocketChannel::resume): (WebCore::WebSocketChannel::didOpenSocketStream): (WebCore::WebSocketChannel::didCloseSocketStream): (WebCore::WebSocketChannel::didReceiveSocketStreamData): (WebCore::WebSocketChannel::didFailToReceiveSocketStreamData): (WebCore::WebSocketChannel::didUpdateBufferedAmount): (WebCore::WebSocketChannel::didFailSocketStream): (WebCore::WebSocketChannel::didStartLoading): (WebCore::WebSocketChannel::didReceiveData): (WebCore::WebSocketChannel::didFinishLoading): (WebCore::WebSocketChannel::didFail): (WebCore::WebSocketChannel::appendToBuffer): (WebCore::WebSocketChannel::skipBuffer): (WebCore::WebSocketChannel::processBuffer): (WebCore::WebSocketChannel::resumeTimerFired): (WebCore::WebSocketChannel::startClosingHandshake): (WebCore::WebSocketChannel::closingTimerFired): (WebCore::WebSocketChannel::processFrame): (WebCore::WebSocketChannel::enqueueTextFrame): (WebCore::WebSocketChannel::enqueueRawFrame): (WebCore::WebSocketChannel::enqueueBlobFrame): (WebCore::WebSocketChannel::processOutgoingFrameQueue): (WebCore::WebSocketChannel::abortOutgoingFrameQueue): (WebCore::WebSocketChannel::sendFrame): (WebCore::WebSocketChannel::clientHandshakeRequest const): (WebCore::WebSocketChannel::serverHandshakeResponse const): * Source/WebKitLegacy/WebCoreSupport/WebSocketChannel.h: Renamed from Source/WebCore/Modules/websockets/WebSocketChannel.h. * Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj: * Source/WebKitLegacy/mac/WebView/WebView.mm: (-[WebView _commonInitializationWithFrameName:groupName:]): (-[WebView initSimpleHTMLDocumentWithStyle:frame:preferences:groupName:]): Canonical link: https://commits.webkit.org/261973@main _______________________________________________ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes