Rename SocketStreamHandleBase to SocketStreamHandle and SocketStreamHandle to SocketS...
authorachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 15 Aug 2016 21:23:32 +0000 (21:23 +0000)
committerachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 15 Aug 2016 21:23:32 +0000 (21:23 +0000)
commitd4d98b30006e38aad1358529a33dacbeb61b1015
tree241c6f5f4a14bed6d2162f18fc3acb31a2ce3ae0
parent2be2a20ab77bfb08defe46d3ce77d55ef097397e
Rename SocketStreamHandleBase to SocketStreamHandle and SocketStreamHandle to SocketStreamHandleImpl
https://bugs.webkit.org/show_bug.cgi?id=160858

Reviewed by Brady Eidson.

Source/WebCore:

No new tests.  No change in behavior, except GTK's SocketStreamHandleImpl is now safely ThreadSafeRefCounted.
This is preparation for making a new kind of SocketStreamHandle which is a proxy that communicates with the NetworkProcess in WebKit2.

* CMakeLists.txt:
* PlatformAppleWin.cmake:
* PlatformEfl.cmake:
* PlatformGTK.cmake:
* PlatformMac.cmake:
* PlatformWinCairo.cmake:
* WebCore.xcodeproj/project.pbxproj:
* page/SocketProvider.cpp:
(WebCore::SocketProvider::createSocketStreamHandle):
* platform/network/SocketStreamHandle.cpp: Copied from Source/WebCore/platform/network/SocketStreamHandleBase.cpp.
(WebCore::SocketStreamHandle::SocketStreamHandle):
(WebCore::SocketStreamHandle::state):
(WebCore::SocketStreamHandle::send):
(WebCore::SocketStreamHandle::close):
(WebCore::SocketStreamHandle::disconnect):
(WebCore::SocketStreamHandle::sendPendingData):
(WebCore::SocketStreamHandleBase::SocketStreamHandleBase): Deleted.
(WebCore::SocketStreamHandleBase::state): Deleted.
(WebCore::SocketStreamHandleBase::send): Deleted.
(WebCore::SocketStreamHandleBase::close): Deleted.
(WebCore::SocketStreamHandleBase::disconnect): Deleted.
(WebCore::SocketStreamHandleBase::sendPendingData): Deleted.
* platform/network/SocketStreamHandle.h: Copied from Source/WebCore/platform/network/SocketStreamHandleBase.h.
(WebCore::SocketStreamHandle::~SocketStreamHandle):
(WebCore::SocketStreamHandle::client):
(WebCore::SocketStreamHandleBase::~SocketStreamHandleBase): Deleted.
(WebCore::SocketStreamHandleBase::client): Deleted.
* platform/network/SocketStreamHandleBase.cpp: Removed.
* platform/network/SocketStreamHandleBase.h: Removed.
* platform/network/cf/SocketStreamHandle.h: Removed.
* platform/network/cf/SocketStreamHandleCFNet.cpp: Removed.
* platform/network/cf/SocketStreamHandleImpl.h: Copied from Source/WebCore/platform/network/cf/SocketStreamHandle.h.
(WebCore::SocketStreamHandleImpl::create):
(WebCore::SocketStreamHandle::create): Deleted.
* platform/network/cf/SocketStreamHandleImplCFNet.cpp: Copied from Source/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp.
(WebCore::SocketStreamHandleImpl::SocketStreamHandleImpl):
(WebCore::SocketStreamHandleImpl::scheduleStreams):
(WebCore::SocketStreamHandleImpl::retainSocketStreamHandle):
(WebCore::SocketStreamHandleImpl::releaseSocketStreamHandle):
(WebCore::SocketStreamHandleImpl::copyPACExecutionDescription):
(WebCore::SocketStreamHandleImpl::pacExecutionCallback):
(WebCore::SocketStreamHandleImpl::executePACFileURL):
(WebCore::SocketStreamHandleImpl::removePACRunLoopSource):
(WebCore::SocketStreamHandleImpl::chooseProxy):
(WebCore::SocketStreamHandleImpl::chooseProxyFromArray):
(WebCore::SocketStreamHandleImpl::createStreams):
(WebCore::SocketStreamHandleImpl::getStoredCONNECTProxyCredentials):
(WebCore::authenticationSchemeFromAuthenticationMethod):
(WebCore::SocketStreamHandleImpl::addCONNECTCredentials):
(WebCore::SocketStreamHandleImpl::copyCFStreamDescription):
(WebCore::SocketStreamHandleImpl::readStreamCallback):
(WebCore::SocketStreamHandleImpl::writeStreamCallback):
(WebCore::SocketStreamHandleImpl::reportErrorToClient):
(WebCore::SocketStreamHandleImpl::~SocketStreamHandleImpl):
(WebCore::SocketStreamHandleImpl::platformSend):
(WebCore::SocketStreamHandleImpl::platformClose):
(WebCore::SocketStreamHandleImpl::port):
(WebCore::SocketStreamHandle::SocketStreamHandle): Deleted.
(WebCore::SocketStreamHandle::scheduleStreams): Deleted.
(WebCore::SocketStreamHandle::retainSocketStreamHandle): Deleted.
(WebCore::SocketStreamHandle::releaseSocketStreamHandle): Deleted.
(WebCore::SocketStreamHandle::copyPACExecutionDescription): Deleted.
(WebCore::SocketStreamHandle::pacExecutionCallback): Deleted.
(WebCore::SocketStreamHandle::executePACFileURL): Deleted.
(WebCore::SocketStreamHandle::removePACRunLoopSource): Deleted.
(WebCore::SocketStreamHandle::chooseProxy): Deleted.
(WebCore::SocketStreamHandle::chooseProxyFromArray): Deleted.
(WebCore::SocketStreamHandle::createStreams): Deleted.
(WebCore::SocketStreamHandle::getStoredCONNECTProxyCredentials): Deleted.
(WebCore::SocketStreamHandle::addCONNECTCredentials): Deleted.
(WebCore::SocketStreamHandle::copyCFStreamDescription): Deleted.
(WebCore::SocketStreamHandle::readStreamCallback): Deleted.
(WebCore::SocketStreamHandle::writeStreamCallback): Deleted.
(WebCore::SocketStreamHandle::reportErrorToClient): Deleted.
(WebCore::SocketStreamHandle::~SocketStreamHandle): Deleted.
(WebCore::SocketStreamHandle::platformSend): Deleted.
(WebCore::SocketStreamHandle::platformClose): Deleted.
(WebCore::SocketStreamHandle::port): Deleted.
* platform/network/curl/SocketStreamHandle.h: Removed.
* platform/network/curl/SocketStreamHandleCurl.cpp: Removed.
* platform/network/curl/SocketStreamHandleImpl.h: Copied from Source/WebCore/platform/network/curl/SocketStreamHandle.h.
(WebCore::SocketStreamHandleImpl::create):
(WebCore::SocketStreamHandle::create): Deleted.
* platform/network/curl/SocketStreamHandleImplCurl.cpp: Copied from Source/WebCore/platform/network/curl/SocketStreamHandleCurl.cpp.
(WebCore::SocketStreamHandleImpl::SocketStreamHandleImpl):
(WebCore::SocketStreamHandleImpl::~SocketStreamHandleImpl):
(WebCore::SocketStreamHandleImpl::platformSend):
(WebCore::SocketStreamHandleImpl::platformClose):
(WebCore::SocketStreamHandleImpl::readData):
(WebCore::SocketStreamHandleImpl::sendData):
(WebCore::SocketStreamHandleImpl::waitForAvailableData):
(WebCore::SocketStreamHandleImpl::startThread):
(WebCore::SocketStreamHandleImpl::stopThread):
(WebCore::SocketStreamHandleImpl::didReceiveData):
(WebCore::SocketStreamHandleImpl::didOpenSocket):
(WebCore::SocketStreamHandleImpl::createCopy):
(WebCore::SocketStreamHandle::SocketStreamHandle): Deleted.
(WebCore::SocketStreamHandle::~SocketStreamHandle): Deleted.
(WebCore::SocketStreamHandle::platformSend): Deleted.
(WebCore::SocketStreamHandle::platformClose): Deleted.
(WebCore::SocketStreamHandle::readData): Deleted.
(WebCore::SocketStreamHandle::sendData): Deleted.
(WebCore::SocketStreamHandle::waitForAvailableData): Deleted.
(WebCore::SocketStreamHandle::startThread): Deleted.
(WebCore::SocketStreamHandle::stopThread): Deleted.
(WebCore::SocketStreamHandle::didReceiveData): Deleted.
(WebCore::SocketStreamHandle::didOpenSocket): Deleted.
(WebCore::SocketStreamHandle::createCopy): Deleted.
* platform/network/soup/SocketStreamHandle.h: Removed.
* platform/network/soup/SocketStreamHandleImpl.h: Copied from Source/WebCore/platform/network/soup/SocketStreamHandle.h.
* platform/network/soup/SocketStreamHandleImplSoup.cpp: Copied from Source/WebCore/platform/network/soup/SocketStreamHandleSoup.cpp.
(WebCore::SocketStreamHandleImpl::create):
(WebCore::SocketStreamHandleImpl::SocketStreamHandleImpl):
(WebCore::SocketStreamHandleImpl::~SocketStreamHandleImpl):
(WebCore::SocketStreamHandleImpl::connected):
(WebCore::SocketStreamHandleImpl::connectedCallback):
(WebCore::SocketStreamHandleImpl::readBytes):
(WebCore::SocketStreamHandleImpl::readReadyCallback):
(WebCore::SocketStreamHandleImpl::didFail):
(WebCore::SocketStreamHandleImpl::writeReady):
(WebCore::SocketStreamHandleImpl::platformSend):
(WebCore::SocketStreamHandleImpl::platformClose):
(WebCore::SocketStreamHandleImpl::beginWaitingForSocketWritability):
(WebCore::SocketStreamHandleImpl::stopWaitingForSocketWritability):
(WebCore::SocketStreamHandleImpl::writeReadyCallback):
(WebCore::SocketStreamHandle::create): Deleted.
(WebCore::SocketStreamHandle::SocketStreamHandle): Deleted.
(WebCore::SocketStreamHandle::~SocketStreamHandle): Deleted.
(WebCore::SocketStreamHandle::connected): Deleted.
(WebCore::SocketStreamHandle::connectedCallback): Deleted.
(WebCore::SocketStreamHandle::readBytes): Deleted.
(WebCore::SocketStreamHandle::readReadyCallback): Deleted.
(WebCore::SocketStreamHandle::didFail): Deleted.
(WebCore::SocketStreamHandle::writeReady): Deleted.
(WebCore::SocketStreamHandle::platformSend): Deleted.
(WebCore::SocketStreamHandle::platformClose): Deleted.
(WebCore::SocketStreamHandle::beginWaitingForSocketWritability): Deleted.
(WebCore::SocketStreamHandle::stopWaitingForSocketWritability): Deleted.
(WebCore::SocketStreamHandle::writeReadyCallback): Deleted.
* platform/network/soup/SocketStreamHandleSoup.cpp: Removed.

