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)
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

index 55596cc..64febec 100644 (file)
@@ -2368,7 +2368,7 @@ set(WebCore_SOURCES
     platform/network/ResourceHandleClient.cpp
     platform/network/ResourceRequestBase.cpp
     platform/network/ResourceResponseBase.cpp
-    platform/network/SocketStreamHandleBase.cpp
+    platform/network/SocketStreamHandle.cpp
     platform/network/SynchronousLoaderClient.cpp
 
     platform/sql/SQLValue.cpp
index aab3565..a970ef9 100644 (file)
@@ -1,3 +1,154 @@
+2016-08-15  Alex Christensen  <achristensen@webkit.org>
+
+        Rename SocketStreamHandleBase to SocketStreamHandle and SocketStreamHandle to SocketStreamHandleImpl
+        https://bugs.webkit.org/show_bug.cgi?id=160858
+
+        Reviewed by Brady Eidson.
+
+        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.
+
 2016-08-15  Jiewen Tan  <jiewen_tan@apple.com>
 
         Expose crypto.getRandomValues to Web Workers
index 5ff991f..009d2cd 100644 (file)
@@ -103,7 +103,7 @@ list(APPEND WebCore_SOURCES
     platform/network/cf/ResourceHandleCFURLConnectionDelegate.cpp
     platform/network/cf/ResourceRequestCFNet.cpp
     platform/network/cf/ResourceResponseCFNet.cpp
-    platform/network/cf/SocketStreamHandleCFNet.cpp
+    platform/network/cf/SocketStreamHandleImplCFNet.cpp
     platform/network/cf/SynchronousLoaderClientCFNet.cpp
     platform/network/cf/SynchronousResourceHandleCFURLConnectionDelegate.cpp
 
index e7b0877..6089f2d 100644 (file)
@@ -201,7 +201,7 @@ list(APPEND WebCore_SOURCES
     platform/network/soup/ResourceHandleSoup.cpp
     platform/network/soup/ResourceRequestSoup.cpp
     platform/network/soup/ResourceResponseSoup.cpp
-    platform/network/soup/SocketStreamHandleSoup.cpp
+    platform/network/soup/SocketStreamHandleImplSoup.cpp
     platform/network/soup/SoupNetworkSession.cpp
     platform/network/soup/SynchronousLoaderClientSoup.cpp
     platform/network/soup/WebKitSoupRequestGeneric.cpp
index a69d026..fea2c2c 100644 (file)
@@ -172,7 +172,7 @@ list(APPEND WebCore_SOURCES
     platform/network/soup/ResourceHandleSoup.cpp
     platform/network/soup/ResourceRequestSoup.cpp
     platform/network/soup/ResourceResponseSoup.cpp
-    platform/network/soup/SocketStreamHandleSoup.cpp
+    platform/network/soup/SocketStreamHandleImplSoup.cpp
     platform/network/soup/SoupNetworkSession.cpp
     platform/network/soup/SynchronousLoaderClientSoup.cpp
     platform/network/soup/WebKitSoupRequestGeneric.cpp
index 628eef2..8affa11 100644 (file)
@@ -648,7 +648,7 @@ list(APPEND WebCore_SOURCES
     platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp
     platform/network/cf/ResourceRequestCFNet.cpp
     platform/network/cf/ResourceResponseCFNet.cpp
-    platform/network/cf/SocketStreamHandleCFNet.cpp
+    platform/network/cf/SocketStreamHandleImplCFNet.cpp
     platform/network/cf/SynchronousLoaderClientCFNet.cpp
     platform/network/cf/SynchronousResourceHandleCFURLConnectionDelegate.cpp
 
index 2c553b0..957e88c 100644 (file)
@@ -62,7 +62,7 @@ list(APPEND WebCore_SOURCES
     platform/network/curl/ResourceHandleCurl.cpp
     platform/network/curl/ResourceHandleManager.cpp
     platform/network/curl/SSLHandle.cpp
-    platform/network/curl/SocketStreamHandleCurl.cpp
+    platform/network/curl/SocketStreamHandleImplCurl.cpp
 
     platform/text/win/LocaleWin.cpp
 
index b567d3f..34141c1 100644 (file)
                510A58FA1BACC7F200C19282 /* IDBRequestData.h in Headers */ = {isa = PBXBuildFile; fileRef = 510A58F61BACC4A500C19282 /* IDBRequestData.h */; settings = {ATTRIBUTES = (Private, ); }; };
                510D4A33103165EE0049EA54 /* SocketStreamErrorBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 510D4A2D103165EE0049EA54 /* SocketStreamErrorBase.cpp */; };
                510D4A34103165EE0049EA54 /* SocketStreamErrorBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 510D4A2E103165EE0049EA54 /* SocketStreamErrorBase.h */; };
-               510D4A36103165EE0049EA54 /* SocketStreamHandleBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 510D4A30103165EE0049EA54 /* SocketStreamHandleBase.cpp */; };
-               510D4A37103165EE0049EA54 /* SocketStreamHandleBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 510D4A31103165EE0049EA54 /* SocketStreamHandleBase.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               510D4A36103165EE0049EA54 /* SocketStreamHandle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 510D4A30103165EE0049EA54 /* SocketStreamHandle.cpp */; };
+               510D4A37103165EE0049EA54 /* SocketStreamHandle.h in Headers */ = {isa = PBXBuildFile; fileRef = 510D4A31103165EE0049EA54 /* SocketStreamHandle.h */; settings = {ATTRIBUTES = (Private, ); }; };
                510D4A38103165EE0049EA54 /* SocketStreamHandleClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 510D4A32103165EE0049EA54 /* SocketStreamHandleClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
                511EC1271C50AACA0032F983 /* IDBSerialization.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 511EC1251C50AA570032F983 /* IDBSerialization.cpp */; };
                511EC1281C50AACA0032F983 /* IDBSerialization.h in Headers */ = {isa = PBXBuildFile; fileRef = 511EC1261C50AA570032F983 /* IDBSerialization.h */; };
                51A9D9EA195B931F001B2B5C /* GamepadManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 51A9D9E8195B931F001B2B5C /* GamepadManager.h */; };
                51AA3F6F0BD5AA9E00892971 /* ResourceLoaderMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51AA3F6E0BD5AA9E00892971 /* ResourceLoaderMac.mm */; };
                51ABAE1B103C18FF008C5260 /* SocketStreamError.h in Headers */ = {isa = PBXBuildFile; fileRef = 51ABAE1A103C18FF008C5260 /* SocketStreamError.h */; };
