Title: [214091] trunk/Source/WebKit2
- Revision
- 214091
- Author
- achristen...@apple.com
- Date
- 2017-03-16 18:56:05 -0700 (Thu, 16 Mar 2017)
Log Message
Fix GTK build.
* UIProcess/InspectorServer/WebSocketServerConnection.cpp:
(WebKit::WebSocketServerConnection::didReceiveSocketStreamData):
* UIProcess/InspectorServer/WebSocketServerConnection.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (214090 => 214091)
--- trunk/Source/WebKit2/ChangeLog 2017-03-17 01:43:05 UTC (rev 214090)
+++ trunk/Source/WebKit2/ChangeLog 2017-03-17 01:56:05 UTC (rev 214091)
@@ -1,3 +1,11 @@
+2017-03-16 Alex Christensen <achristen...@webkit.org>
+
+ Fix GTK build.
+
+ * UIProcess/InspectorServer/WebSocketServerConnection.cpp:
+ (WebKit::WebSocketServerConnection::didReceiveSocketStreamData):
+ * UIProcess/InspectorServer/WebSocketServerConnection.h:
+
2017-03-16 Michael Saboff <msab...@apple.com>
Turn off _javascript_ Configuration File processing for Debug builds
Modified: trunk/Source/WebKit2/UIProcess/InspectorServer/WebSocketServerConnection.cpp (214090 => 214091)
--- trunk/Source/WebKit2/UIProcess/InspectorServer/WebSocketServerConnection.cpp 2017-03-17 01:43:05 UTC (rev 214090)
+++ trunk/Source/WebKit2/UIProcess/InspectorServer/WebSocketServerConnection.cpp 2017-03-17 01:56:05 UTC (rev 214091)
@@ -133,12 +133,11 @@
m_server->didCloseWebSocketServerConnection(this);
}
-void WebSocketServerConnection::didReceiveSocketStreamData(SocketStreamHandle&, const char* data, std::optional<size_t> length)
+void WebSocketServerConnection::didReceiveSocketStreamData(SocketStreamHandle&, const char* data, size_t length)
{
// Each didReceiveData call adds more data to our buffer.
// We clear the buffer when we have handled data from it.
- if (length)
- m_bufferedData.append(data, length.value());
+ m_bufferedData.append(data, length);
switch (m_mode) {
case HTTP:
Modified: trunk/Source/WebKit2/UIProcess/InspectorServer/WebSocketServerConnection.h (214090 => 214091)
--- trunk/Source/WebKit2/UIProcess/InspectorServer/WebSocketServerConnection.h 2017-03-17 01:43:05 UTC (rev 214090)
+++ trunk/Source/WebKit2/UIProcess/InspectorServer/WebSocketServerConnection.h 2017-03-17 01:56:05 UTC (rev 214091)
@@ -69,7 +69,8 @@
// SocketStreamHandleClient implementation.
void didOpenSocketStream(WebCore::SocketStreamHandle&) final { }
void didCloseSocketStream(WebCore::SocketStreamHandle&) final;
- void didReceiveSocketStreamData(WebCore::SocketStreamHandle&, const char* data, std::optional<size_t> length) final;
+ void didReceiveSocketStreamData(WebCore::SocketStreamHandle&, const char*, size_t) final;
+ void didFailToReceiveSocketStreamData(SocketStreamHandle&) final { }
void didUpdateBufferedAmount(WebCore::SocketStreamHandle&, size_t bufferedAmount) final;
void didFailSocketStream(WebCore::SocketStreamHandle&, const WebCore::SocketStreamError&) final { }
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