Source/WebKit2:

* WebProcess/Network/WebSocketProvider.cpp:
(WebKit::WebSocketProvider::createSocketStreamHandle):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@204483 268f45cc-cd09-0410-ab3c-d52691b4dbfc
20 files changed:
Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebCore/PlatformAppleWin.cmake
Source/WebCore/PlatformEfl.cmake
Source/WebCore/PlatformGTK.cmake
Source/WebCore/PlatformMac.cmake
Source/WebCore/PlatformWinCairo.cmake
Source/WebCore/WebCore.xcodeproj/project.pbxproj
Source/WebCore/page/SocketProvider.cpp
Source/WebCore/platform/network/SocketStreamHandle.cpp [moved from Source/WebCore/platform/network/SocketStreamHandleBase.cpp with 89% similarity]
Source/WebCore/platform/network/SocketStreamHandle.h [moved from Source/WebCore/platform/network/SocketStreamHandleBase.h with 90% similarity]
Source/WebCore/platform/network/cf/SocketStreamHandleImpl.h [moved from Source/WebCore/platform/network/cf/SocketStreamHandle.h with 90% similarity]
Source/WebCore/platform/network/cf/SocketStreamHandleImplCFNet.cpp [moved from Source/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp with 91% similarity]
Source/WebCore/platform/network/curl/SocketStreamHandleImpl.h [moved from Source/WebCore/platform/network/curl/SocketStreamHandle.h with 91% similarity]
Source/WebCore/platform/network/curl/SocketStreamHandleImplCurl.cpp [moved from Source/WebCore/platform/network/curl/SocketStreamHandleCurl.cpp with 89% similarity]
Source/WebCore/platform/network/soup/SocketStreamHandleImpl.h [moved from Source/WebCore/platform/network/soup/SocketStreamHandle.h with 89% similarity]
Source/WebCore/platform/network/soup/SocketStreamHandleImplSoup.cpp [moved from Source/WebCore/platform/network/soup/SocketStreamHandleSoup.cpp with 80% similarity]
Source/WebKit2/ChangeLog
Source/WebKit2/UIProcess/InspectorServer/soup/WebSocketServerSoup.cpp
Source/WebKit2/WebProcess/Network/WebSocketProvider.cpp