Title: [204515] trunk/Source/WebCore
- Revision
- 204515
- Author
- achristen...@apple.com
- Date
- 2016-08-16 11:11:55 -0700 (Tue, 16 Aug 2016)
Log Message
Fix WinCairo build after r204512.
* platform/network/curl/SocketStreamHandleImpl.h:
* platform/network/curl/SocketStreamHandleImplCurl.cpp:
(WebCore::createCopy):
(WebCore::SocketStreamHandleImpl::createCopy): Deleted.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (204514 => 204515)
--- trunk/Source/WebCore/ChangeLog 2016-08-16 18:03:38 UTC (rev 204514)
+++ trunk/Source/WebCore/ChangeLog 2016-08-16 18:11:55 UTC (rev 204515)
@@ -1,5 +1,14 @@
2016-08-16 Alex Christensen <achristen...@webkit.org>
+ Fix WinCairo build after r204512.
+
+ * platform/network/curl/SocketStreamHandleImpl.h:
+ * platform/network/curl/SocketStreamHandleImplCurl.cpp:
+ (WebCore::createCopy):
+ (WebCore::SocketStreamHandleImpl::createCopy): Deleted.
+
+2016-08-16 Alex Christensen <achristen...@webkit.org>
+
Clean up WebSockets
https://bugs.webkit.org/show_bug.cgi?id=160889
Modified: trunk/Source/WebCore/platform/network/curl/SocketStreamHandleImpl.h (204514 => 204515)
--- trunk/Source/WebCore/platform/network/curl/SocketStreamHandleImpl.h 2016-08-16 18:03:38 UTC (rev 204514)
+++ trunk/Source/WebCore/platform/network/curl/SocketStreamHandleImpl.h 2016-08-16 18:11:55 UTC (rev 204515)
@@ -70,8 +70,6 @@
void didReceiveData();
void didOpenSocket();
- static std::unique_ptr<char[]> createCopy(const char* data, size_t length);
-
struct SocketData {
SocketData(std::unique_ptr<char[]>&& source, size_t length)
{
Modified: trunk/Source/WebCore/platform/network/curl/SocketStreamHandleImplCurl.cpp (204514 => 204515)
--- trunk/Source/WebCore/platform/network/curl/SocketStreamHandleImplCurl.cpp 2016-08-16 18:03:38 UTC (rev 204514)
+++ trunk/Source/WebCore/platform/network/curl/SocketStreamHandleImplCurl.cpp 2016-08-16 18:11:55 UTC (rev 204515)
@@ -44,6 +44,14 @@
namespace WebCore {
+static std::unique_ptr<char[]> createCopy(const char* data, int length)
+{
+ std::unique_ptr<char[]> copy(new char[length]);
+ memcpy(copy.get(), data, length);
+
+ return WTFMove(copy);
+}
+
SocketStreamHandleImpl::SocketStreamHandleImpl(const URL& url, SocketStreamHandleClient& client)
: SocketStreamHandle(url, client)
{
@@ -273,14 +281,6 @@
m_client.didOpenSocketStream(*this);
}
-std::unique_ptr<char[]> SocketStreamHandleImpl::createCopy(const char* data, int length)
-{
- std::unique_ptr<char[]> copy(new char[length]);
- memcpy(copy.get(), data, length);
-
- return WTFMove(copy);
-}
-
} // namespace WebCore
#endif
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
