Title: [229246] releases/WebKitGTK/webkit-2.20/Source/WebCore
- Revision
- 229246
- Author
- [email protected]
- Date
- 2018-03-05 03:22:11 -0800 (Mon, 05 Mar 2018)
Log Message
Merge r229004 - Fix build error with !LOG_DISABLED
https://bugs.webkit.org/show_bug.cgi?id=183049
Reviewed by Philippe Normand.
The following error message was being reported when doing a
release build with -DLOG_DISABLED=0:
../../Source/WebCore/dom/messageports/MessagePortChannel.cpp: In member function ‘void WebCore::MessagePortChannel::entanglePortWithProcess(const WebCore::MessagePortIdentifier&, WebCore::ProcessIdentifier)’:
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/ChangeLog (229245 => 229246)
--- releases/WebKitGTK/webkit-2.20/Source/WebCore/ChangeLog 2018-03-05 11:22:04 UTC (rev 229245)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/ChangeLog 2018-03-05 11:22:11 UTC (rev 229246)
@@ -1,3 +1,23 @@
+2018-02-26 Charlie Turner <[email protected]>
+
+ Fix build error with !LOG_DISABLED
+ https://bugs.webkit.org/show_bug.cgi?id=183049
+
+ Reviewed by Philippe Normand.
+
+ The following error message was being reported when doing a
+ release build with -DLOG_DISABLED=0:
+
+ ../../Source/WebCore/dom/messageports/MessagePortChannel.cpp: In member function ‘void WebCore::MessagePortChannel::entanglePortWithProcess(const WebCore::MessagePortIdentifier&, WebCore::ProcessIdentifier)’:
+../../Source/WebCore/dom/messageports/MessagePortChannel.cpp:85:111: error: ‘logString’ was not declared in this scope
+ LOG(MessagePorts, "MessagePortChannel %s (%p) entangling port %s (that port has %zu messages available)", logString().utf8().data(), this, port.logString().utf8().data(), m_pendingMessages[i].size());
+
+ Other uses of logString are guarded by !LOG_DISABLED rather than
+ NDEBUG, which was the cause of this issue.
+
+ * dom/messageports/MessagePortChannel.h: Guard using !LOG_DISABLED
+ rather than NDEBUG.
+
2018-02-26 Commit Queue <[email protected]>
Unreviewed, rolling out r226745.
Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/dom/messageports/MessagePortChannel.h (229245 => 229246)
--- releases/WebKitGTK/webkit-2.20/Source/WebCore/dom/messageports/MessagePortChannel.h 2018-03-05 11:22:04 UTC (rev 229245)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/dom/messageports/MessagePortChannel.h 2018-03-05 11:22:11 UTC (rev 229246)
@@ -60,7 +60,7 @@
uint64_t beingTransferredCount();
-#ifndef NDEBUG
+#if !LOG_DISABLED
String logString() const { return makeString(m_ports[0].logString(), ":", m_ports[1].logString()); }
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
