Changeset 139774 in webkit

Timestamp:

Jan 15, 2013 12:46:19 PM (11 years ago)

Author:

pilgrim@chromium.org

Message:

[Chromium] Move SocketStreamHandle and SocketStreamHandleInternal to WebCore/platform
​https://bugs.webkit.org/show_bug.cgi?id=106899

Reviewed by Adam Barth.

Part of a larger refactoring series; see tracking bug 106829.

Source/WebCore:

• WebCore.gypi:
• platform/network/chromium/SocketStreamHandle.cpp: Copied from Source/WebKit/chromium/src/SocketStreamHandle.cpp.

(WebCore::SocketStreamHandleInternal::send):
(WebCore::SocketStreamHandleInternal::didOpenStream):
(WebCore::SocketStreamHandleInternal::didSendData):
(WebCore::SocketStreamHandleInternal::didReceiveData):
(WebCore::SocketStreamHandleInternal::didClose):
(WebCore::SocketStreamHandleInternal::didFail):

• platform/network/chromium/SocketStreamHandleInternal.h: Copied from Source/WebKit/chromium/src/SocketStreamHandleInternal.h.

Source/WebKit/chromium:

• WebKit.gyp:
• src/SocketStreamHandle.cpp: Removed.
• src/SocketStreamHandleInternal.h: Removed.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.gypi (modified) (1 diff)
• WebCore/platform/network/chromium/SocketStreamHandle.cpp (moved) (moved from trunk/Source/WebKit/chromium/src/SocketStreamHandle.cpp) (7 diffs)
• WebCore/platform/network/chromium/SocketStreamHandleInternal.h (moved) (moved from trunk/Source/WebKit/chromium/src/SocketStreamHandleInternal.h)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/WebKit.gyp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-15  Mark Pilgrim  <pilgrim@chromium.org>
+
+        [Chromium] Move SocketStreamHandle and SocketStreamHandleInternal to WebCore/platform
+        https://bugs.webkit.org/show_bug.cgi?id=106899
+
+        Reviewed by Adam Barth.
+
+        Part of a larger refactoring series; see tracking bug 106829.
+
+        * WebCore.gypi:
+        * platform/network/chromium/SocketStreamHandle.cpp: Copied from Source/WebKit/chromium/src/SocketStreamHandle.cpp.
+        (WebCore::SocketStreamHandleInternal::send):
+        (WebCore::SocketStreamHandleInternal::didOpenStream):
+        (WebCore::SocketStreamHandleInternal::didSendData):
+        (WebCore::SocketStreamHandleInternal::didReceiveData):
+        (WebCore::SocketStreamHandleInternal::didClose):
+        (WebCore::SocketStreamHandleInternal::didFail):
+        * platform/network/chromium/SocketStreamHandleInternal.h: Copied from Source/WebKit/chromium/src/SocketStreamHandleInternal.h.
+
 2013-01-15  Ojan Vafai  <ojan@chromium.org>
 

trunk/Source/WebCore/WebCore.gypi

@@ -4437 +4437 @@
             'platform/network/chromium/ResourceResponse.h',
             'platform/network/chromium/SocketStreamError.h',
+            'platform/network/chromium/SocketStreamHandle.cpp',
             'platform/network/chromium/SocketStreamHandle.h',
+            'platform/network/chromium/SocketStreamHandleInternal.h',
             'platform/network/curl/AuthenticationChallenge.h',
             'platform/network/curl/CookieJarCurl.cpp',

trunk/Source/WebCore/platform/network/chromium/SocketStreamHandle.cpp

@@ -43 +43 @@
 #include <wtf/PassOwnPtr.h>
 
-using namespace WebKit;
-
 namespace WebCore {
 
@@ -85 +83 @@
     if (len <= 0)
         return len;
-    WebData webdata(data, len);
+    WebKit::WebData webdata(data, len);
     if (m_socket->send(webdata)) {
         m_pendingAmountSent += len;
@@ -102 +100 @@
 }
     
-void SocketStreamHandleInternal::didOpenStream(WebSocketStreamHandle* socketHandle, int maxPendingSendAllowed)
+void SocketStreamHandleInternal::didOpenStream(WebKit::WebSocketStreamHandle* socketHandle, int maxPendingSendAllowed)
 {
     LOG(Network, "SocketStreamHandleInternal::didOpen %d",
@@ -119 +117 @@
 }
 
-void SocketStreamHandleInternal::didSendData(WebSocketStreamHandle* socketHandle, int amountSent)
+void SocketStreamHandleInternal::didSendData(WebKit::WebSocketStreamHandle* socketHandle, int amountSent)
 {
     LOG(Network, "SocketStreamHandleInternal::didSendData %d", amountSent);
@@ -131 +129 @@
 }
 
-void SocketStreamHandleInternal::didReceiveData(WebSocketStreamHandle* socketHandle, const WebData& data)
+void SocketStreamHandleInternal::didReceiveData(WebKit::WebSocketStreamHandle* socketHandle, const WebKit::WebData& data)
 {
     LOG(Network, "didReceiveData");
@@ -141 +139 @@
 }
 
-void SocketStreamHandleInternal::didClose(WebSocketStreamHandle* socketHandle)
+void SocketStreamHandleInternal::didClose(WebKit::WebSocketStreamHandle* socketHandle)
 {
     LOG(Network, "didClose");
@@ -154 +152 @@
 }
 
-void SocketStreamHandleInternal::didFail(WebSocketStreamHandle* socketHandle, const WebSocketStreamError& err)
+void SocketStreamHandleInternal::didFail(WebKit::WebSocketStreamHandle* socketHandle, const WebKit::WebSocketStreamError& err)
 {
     LOG(Network, "didFail");

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2013-01-15  Mark Pilgrim  <pilgrim@chromium.org>
+
+        [Chromium] Move SocketStreamHandle and SocketStreamHandleInternal to WebCore/platform
+        https://bugs.webkit.org/show_bug.cgi?id=106899
+
+        Reviewed by Adam Barth.
+
+        Part of a larger refactoring series; see tracking bug 106829.
+
+        * WebKit.gyp:
+        * src/SocketStreamHandle.cpp: Removed.
+        * src/SocketStreamHandleInternal.h: Removed.
+
 2013-01-15  Florin Malita  <fmalita@chromium.org>
 

trunk/Source/WebKit/chromium/WebKit.gyp

@@ -455 +455 @@
                 'src/ScrollbarGroup.h',
                 'src/SharedWorkerRepository.cpp',
-                'src/SocketStreamHandle.cpp',
-                'src/SocketStreamHandleInternal.h',
                 'src/SpeechInputClientImpl.cpp',
                 'src/SpeechInputClientImpl.h',