Title: [217693] trunk/Source/WebCore
- Revision
- 217693
- Author
- [email protected]
- Date
- 2017-06-01 21:14:40 -0700 (Thu, 01 Jun 2017)
Log Message
Unreviewed Windows build fix after r217691.
* Modules/websockets/WebSocketChannel.cpp:
(WebCore::WebSocketChannel::sendFrame):
* Modules/websockets/WebSocketChannel.h:
Disambiguate the Function being used.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (217692 => 217693)
--- trunk/Source/WebCore/ChangeLog 2017-06-02 02:50:50 UTC (rev 217692)
+++ trunk/Source/WebCore/ChangeLog 2017-06-02 04:14:40 UTC (rev 217693)
@@ -1,3 +1,12 @@
+2017-06-01 Joseph Pecoraro <[email protected]>
+
+ Unreviewed Windows build fix after r217691.
+
+ * Modules/websockets/WebSocketChannel.cpp:
+ (WebCore::WebSocketChannel::sendFrame):
+ * Modules/websockets/WebSocketChannel.h:
+ Disambiguate the Function being used.
+
2017-06-01 Youenn Fablet <[email protected]>
LibWebRTC might crash with frames having a null width or height
Modified: trunk/Source/WebCore/Modules/websockets/WebSocketChannel.cpp (217692 => 217693)
--- trunk/Source/WebCore/Modules/websockets/WebSocketChannel.cpp 2017-06-02 02:50:50 UTC (rev 217692)
+++ trunk/Source/WebCore/Modules/websockets/WebSocketChannel.cpp 2017-06-02 04:14:40 UTC (rev 217693)
@@ -811,7 +811,7 @@
}
}
-void WebSocketChannel::sendFrame(WebSocketFrame::OpCode opCode, const char* data, size_t dataLength, Function<void(bool)> completionHandler)
+void WebSocketChannel::sendFrame(WebSocketFrame::OpCode opCode, const char* data, size_t dataLength, WTF::Function<void(bool)> completionHandler)
{
ASSERT(m_handle);
ASSERT(!m_suspended);
Modified: trunk/Source/WebCore/Modules/websockets/WebSocketChannel.h (217692 => 217693)
--- trunk/Source/WebCore/Modules/websockets/WebSocketChannel.h 2017-06-02 02:50:50 UTC (rev 217692)
+++ trunk/Source/WebCore/Modules/websockets/WebSocketChannel.h 2017-06-02 04:14:40 UTC (rev 217693)
@@ -183,7 +183,7 @@
// If you are going to send a hybi-10 frame, you need to use the outgoing frame queue
// instead of call sendFrame() directly.
- void sendFrame(WebSocketFrame::OpCode, const char* data, size_t dataLength, Function<void(bool)> completionHandler);
+ void sendFrame(WebSocketFrame::OpCode, const char* data, size_t dataLength, WTF::Function<void(bool)> completionHandler);
enum BlobLoaderStatus {
BlobLoaderNotStarted,
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