-               51ABAE1E103C1913008C5260 /* SocketStreamHandle.h in Headers */ = {isa = PBXBuildFile; fileRef = 51ABAE1C103C1913008C5260 /* SocketStreamHandle.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               51ABAE1F103C1913008C5260 /* SocketStreamHandleCFNet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51ABAE1D103C1913008C5260 /* SocketStreamHandleCFNet.cpp */; };
+               51ABAE1E103C1913008C5260 /* SocketStreamHandleImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = 51ABAE1C103C1913008C5260 /* SocketStreamHandleImpl.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               51ABAE1F103C1913008C5260 /* SocketStreamHandleImplCFNet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51ABAE1D103C1913008C5260 /* SocketStreamHandleImplCFNet.cpp */; };
                51ABF64D16392E2800132A7A /* LoaderStrategy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51ABF64C16392E2800132A7A /* LoaderStrategy.cpp */; };
                51AF503616F100F60095B2E8 /* ResourceLoaderTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 51AF503516F100F60095B2E8 /* ResourceLoaderTypes.h */; settings = {ATTRIBUTES = (Private, ); }; };
                51B2417B0D931F3F00E83F5C /* LegacyWebArchiveMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51B2417A0D931F3F00E83F5C /* LegacyWebArchiveMac.mm */; };
                510A58FE1BB07AA500C19282 /* IDBConnectionToClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBConnectionToClient.h; sourceTree = "<group>"; };
                510D4A2D103165EE0049EA54 /* SocketStreamErrorBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SocketStreamErrorBase.cpp; sourceTree = "<group>"; };
                510D4A2E103165EE0049EA54 /* SocketStreamErrorBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SocketStreamErrorBase.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>"; };
+               510D4A30103165EE0049EA54 /* SocketStreamHandle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SocketStreamHandle.cpp; sourceTree = "<group>"; };
+               510D4A31103165EE0049EA54 /* SocketStreamHandle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SocketStreamHandle.h; sourceTree = "<group>"; };
                510D4A32103165EE0049EA54 /* SocketStreamHandleClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SocketStreamHandleClient.h; sourceTree = "<group>"; };
                511EC1251C50AA570032F983 /* IDBSerialization.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IDBSerialization.cpp; sourceTree = "<group>"; };
                511EC1261C50AA570032F983 /* IDBSerialization.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBSerialization.h; sourceTree = "<group>"; };
                51A9D9E8195B931F001B2B5C /* GamepadManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GamepadManager.h; sourceTree = "<group>"; };
                51AA3F6E0BD5AA9E00892971 /* ResourceLoaderMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ResourceLoaderMac.mm; 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>"; };
+               51ABAE1C103C1913008C5260 /* SocketStreamHandleImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SocketStreamHandleImpl.h; sourceTree = "<group>"; };
+               51ABAE1D103C1913008C5260 /* SocketStreamHandleImplCFNet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SocketStreamHandleImplCFNet.cpp; sourceTree = "<group>"; };
                51ABF64C16392E2800132A7A /* LoaderStrategy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LoaderStrategy.cpp; sourceTree = "<group>"; };
                51AF503516F100F60095B2E8 /* ResourceLoaderTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResourceLoaderTypes.h; sourceTree = "<group>"; };
                51B2417A0D931F3F00E83F5C /* LegacyWebArchiveMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = LegacyWebArchiveMac.mm; sourceTree = "<group>"; };
                                514C766A0CE923A1007EF3CD /* ResourceResponseBase.h */,
                                510D4A2D103165EE0049EA54 /* SocketStreamErrorBase.cpp */,
                                510D4A2E103165EE0049EA54 /* SocketStreamErrorBase.h */,
-                               510D4A30103165EE0049EA54 /* SocketStreamHandleBase.cpp */,
-                               510D4A31103165EE0049EA54 /* SocketStreamHandleBase.h */,
+                               510D4A30103165EE0049EA54 /* SocketStreamHandle.cpp */,
+                               510D4A31103165EE0049EA54 /* SocketStreamHandle.h */,
                                510D4A32103165EE0049EA54 /* SocketStreamHandleClient.h */,
                                E180811016FCF42E00B80D07 /* SynchronousLoaderClient.cpp */,
                                E180811516FCF9CB00B80D07 /* SynchronousLoaderClient.h */,
                                7EE6845D12D26E3800E79415 /* ResourceResponse.h */,
                                7EE6845E12D26E3800E79415 /* ResourceResponseCFNet.cpp */,
                                51ABAE1A103C18FF008C5260 /* SocketStreamError.h */,
-                               51ABAE1C103C1913008C5260 /* SocketStreamHandle.h */,
-                               51ABAE1D103C1913008C5260 /* SocketStreamHandleCFNet.cpp */,
+                               51ABAE1C103C1913008C5260 /* SocketStreamHandleImpl.h */,
+                               51ABAE1D103C1913008C5260 /* SocketStreamHandleImplCFNet.cpp */,
                                442ABCD517D9262F00D30715 /* SynchronousLoaderClientCFNet.cpp */,
                                26FAE4CA1852E3A5004C8C46 /* SynchronousResourceHandleCFURLConnectionDelegate.cpp */,
                                26FAE4CB1852E3A5004C8C46 /* SynchronousResourceHandleCFURLConnectionDelegate.h */,
                                5C7C88D81D0F1F4A009D2F6D /* SocketProvider.h in Headers */,
                                51ABAE1B103C18FF008C5260 /* SocketStreamError.h in Headers */,
                                510D4A34103165EE0049EA54 /* SocketStreamErrorBase.h in Headers */,
-                               51ABAE1E103C1913008C5260 /* SocketStreamHandle.h in Headers */,
-                               510D4A37103165EE0049EA54 /* SocketStreamHandleBase.h in Headers */,
+                               51ABAE1E103C1913008C5260 /* SocketStreamHandleImpl.h in Headers */,
+                               510D4A37103165EE0049EA54 /* SocketStreamHandle.h in Headers */,
                                510D4A38103165EE0049EA54 /* SocketStreamHandleClient.h in Headers */,
                                0A4844990CA44CB200B7BD48 /* SoftLinking.h in Headers */,
                                4B3043C70AE0370300A82647 /* Sound.h in Headers */,
                                E4AFD00D0DAF335500F5F55C /* SMILTimeContainer.cpp in Sources */,
                                5C688AA31D3814BF000B54FA /* SocketProvider.cpp in Sources */,
                                510D4A33103165EE0049EA54 /* SocketStreamErrorBase.cpp in Sources */,
