Title: [227362] branches/safari-605-branch/Source/WebCore
- Revision
- 227362
- Author
- [email protected]
- Date
- 2018-01-22 14:17:21 -0800 (Mon, 22 Jan 2018)
Log Message
Cherry-pick r227213. rdar://problem/36722644
Modified Paths
Diff
Modified: branches/safari-605-branch/Source/WebCore/ChangeLog (227361 => 227362)
--- branches/safari-605-branch/Source/WebCore/ChangeLog 2018-01-22 22:17:18 UTC (rev 227361)
+++ branches/safari-605-branch/Source/WebCore/ChangeLog 2018-01-22 22:17:21 UTC (rev 227362)
@@ -1,5 +1,18 @@
2018-01-22 Jason Marcell <[email protected]>
+ Cherry-pick r227213. rdar://problem/36722644
+
+ 2018-01-19 Jonathan Bedard <[email protected]>
+
+ Unreviewed build fix, remove unused lambda captures.
+
+ * dom/messageports/MessagePortChannel.cpp:
+ (WebCore::MessagePortChannel::takeAllMessagesForPort):
+ * dom/messageports/MessagePortChannelRegistry.cpp:
+ (WebCore::MessagePortChannelRegistry::messagePortChannelCreated):
+
+2018-01-22 Jason Marcell <[email protected]>
+
Cherry-pick r227190. rdar://problem/36722644
2018-01-18 Brady Eidson <[email protected]>
Modified: branches/safari-605-branch/Source/WebCore/dom/messageports/MessagePortChannel.cpp (227361 => 227362)
--- branches/safari-605-branch/Source/WebCore/dom/messageports/MessagePortChannel.cpp 2018-01-22 22:17:18 UTC (rev 227361)
+++ branches/safari-605-branch/Source/WebCore/dom/messageports/MessagePortChannel.cpp 2018-01-22 22:17:21 UTC (rev 227362)
@@ -184,6 +184,9 @@
locker.unlockEarly();
callback(WTFMove(result), [size, this, port, protectedThis = WTFMove(m_pendingMessageProtectors[i]), transferredPortProtectors = WTFMove(transferredPortProtectors)] {
UNUSED_PARAM(port);
+#if LOG_DISABLED
+ UNUSED_PARAM(size);
+#endif
--m_messageBatchesInFlight;
LOG(MessagePorts, "Message port channel %s was notified that a batch of %zu message port messages targeted for port %s just completed dispatch, in flight is now %llu", logString().utf8().data(), size, port.logString().utf8().data(), m_messageBatchesInFlight);
Modified: branches/safari-605-branch/Source/WebCore/dom/messageports/MessagePortChannelRegistry.cpp (227361 => 227362)
--- branches/safari-605-branch/Source/WebCore/dom/messageports/MessagePortChannelRegistry.cpp 2018-01-22 22:17:18 UTC (rev 227361)
+++ branches/safari-605-branch/Source/WebCore/dom/messageports/MessagePortChannelRegistry.cpp 2018-01-22 22:17:21 UTC (rev 227362)
@@ -48,12 +48,12 @@
Locker<Lock> locker(m_openChannelsLock);
ASSERT(isMainThread());
- auto result = m_openChannels.ensure(channel.port1(), [this, channel = &channel] {
+ auto result = m_openChannels.ensure(channel.port1(), [channel = &channel] {
return channel;
});
ASSERT(result.isNewEntry);
- result = m_openChannels.ensure(channel.port2(), [this, channel = &channel] {
+ result = m_openChannels.ensure(channel.port2(), [channel = &channel] {
return channel;
});
ASSERT(result.isNewEntry);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