-                               510D4A36103165EE0049EA54 /* SocketStreamHandleBase.cpp in Sources */,
-                               51ABAE1F103C1913008C5260 /* SocketStreamHandleCFNet.cpp in Sources */,
+                               510D4A36103165EE0049EA54 /* SocketStreamHandle.cpp in Sources */,
+                               51ABAE1F103C1913008C5260 /* SocketStreamHandleImplCFNet.cpp in Sources */,
                                E45390470EAFD637003695C8 /* SoundIOS.mm in Sources */,
                                4B3043C90AE0371D00A82647 /* SoundMac.mm in Sources */,
                                84A81F3D0FC7DFF000955300 /* SourceAlpha.cpp in Sources */,
index 67c78a9..2e81a74 100644 (file)
 
 #if ENABLE(WEB_SOCKETS)
 
-#include "SocketStreamHandle.h"
+#include "SocketStreamHandleImpl.h"
 
 namespace WebCore {
     
 Ref<SocketStreamHandle> SocketProvider::createSocketStreamHandle(const URL& url, SocketStreamHandleClient& client, SessionID sessionID)
 {
-    return SocketStreamHandle::create(url, client, sessionID);
+    return SocketStreamHandleImpl::create(url, client, sessionID);
 }
     
 }
  */
 
 #include "config.h"
-#include "SocketStreamHandleBase.h"
-
 #include "SocketStreamHandle.h"
+
 #include "SocketStreamHandleClient.h"
 
 namespace WebCore {
 
-const unsigned int bufferSize = 100 * 1024 * 1024;
+const unsigned bufferSize = 100 * 1024 * 1024;
 
-SocketStreamHandleBase::SocketStreamHandleBase(const URL& url, SocketStreamHandleClient& client)
+SocketStreamHandle::SocketStreamHandle(const URL& url, SocketStreamHandleClient& client)
     : m_url(url)
     , m_client(client)
     , m_state(Connecting)
 {
 }
 
-SocketStreamHandleBase::SocketStreamState SocketStreamHandleBase::state() const
+SocketStreamHandle::SocketStreamState SocketStreamHandle::state() const
 {
     return m_state;
 }
 
-bool SocketStreamHandleBase::send(const char* data, int length)
+bool SocketStreamHandle::send(const char* data, int length)
 {
     if (m_state == Connecting || m_state == Closing)
         return false;
@@ -79,7 +78,7 @@ bool SocketStreamHandleBase::send(const char* data, int length)
     return true;
 }
 
-void SocketStreamHandleBase::close()
+void SocketStreamHandle::close()
 {
     if (m_state == Closed)
         return;
@@ -89,7 +88,7 @@ void SocketStreamHandleBase::close()
     disconnect();
 }
 
-void SocketStreamHandleBase::disconnect()
+void SocketStreamHandle::disconnect()
 {
     auto protect = makeRef(static_cast<SocketStreamHandle&>(*this)); // platformClose calls the client, which may make the handle get deallocated immediately.
 
@@ -97,7 +96,7 @@ void SocketStreamHandleBase::disconnect()
     m_state = Closed;
 }
 
-bool SocketStreamHandleBase::sendPendingData()
+bool SocketStreamHandle::sendPendingData()
 {
     if (m_state != Open && m_state != Closing)
         return false;
@@ -122,4 +121,4 @@ bool SocketStreamHandleBase::sendPendingData()
     return true;
 }
 
-}  // namespace WebCore
+} // namespace WebCore
 
 #include "URL.h"
 #include <wtf/StreamBuffer.h>
+#include <wtf/ThreadSafeRefCounted.h>
 
 namespace WebCore {
 
-class SocketStreamHandle;
 class SocketStreamHandleClient;
 
-class SocketStreamHandleBase {
+class SocketStreamHandle : public ThreadSafeRefCounted<SocketStreamHandle> {
 public:
     enum SocketStreamState { Connecting, Open, Closing, Closed };
-    virtual ~SocketStreamHandleBase() { }
+    virtual ~SocketStreamHandle() { }
     SocketStreamState state() const;
 
     bool send(const char* data, int length);
@@ -53,7 +53,7 @@ public:
     SocketStreamHandleClient& client() const { return m_client; }
 
 protected:
-    SocketStreamHandleBase(const URL&, SocketStreamHandleClient&);
+    SocketStreamHandle(const URL&, SocketStreamHandleClient&);
 
     bool sendPendingData();
     virtual int platformSend(const char* data, int length) = 0;
@@ -65,4 +65,4 @@ protected:
     SocketStreamState m_state;
 };
 
-}  // namespace WebCore
+} // namespace WebCore
@@ -32,9 +32,8 @@
 #pragma once
 
 #include "SessionID.h"
-#include "SocketStreamHandleBase.h"
+#include "SocketStreamHandle.h"
 #include <wtf/RetainPtr.h>
-#include <wtf/ThreadSafeRefCounted.h>
 
 typedef struct __CFHTTPMessage* CFHTTPMessageRef;
 
@@ -44,17 +43,17 @@ class Credential;
 class ProtectionSpace;
 class SocketStreamHandleClient;
 
-class SocketStreamHandle : public ThreadSafeRefCounted<SocketStreamHandle>, public SocketStreamHandleBase {
+class SocketStreamHandleImpl : public SocketStreamHandle {
 public:
-    static Ref<SocketStreamHandle> create(const URL& url, SocketStreamHandleClient& client, SessionID sessionID) { return adoptRef(*new SocketStreamHandle(url, client, sessionID)); }
+    static Ref<SocketStreamHandle> create(const URL& url, SocketStreamHandleClient& client, SessionID sessionID) { return adoptRef(*new SocketStreamHandleImpl(url, client, sessionID)); }
 
-    virtual ~SocketStreamHandle();
+    virtual ~SocketStreamHandleImpl();
 
 private:
     virtual int platformSend(const char* data, int length);
     virtual void platformClose();
 
-    WEBCORE_EXPORT SocketStreamHandle(const URL&, SocketStreamHandleClient&, SessionID);
+    WEBCORE_EXPORT SocketStreamHandleImpl(const URL&, SocketStreamHandleClient&, SessionID);
     void createStreams();
     void scheduleStreams();
     void chooseProxy();
@@ -62,7 +61,7 @@ private:
     void executePACFileURL(CFURLRef);
     void removePACRunLoopSource();
     RetainPtr<CFRunLoopSourceRef> m_pacRunLoopSource;
-    static void pacExecutionCallback(void* client, CFArrayRef proxyList, CFErrorRef error);
+    static void pacExecutionCallback(void* client, CFArrayRef proxyList, CFErrorRef);
     static CFStringRef copyPACExecutionDescription(void*);
 
     bool shouldUseSSL() const { return m_url.protocolIs("wss"); }
@@ -99,4 +98,4 @@ private:
     SessionID m_sessionID;
 };
 
-}  // namespace WebCore
+} // namespace WebCore
@@ -30,7 +30,7 @@
  */
 
 #include "config.h"
-#include "SocketStreamHandle.h"
+#include "SocketStreamHandleImpl.h"
 
 #include "Credential.h"
 #include "CredentialStorage.h"
 #include "Settings.h"
 #include "SocketStreamError.h"
 #include "SocketStreamHandleClient.h"
+#include <CFNetwork/CFNetwork.h>
 #include <wtf/Condition.h>
 #include <wtf/Lock.h>
 #include <wtf/MainThread.h>
 #include <wtf/text/WTFString.h>
 
-#if PLATFORM(IOS)
-#include <CFNetwork/CFNetwork.h>
-#endif
-
 #if PLATFORM(WIN)
 #include "LoaderRunLoopCF.h"
-#include <CFNetwork/CFNetwork.h>
 #include <WebKitSystemInterface/WebKitSystemInterface.h>
 #else
 #include "WebCoreSystemInterface.h"
@@ -67,8 +63,8 @@ extern "C" const CFStringRef _kCFStreamSocketSetNoDelay;
 
 namespace WebCore {
 
-SocketStreamHandle::SocketStreamHandle(const URL& url, SocketStreamHandleClient& client, SessionID sessionID)
-    : SocketStreamHandleBase(url, client)
+SocketStreamHandleImpl::SocketStreamHandleImpl(const URL& url, SocketStreamHandleClient& client, SessionID sessionID)
+    : SocketStreamHandle(url, client)
     , m_connectingSubstate(New)
     , m_connectionType(Unknown)
     , m_sentStoredCredentials(false)
@@ -100,7 +96,7 @@ SocketStreamHandle::SocketStreamHandle(const URL& url, SocketStreamHandleClient&
     scheduleStreams();
 }
 
-void SocketStreamHandle::scheduleStreams()
+void SocketStreamHandleImpl::scheduleStreams()
 {
     ASSERT(m_readStream);
     ASSERT(m_writeStream);
@@ -127,25 +123,25 @@ void SocketStreamHandle::scheduleStreams()
     m_connectingSubstate = WaitingForConnect;
 }
 
-void* SocketStreamHandle::retainSocketStreamHandle(void* info)
+void* SocketStreamHandleImpl::retainSocketStreamHandle(void* info)
 {
     SocketStreamHandle* handle = static_cast<SocketStreamHandle*>(info);
     handle->ref();
     return handle;
 }
 
-void SocketStreamHandle::releaseSocketStreamHandle(void* info)
+void SocketStreamHandleImpl::releaseSocketStreamHandle(void* info)
 {
     SocketStreamHandle* handle = static_cast<SocketStreamHandle*>(info);
     handle->deref();
 }
 
-CFStringRef SocketStreamHandle::copyPACExecutionDescription(void*)
+CFStringRef SocketStreamHandleImpl::copyPACExecutionDescription(void*)
 {
     return CFSTR("WebSocket proxy PAC file execution");
 }
 
-static void callOnMainThreadAndWait(std::function<void ()> function)
+static void callOnMainThreadAndWait(std::function<void()> function)
 {
     if (isMainThread()) {
         function();
@@ -166,18 +162,22 @@ static void callOnMainThreadAndWait(std::function<void ()> function)
     });
 
     std::unique_lock<Lock> lock(mutex);
-    conditionVariable.wait(lock, [&] { return isFinished; });
+    conditionVariable.wait(lock, [&] {
+        return isFinished;
+    });
 }
 
 struct MainThreadPACCallbackInfo {
-    MainThreadPACCallbackInfo(SocketStreamHandle* handle, CFArrayRef proxyList) : handle(handle), proxyList(proxyList) { }
+    MainThreadPACCallbackInfo(SocketStreamHandle* handle, CFArrayRef proxyList)
+        : handle(handle), proxyList(proxyList)
+    { }
     RefPtr<SocketStreamHandle> handle;
     CFArrayRef proxyList;
 };
 
-void SocketStreamHandle::pacExecutionCallback(void* client, CFArrayRef proxyList, CFErrorRef)
+void SocketStreamHandleImpl::pacExecutionCallback(void* client, CFArrayRef proxyList, CFErrorRef)
 {
-    SocketStreamHandle* handle = static_cast<SocketStreamHandle*>(client);
+    SocketStreamHandleImpl* handle = static_cast<SocketStreamHandleImpl*>(client);
 
     callOnMainThreadAndWait([&] {
         ASSERT(handle->m_connectingSubstate == ExecutingPACFile);
@@ -190,7 +190,7 @@ void SocketStreamHandle::pacExecutionCallback(void* client, CFArrayRef proxyList
     });
 }
 
-void SocketStreamHandle::executePACFileURL(CFURLRef pacFileURL)
+void SocketStreamHandleImpl::executePACFileURL(CFURLRef pacFileURL)
 {
     // CFNetwork returns an empty proxy array for WebSocket schemes, so use m_httpsURL.
     CFStreamClientContext clientContext = { 0, this, retainSocketStreamHandle, releaseSocketStreamHandle, copyPACExecutionDescription };
@@ -203,7 +203,7 @@ void SocketStreamHandle::executePACFileURL(CFURLRef pacFileURL)
     m_connectingSubstate = ExecutingPACFile;
 }
 
-void SocketStreamHandle::removePACRunLoopSource()
+void SocketStreamHandleImpl::removePACRunLoopSource()
 {
     ASSERT(m_pacRunLoopSource);
 
@@ -216,7 +216,7 @@ void SocketStreamHandle::removePACRunLoopSource()
     m_pacRunLoopSource = 0;
 }
 
-void SocketStreamHandle::chooseProxy()
+void SocketStreamHandleImpl::chooseProxy()
 {
     RetainPtr<CFDictionaryRef> proxyDictionary = adoptCF(CFNetworkCopySystemProxySettings());
 
@@ -237,7 +237,7 @@ void SocketStreamHandle::chooseProxy()
     chooseProxyFromArray(proxyArray.get());
 }
 
-void SocketStreamHandle::chooseProxyFromArray(CFArrayRef proxyArray)
+void SocketStreamHandleImpl::chooseProxyFromArray(CFArrayRef proxyArray)
 {
     if (!proxyArray) {
         m_connectionType = Direct;
@@ -297,7 +297,7 @@ void SocketStreamHandle::chooseProxyFromArray(CFArrayRef proxyArray)
 }
 
 
-void SocketStreamHandle::createStreams()
+void SocketStreamHandleImpl::createStreams()
 {
     if (m_connectionType == Unknown)
         chooseProxy();
@@ -350,7 +350,7 @@ void SocketStreamHandle::createStreams()
     }
 }
 
-bool SocketStreamHandle::getStoredCONNECTProxyCredentials(const ProtectionSpace& protectionSpace, String& login, String& password)
+bool SocketStreamHandleImpl::getStoredCONNECTProxyCredentials(const ProtectionSpace& protectionSpace, String& login, String& password)
 {
     // FIXME (<rdar://problem/10416495>): Proxy credentials should be retrieved from AuthBrokerAgent.
 
@@ -385,7 +385,7 @@ static ProtectionSpaceAuthenticationScheme authenticationSchemeFromAuthenticatio
     return ProtectionSpaceAuthenticationSchemeUnknown;
 }
 
-void SocketStreamHandle::addCONNECTCredentials(CFHTTPMessageRef proxyResponse)
+void SocketStreamHandleImpl::addCONNECTCredentials(CFHTTPMessageRef proxyResponse)
 {
     RetainPtr<CFHTTPAuthenticationRef> authentication = adoptCF(CFHTTPAuthenticationCreateFromResponse(0, proxyResponse));
 
@@ -436,15 +436,15 @@ void SocketStreamHandle::addCONNECTCredentials(CFHTTPMessageRef proxyResponse)
     m_client.didFailSocketStream(*this, SocketStreamError(0, m_url.string(), "Proxy credentials are not available"));
 }
 
-CFStringRef SocketStreamHandle::copyCFStreamDescription(void* info)
+CFStringRef SocketStreamHandleImpl::copyCFStreamDescription(void* info)
 {
-    SocketStreamHandle* handle = static_cast<SocketStreamHandle*>(info);
+    SocketStreamHandleImpl* handle = static_cast<SocketStreamHandleImpl*>(info);
     return String("WebKit socket stream, " + handle->m_url.string()).createCFString().leakRef();
 }
 
-void SocketStreamHandle::readStreamCallback(CFReadStreamRef stream, CFStreamEventType type, void* clientCallBackInfo)
+void SocketStreamHandleImpl::readStreamCallback(CFReadStreamRef stream, CFStreamEventType type, void* clientCallBackInfo)
 {
-    SocketStreamHandle* handle = static_cast<SocketStreamHandle*>(clientCallBackInfo);
+    SocketStreamHandleImpl* handle = static_cast<SocketStreamHandleImpl*>(clientCallBackInfo);
     ASSERT_UNUSED(stream, stream == handle->m_readStream.get());
     // Workaround for <rdar://problem/17727073>. Keeping this below the assertion as we'd like better steps to reproduce this.
     if (!handle->m_readStream)
@@ -462,9 +462,9 @@ void SocketStreamHandle::readStreamCallback(CFReadStreamRef stream, CFStreamEven
 #endif
 }
 
-void SocketStreamHandle::writeStreamCallback(CFWriteStreamRef stream, CFStreamEventType type, void* clientCallBackInfo)
+void SocketStreamHandleImpl::writeStreamCallback(CFWriteStreamRef stream, CFStreamEventType type, void* clientCallBackInfo)
 {
-    SocketStreamHandle* handle = static_cast<SocketStreamHandle*>(clientCallBackInfo);
+    SocketStreamHandleImpl* handle = static_cast<SocketStreamHandleImpl*>(clientCallBackInfo);
     ASSERT_UNUSED(stream, stream == handle->m_writeStream.get());
     // This wasn't seen happening in practice, yet it seems like it could, due to symmetry with read stream callback.
     if (!handle->m_writeStream)
@@ -482,9 +482,9 @@ void SocketStreamHandle::writeStreamCallback(CFWriteStreamRef stream, CFStreamEv
 #endif
 }
 
-void SocketStreamHandle::readStreamCallback(CFStreamEventType type)
+void SocketStreamHandleImpl::readStreamCallback(CFStreamEventType type)
 {
-    switch(type) {
+    switch (type) {
     case kCFStreamEventNone:
         return;
     case kCFStreamEventOpenCompleted:
@@ -554,9 +554,9 @@ void SocketStreamHandle::readStreamCallback(CFStreamEventType type)
     }
 }
 
-void SocketStreamHandle::writeStreamCallback(CFStreamEventType type)
+void SocketStreamHandleImpl::writeStreamCallback(CFStreamEventType type)
 {
-    switch(type) {
+    switch (type) {
     case kCFStreamEventNone:
         return;
     case kCFStreamEventOpenCompleted:
@@ -610,7 +610,7 @@ void SocketStreamHandle::writeStreamCallback(CFStreamEventType type)
     }
 }
 
-void SocketStreamHandle::reportErrorToClient(CFErrorRef error)
+void SocketStreamHandleImpl::reportErrorToClient(CFErrorRef error)
 {
     CFIndex errorCode = CFErrorGetCode(error);
     String description;
@@ -642,14 +642,14 @@ void SocketStreamHandle::reportErrorToClient(CFErrorRef error)
     m_client.didFailSocketStream(*this, SocketStreamError(static_cast<int>(errorCode), m_url.string(), description));
 }
 
-SocketStreamHandle::~SocketStreamHandle()
+SocketStreamHandleImpl::~SocketStreamHandleImpl()
 {
     LOG(Network, "SocketStreamHandle %p dtor", this);
 
     ASSERT(!m_pacRunLoopSource);
 }
 
-int SocketStreamHandle::platformSend(const char* data, int length)
+int SocketStreamHandleImpl::platformSend(const char* data, int length)
 {
     if (!CFWriteStreamCanAcceptBytes(m_writeStream.get()))
         return 0;
@@ -657,7 +657,7 @@ int SocketStreamHandle::platformSend(const char* data, int length)
     return CFWriteStreamWrite(m_writeStream.get(), reinterpret_cast<const UInt8*>(data), length);
 }
 
-void SocketStreamHandle::platformClose()
+void SocketStreamHandleImpl::platformClose()
 {
     LOG(Network, "SocketStreamHandle %p platformClose", this);
 
@@ -688,7 +688,7 @@ void SocketStreamHandle::platformClose()
     m_client.didCloseSocketStream(*this);
 }
 
-unsigned short SocketStreamHandle::port() const
+unsigned short SocketStreamHandleImpl::port() const
 {
     if (unsigned short urlPort = m_url.port())
         return urlPort;
@@ -697,4 +697,4 @@ unsigned short SocketStreamHandle::port() const
     return 80;
 }
 
-}  // namespace WebCore
+} // namespace WebCore
@@ -31,7 +31,7 @@
 
 #pragma once
 
-#include "SocketStreamHandleBase.h"
+#include "SocketStreamHandle.h"
 
 #if PLATFORM(WIN)
 #include <winsock2.h>
@@ -48,14 +48,14 @@ namespace WebCore {
 
 class SocketStreamHandleClient;
 
-class SocketStreamHandle : public ThreadSafeRefCounted<SocketStreamHandle>, public SocketStreamHandleBase {
+class SocketStreamHandleImpl : public SocketStreamHandle {
 public:
-    static Ref<SocketStreamHandle> create(const URL& url, SocketStreamHandleClient& client, SessionID) { return adoptRef(*new SocketStreamHandle(url, client)); }
+    static Ref<SocketStreamHandle> create(const URL& url, SocketStreamHandleClient& client, SessionID) { return adoptRef(*new SocketStreamHandleImpl(url, client)); }
 
-    virtual ~SocketStreamHandle();
+    virtual ~SocketStreamHandleImpl();
 
 private:
-    SocketStreamHandle(const URL&, SocketStreamHandleClient&);
+    SocketStreamHandleImpl(const URL&, SocketStreamHandleClient&);
 
     int platformSend(const char* data, int length) override;
     void platformClose() override;
@@ -30,7 +30,7 @@
  */
 
 #include "config.h"
-#include "SocketStreamHandle.h"
+#include "SocketStreamHandleImpl.h"
 
 #if USE(CURL)
 
 
 namespace WebCore {
 
-SocketStreamHandle::SocketStreamHandle(const URL& url, SocketStreamHandleClient& client)
-    : SocketStreamHandleBase(url, client)
+SocketStreamHandleImpl::SocketStreamHandleImpl(const URL& url, SocketStreamHandleClient& client)
+    : SocketStreamHandle(url, client)
 {
     LOG(Network, "SocketStreamHandle %p new client %p", this, &m_client);
     ASSERT(isMainThread());
     startThread();
 }
 
-SocketStreamHandle::~SocketStreamHandle()
+SocketStreamHandleImpl::~SocketStreamHandleImpl()
 {
     LOG(Network, "SocketStreamHandle %p delete", this);
     ASSERT(!m_workerThread);
 }
 
-int SocketStreamHandle::platformSend(const char* data, int length)
+int SocketStreamHandleImpl::platformSend(const char* data, int length)
 {
     LOG(Network, "SocketStreamHandle %p platformSend", this);
 
@@ -74,7 +74,7 @@ int SocketStreamHandle::platformSend(const char* data, int length)
     return length;
 }
 
-void SocketStreamHandle::platformClose()
+void SocketStreamHandleImpl::platformClose()
 {
     LOG(Network, "SocketStreamHandle %p platformClose", this);
 
@@ -85,7 +85,7 @@ void SocketStreamHandle::platformClose()
     m_client.didCloseSocketStream(*this);
 }
 
-bool SocketStreamHandle::readData(CURL* curlHandle)
+bool SocketStreamHandleImpl::readData(CURL* curlHandle)
 {
     ASSERT(!isMainThread());
 
@@ -116,7 +116,7 @@ bool SocketStreamHandle::readData(CURL* curlHandle)
     return false;
 }
 
-bool SocketStreamHandle::sendData(CURL* curlHandle)
+bool SocketStreamHandleImpl::sendData(CURL* curlHandle)
 {
     ASSERT(!isMainThread());
 
@@ -156,7 +156,7 @@ bool SocketStreamHandle::sendData(CURL* curlHandle)
     return true;
 }
 
-bool SocketStreamHandle::waitForAvailableData(CURL* curlHandle, std::chrono::milliseconds selectTimeout)
+bool SocketStreamHandleImpl::waitForAvailableData(CURL* curlHandle, std::chrono::milliseconds selectTimeout)
 {
     ASSERT(!isMainThread());
 
@@ -182,7 +182,7 @@ bool SocketStreamHandle::waitForAvailableData(CURL* curlHandle, std::chrono::mil
     return rc == 1;
 }
 
-void SocketStreamHandle::startThread()
+void SocketStreamHandleImpl::startThread()
 {
     ASSERT(isMainThread());
 
@@ -232,7 +232,7 @@ void SocketStreamHandle::startThread()
     });
 }
 
-void SocketStreamHandle::stopThread()
+void SocketStreamHandleImpl::stopThread()
 {
     ASSERT(isMainThread());
 
@@ -245,7 +245,7 @@ void SocketStreamHandle::stopThread()
     deref();
 }
 
-void SocketStreamHandle::didReceiveData()
+void SocketStreamHandleImpl::didReceiveData()
 {
     ASSERT(isMainThread());
 
@@ -264,7 +264,7 @@ void SocketStreamHandle::didReceiveData()
     }
 }
 
-void SocketStreamHandle::didOpenSocket()
+void SocketStreamHandleImpl::didOpenSocket()
 {
     ASSERT(isMainThread());
 
@@ -273,7 +273,7 @@ void SocketStreamHandle::didOpenSocket()
     m_client.didOpenSocketStream(*this);
 }
 
-std::unique_ptr<char[]> SocketStreamHandle::createCopy(const char* data, int length)
+std::unique_ptr<char[]> SocketStreamHandleImpl::createCopy(const char* data, int length)
 {
     std::unique_ptr<char[]> copy(new char[length]);
     memcpy(copy.get(), data, length);
@@ -32,7 +32,7 @@
 
 #pragma once
 
-#include "SocketStreamHandleBase.h"
+#include "SocketStreamHandle.h"
 
 #if USE(SOUP)
 
@@ -45,15 +45,15 @@ namespace WebCore {
 class SocketStreamError;
 class SocketStreamHandleClient;
 
-class SocketStreamHandle final : public RefCounted<SocketStreamHandle>, public SocketStreamHandleBase {
+class SocketStreamHandleImpl final : public SocketStreamHandle {
 public:
     static Ref<SocketStreamHandle> create(const URL&, SocketStreamHandleClient&, SessionID);
     static Ref<SocketStreamHandle> create(GSocketConnection*, SocketStreamHandleClient&);
 
-    virtual ~SocketStreamHandle();
+    virtual ~SocketStreamHandleImpl();
 
 private:
-    SocketStreamHandle(const URL&, SocketStreamHandleClient&);
+    SocketStreamHandleImpl(const URL&, SocketStreamHandleClient&);
 
     int platformSend(const char* data, int length) override;
     void platformClose() override;
@@ -61,9 +61,9 @@ private:
     void beginWaitingForSocketWritability();
     void stopWaitingForSocketWritability();
 
-    static void connectedCallback(GSocketClient*, GAsyncResult*, SocketStreamHandle*);
-    static void readReadyCallback(GInputStream*, GAsyncResult*, SocketStreamHandle*);
-    static gboolean writeReadyCallback(GPollableOutputStream*, SocketStreamHandle*);
+    static void connectedCallback(GSocketClient*, GAsyncResult*, SocketStreamHandleImpl*);
+    static void readReadyCallback(GInputStream*, GAsyncResult*, SocketStreamHandleImpl*);
+    static gboolean writeReadyCallback(GPollableOutputStream*, SocketStreamHandleImpl*);
 
     void connected(GRefPtr<GSocketConnection>&&);
     void readBytes(gssize);
@@ -78,6 +78,6 @@ private:
     std::unique_ptr<char[]> m_readBuffer;
 };
 
-}  // namespace WebCore
+} // namespace WebCore
 
 #endif
  */
 
 #include "config.h"
-#include "SocketStreamHandle.h"
+#include "SocketStreamHandleImpl.h"
 
 #if USE(SOUP)
 
-#include "URL.h"
 #include "Logging.h"
 #include "SocketStreamError.h"
 #include "SocketStreamHandleClient.h"
+#include "URL.h"
 #include <gio/gio.h>
 #include <glib.h>
 #include <wtf/Vector.h>
@@ -48,9 +48,9 @@
 
 namespace WebCore {
 
-Ref<SocketStreamHandle> SocketStreamHandle::create(const URL& url, SocketStreamHandleClient& client, SessionID)
+Ref<SocketStreamHandle> SocketStreamHandleImpl::create(const URL& url, SocketStreamHandleClient& client, SessionID)
 {
-    Ref<SocketStreamHandle> socket = adoptRef(*new SocketStreamHandle(url, client));
+    Ref<SocketStreamHandleImpl> socket = adoptRef(*new SocketStreamHandleImpl(url, client));
 
     unsigned port = url.hasPort() ? url.port() : (url.protocolIs("wss") ? 443 : 80);
     GRefPtr<GSocketClient> socketClient = adoptGRef(g_socket_client_new());
@@ -59,38 +59,38 @@ Ref<SocketStreamHandle> SocketStreamHandle::create(const URL& url, SocketStreamH
     Ref<SocketStreamHandle> protectedSocketStreamHandle = socket.copyRef();
     g_socket_client_connect_to_host_async(socketClient.get(), url.host().utf8().data(), port, socket->m_cancellable.get(),
         reinterpret_cast<GAsyncReadyCallback>(connectedCallback), &protectedSocketStreamHandle.leakRef());
-    return socket;
+    return WTFMove(socket);
 }
 
-Ref<SocketStreamHandle> SocketStreamHandle::create(GSocketConnection* socketConnection, SocketStreamHandleClient& client)
+Ref<SocketStreamHandle> SocketStreamHandleImpl::create(GSocketConnection* socketConnection, SocketStreamHandleClient& client)
 {
-    Ref<SocketStreamHandle> socket = adoptRef(*new SocketStreamHandle(URL(), client));
+    Ref<SocketStreamHandleImpl> socket = adoptRef(*new SocketStreamHandleImpl(URL(), client));
 
     GRefPtr<GSocketConnection> connection = socketConnection;
     socket->connected(WTFMove(connection));
-    return socket;
+    return WTFMove(socket);
 }
 
-SocketStreamHandle::SocketStreamHandle(const URL& url, SocketStreamHandleClient& client)
-    : SocketStreamHandleBase(url, client)
+SocketStreamHandleImpl::SocketStreamHandleImpl(const URL& url, SocketStreamHandleClient& client)
+    : SocketStreamHandle(url, client)
     , m_cancellable(adoptGRef(g_cancellable_new()))
 {
     LOG(Network, "SocketStreamHandle %p new client %p", this, &m_client);
 }
 
-SocketStreamHandle::~SocketStreamHandle()
+SocketStreamHandleImpl::~SocketStreamHandleImpl()
 {
     LOG(Network, "SocketStreamHandle %p delete", this);
 }
 
-void SocketStreamHandle::connected(GRefPtr<GSocketConnection>&& socketConnection)
+void SocketStreamHandleImpl::connected(GRefPtr<GSocketConnection>&& socketConnection)
 {
     m_socketConnection = WTFMove(socketConnection);
     m_outputStream = G_POLLABLE_OUTPUT_STREAM(g_io_stream_get_output_stream(G_IO_STREAM(m_socketConnection.get())));
     m_inputStream = g_io_stream_get_input_stream(G_IO_STREAM(m_socketConnection.get()));
     m_readBuffer = std::make_unique<char[]>(READ_BUFFER_SIZE);
 
-    RefPtr<SocketStreamHandle> protectedThis(this);
+    RefPtr<SocketStreamHandleImpl> protectedThis(this);
     g_input_stream_read_async(m_inputStream.get(), m_readBuffer.get(), READ_BUFFER_SIZE, G_PRIORITY_DEFAULT, m_cancellable.get(),
         reinterpret_cast<GAsyncReadyCallback>(readReadyCallback), protectedThis.leakRef());
 
@@ -98,7 +98,7 @@ void SocketStreamHandle::connected(GRefPtr<GSocketConnection>&& socketConnection
     m_client.didOpenSocketStream(*this);
 }
 
-void SocketStreamHandle::connectedCallback(GSocketClient* client, GAsyncResult* result, SocketStreamHandle* handle)
+void SocketStreamHandleImpl::connectedCallback(GSocketClient* client, GAsyncResult* result, SocketStreamHandleImpl* handle)
 {
     RefPtr<SocketStreamHandle> protectedThis = adoptRef(handle);
 
@@ -119,7 +119,7 @@ void SocketStreamHandle::connectedCallback(GSocketClient* client, GAsyncResult*
         handle->connected(WTFMove(socketConnection));
 }
 
-void SocketStreamHandle::readBytes(gssize bytesRead)
+void SocketStreamHandleImpl::readBytes(gssize bytesRead)
 {
     if (!bytesRead) {
         close();
@@ -135,7 +135,7 @@ void SocketStreamHandle::readBytes(gssize bytesRead)
     }
 }
 
-void SocketStreamHandle::readReadyCallback(GInputStream* stream, GAsyncResult* result, SocketStreamHandle* handle)
+void SocketStreamHandleImpl::readReadyCallback(GInputStream* stream, GAsyncResult* result, SocketStreamHandleImpl* handle)
 {
     RefPtr<SocketStreamHandle> protectedThis = adoptRef(handle);
 
@@ -152,12 +152,12 @@ void SocketStreamHandle::readReadyCallback(GInputStream* stream, GAsyncResult* r
         handle->readBytes(bytesRead);
 }
 
-void SocketStreamHandle::didFail(SocketStreamError&& error)
+void SocketStreamHandleImpl::didFail(SocketStreamError&& error)
 {
     m_client.didFailSocketStream(*this, WTFMove(error));
 }
 
-void SocketStreamHandle::writeReady()
+void SocketStreamHandleImpl::writeReady()
 {
     // We no longer have buffered data, so stop waiting for the socket to be writable.
     if (!bufferedAmount()) {
@@ -168,7 +168,7 @@ void SocketStreamHandle::writeReady()
     sendPendingData();
 }
 
-int SocketStreamHandle::platformSend(const char* data, int length)
+int SocketStreamHandleImpl::platformSend(const char* data, int length)
 {
     LOG(Network, "SocketStreamHandle %p platformSend", this);
     if (!m_outputStream || !data)
@@ -185,14 +185,14 @@ int SocketStreamHandle::platformSend(const char* data, int length)
     }
 
     // If we did not send all the bytes we were given, we know that
-    // SocketStreamHandleBase will need to send more in the future.
+    // SocketStreamHandle will need to send more in the future.
     if (written < length)
         beginWaitingForSocketWritability();
 
     return written;
 }
 
-void SocketStreamHandle::platformClose()
+void SocketStreamHandleImpl::platformClose()
 {
     LOG(Network, "SocketStreamHandle %p platformClose", this);
     // We cancel this handle first to disable all callbacks.
@@ -214,19 +214,20 @@ void SocketStreamHandle::platformClose()
     m_client.didCloseSocketStream(*this);
 }
 
-void SocketStreamHandle::beginWaitingForSocketWritability()
+void SocketStreamHandleImpl::beginWaitingForSocketWritability()
 {
     if (m_writeReadySource) // Already waiting.
         return;
 
     m_writeReadySource = adoptGRef(g_pollable_output_stream_create_source(m_outputStream.get(), m_cancellable.get()));
     ref();
-    g_source_set_callback(m_writeReadySource.get(), reinterpret_cast<GSourceFunc>(writeReadyCallback), this,
-        [](gpointer handle) { static_cast<SocketStreamHandle*>(handle)->deref(); });
+    g_source_set_callback(m_writeReadySource.get(), reinterpret_cast<GSourceFunc>(writeReadyCallback), this, [](gpointer handle) { 
+        static_cast<SocketStreamHandleImpl*>(handle)->deref();
+    });
     g_source_attach(m_writeReadySource.get(), g_main_context_get_thread_default());
 }
 
-void SocketStreamHandle::stopWaitingForSocketWritability()
+void SocketStreamHandleImpl::stopWaitingForSocketWritability()
 {
     if (!m_writeReadySource) // Not waiting.
         return;
@@ -235,7 +236,7 @@ void SocketStreamHandle::stopWaitingForSocketWritability()
     m_writeReadySource = nullptr;
 }
 
-gboolean SocketStreamHandle::writeReadyCallback(GPollableOutputStream*, SocketStreamHandle* handle)
+gboolean SocketStreamHandleImpl::writeReadyCallback(GPollableOutputStream*, SocketStreamHandleImpl* handle)
 {
     if (g_cancellable_is_cancelled(handle->m_cancellable.get()))
         return G_SOURCE_REMOVE;
index 6403ec3..d5a92d6 100644 (file)
@@ -1,3 +1,13 @@
+2016-08-15  Alex Christensen  <achristensen@webkit.org>
+
+        Rename SocketStreamHandleBase to SocketStreamHandle and SocketStreamHandle to SocketStreamHandleImpl
+        https://bugs.webkit.org/show_bug.cgi?id=160858
+
+        Reviewed by Brady Eidson.
+
+        * WebProcess/Network/WebSocketProvider.cpp:
+        (WebKit::WebSocketProvider::createSocketStreamHandle):
+
 2016-08-15  Anders Carlsson  <andersca@apple.com>
 
         Fix iOS build.
index 597d5c3..bf3e019 100644 (file)
@@ -28,7 +28,7 @@
 
 #include "Logging.h"
 #include "WebSocketServerConnection.h"
-#include <WebCore/SocketStreamHandle.h>
+#include <WebCore/SocketStreamHandleImpl.h>
 #include <gio/gio.h>
 #include <glib.h>
 #include <wtf/glib/GUniquePtr.h>
@@ -47,7 +47,7 @@ static gboolean connectionCallback(GSocketService* /*service*/, GSocketConnectio
 #endif
 
     auto webSocketConnection = std::make_unique<WebSocketServerConnection>(server->client(), server);
-    webSocketConnection->setSocketHandle(SocketStreamHandle::create(connection, *webSocketConnection));
+    webSocketConnection->setSocketHandle(SocketStreamHandleImpl::create(connection, *webSocketConnection));
     server->didAcceptConnection(WTFMove(webSocketConnection));
 
     return TRUE;
index ff92574..d54e141 100644 (file)
 
 #if ENABLE(WEB_SOCKETS)
 
-#include <WebCore/Document.h>
-#include <WebCore/ScriptExecutionContext.h>
-#include <WebCore/SocketStreamHandle.h>
-#include <WebCore/ThreadableWebSocketChannelClientWrapper.h>
-#include <WebCore/WebSocketChannel.h>
-#include <WebCore/WebSocketChannelClient.h>
-#include <WebCore/WorkerGlobalScope.h>
-#include <WebCore/WorkerRunLoop.h>
-#include <WebCore/WorkerThread.h>
-#include <WebCore/WorkerThreadableWebSocketChannel.h>
+#include <WebCore/SocketStreamHandleImpl.h>
 
 using namespace WebCore;
 
@@ -51,7 +42,7 @@ namespace WebKit {
 Ref<SocketStreamHandle> WebSocketProvider::createSocketStreamHandle(const URL& url, SocketStreamHandleClient& client, SessionID sessionID)
 {
     // FIXME: This should return a proxy so we can do the actual network interactions in the NetworkProcess.
-    return SocketStreamHandle::create(url, client, sessionID);
+    return SocketStreamHandleImpl::create(url, client, sessionID);
 }
 
 } // namespace WebKit