<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[179346] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/179346">179346</a></dd>
<dt>Author</dt> <dd>ossy@webkit.org</dd>
<dt>Date</dt> <dd>2015-01-29 10:23:45 -0800 (Thu, 29 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[EFL][GTK] Fix the build after <a href="http://trac.webkit.org/projects/webkit/changeset/179326">r179326</a>
https://bugs.webkit.org/show_bug.cgi?id=141027
Reviewed by Alexey Proskuryakov.
Guard MessageRecorder implementation with USE(DTRACE)
for platforms not supporting DTrace.
Original patch by Carlos Garcia Campos <cgarcia@igalia.com>
* Platform/IPC/ArgumentCoders.cpp:
* Platform/IPC/ArgumentCoders.h:
* Platform/IPC/Connection.cpp:
(IPC::Connection::dispatchWorkQueueMessageReceiverMessage):
(IPC::Connection::sendMessage):
(IPC::Connection::sendSyncMessage):
(IPC::Connection::sendSyncMessageFromSecondaryThread):
(IPC::Connection::dispatchSyncMessage):
(IPC::Connection::dispatchMessage):
* Platform/IPC/MessageDecoder.cpp:
(IPC::MessageDecoder::MessageDecoder):
* Platform/IPC/MessageDecoder.h:
* Platform/IPC/MessageEncoder.cpp:
(IPC::MessageEncoder::MessageEncoder):
(IPC::MessageEncoder::encodeHeader):
* Platform/IPC/MessageEncoder.h:
* Platform/IPC/MessageRecorder.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCArgumentCoderscpp">trunk/Source/WebKit2/Platform/IPC/ArgumentCoders.cpp</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCArgumentCodersh">trunk/Source/WebKit2/Platform/IPC/ArgumentCoders.h</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCConnectioncpp">trunk/Source/WebKit2/Platform/IPC/Connection.cpp</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCMessageDecodercpp">trunk/Source/WebKit2/Platform/IPC/MessageDecoder.cpp</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCMessageDecoderh">trunk/Source/WebKit2/Platform/IPC/MessageDecoder.h</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCMessageEncodercpp">trunk/Source/WebKit2/Platform/IPC/MessageEncoder.cpp</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCMessageEncoderh">trunk/Source/WebKit2/Platform/IPC/MessageEncoder.h</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCMessageRecorderh">trunk/Source/WebKit2/Platform/IPC/MessageRecorder.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (179345 => 179346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-01-29 16:58:15 UTC (rev 179345)
+++ trunk/Source/WebKit2/ChangeLog 2015-01-29 18:23:45 UTC (rev 179346)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2015-01-29 Csaba Osztrogonác <ossy@webkit.org>
+
+ [EFL][GTK] Fix the build after r179326
+ https://bugs.webkit.org/show_bug.cgi?id=141027
+
+ Reviewed by Alexey Proskuryakov.
+
+ Guard MessageRecorder implementation with USE(DTRACE)
+ for platforms not supporting DTrace.
+
+ Original patch by Carlos Garcia Campos <cgarcia@igalia.com>
+
+ * Platform/IPC/ArgumentCoders.cpp:
+ * Platform/IPC/ArgumentCoders.h:
+ * Platform/IPC/Connection.cpp:
+ (IPC::Connection::dispatchWorkQueueMessageReceiverMessage):
+ (IPC::Connection::sendMessage):
+ (IPC::Connection::sendSyncMessage):
+ (IPC::Connection::sendSyncMessageFromSecondaryThread):
+ (IPC::Connection::dispatchSyncMessage):
+ (IPC::Connection::dispatchMessage):
+ * Platform/IPC/MessageDecoder.cpp:
+ (IPC::MessageDecoder::MessageDecoder):
+ * Platform/IPC/MessageDecoder.h:
+ * Platform/IPC/MessageEncoder.cpp:
+ (IPC::MessageEncoder::MessageEncoder):
+ (IPC::MessageEncoder::encodeHeader):
+ * Platform/IPC/MessageEncoder.h:
+ * Platform/IPC/MessageRecorder.h:
+
</ins><span class="cx"> 2015-01-29 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Avoid manually handling quickLookWithEvent: if the immediate action gesture recognizer will do Lookup for us
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCArgumentCoderscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/ArgumentCoders.cpp (179345 => 179346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/ArgumentCoders.cpp 2015-01-29 16:58:15 UTC (rev 179345)
+++ trunk/Source/WebKit2/Platform/IPC/ArgumentCoders.cpp 2015-01-29 18:23:45 UTC (rev 179346)
</span><span class="lines">@@ -162,6 +162,7 @@
</span><span class="cx"> return decodeStringText<UChar>(decoder, length, result);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if HAVE(DTRACE)
</ins><span class="cx"> void ArgumentCoder<uuid_t>::encode(ArgumentEncoder& encoder, const uuid_t& uuid)
</span><span class="cx"> {
</span><span class="cx"> SimpleArgumentCoder<uuid_t>::encode(encoder, uuid);
</span><span class="lines">@@ -171,5 +172,6 @@
</span><span class="cx"> {
</span><span class="cx"> return SimpleArgumentCoder<uuid_t>::decode(decoder, uuid);
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> } // namespace IPC
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCArgumentCodersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/ArgumentCoders.h (179345 => 179346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/ArgumentCoders.h 2015-01-29 16:58:15 UTC (rev 179345)
+++ trunk/Source/WebKit2/Platform/IPC/ArgumentCoders.h 2015-01-29 18:23:45 UTC (rev 179346)
</span><span class="lines">@@ -29,13 +29,16 @@
</span><span class="cx"> #include "ArgumentDecoder.h"
</span><span class="cx"> #include "ArgumentEncoder.h"
</span><span class="cx"> #include <utility>
</span><del>-#include <uuid/uuid.h>
</del><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/HashSet.h>
</span><span class="cx"> #include <wtf/Optional.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><ins>+#if HAVE(DTRACE)
+#include <uuid/uuid.h>
+#endif
+
</ins><span class="cx"> namespace IPC {
</span><span class="cx">
</span><span class="cx"> // An argument coder works on POD types
</span><span class="lines">@@ -299,10 +302,12 @@
</span><span class="cx"> static bool decode(ArgumentDecoder&, String&);
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+#if HAVE(DTRACE)
</ins><span class="cx"> template<> struct ArgumentCoder<uuid_t> {
</span><span class="cx"> static void encode(ArgumentEncoder&, const uuid_t&);
</span><span class="cx"> static bool decode(ArgumentDecoder&, uuid_t&);
</span><span class="cx"> };
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> } // namespace IPC
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/Connection.cpp (179345 => 179346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/Connection.cpp 2015-01-29 16:58:15 UTC (rev 179345)
+++ trunk/Source/WebKit2/Platform/IPC/Connection.cpp 2015-01-29 18:23:45 UTC (rev 179346)
</span><span class="lines">@@ -317,7 +317,11 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if HAVE(DTRACE)
</ins><span class="cx"> auto replyEncoder = std::make_unique<MessageEncoder>("IPC", "SyncMessageReply", syncRequestID, incomingMessageDecoder->UUID());
</span><ins>+#else
+ auto replyEncoder = std::make_unique<MessageEncoder>("IPC", "SyncMessageReply", syncRequestID);
+#endif
</ins><span class="cx">
</span><span class="cx"> // Hand off both the decoder and encoder to the work queue message receiver.
</span><span class="cx"> workQueueMessageReceiver->didReceiveSyncMessage(*this, *decoder, replyEncoder);
</span><span class="lines">@@ -379,9 +383,11 @@
</span><span class="cx"> || m_inDispatchMessageMarkedDispatchWhenWaitingForSyncReplyCount))
</span><span class="cx"> encoder->setShouldDispatchMessageWhenWaitingForSyncReply(true);
</span><span class="cx">
</span><ins>+#if HAVE(DTRACE)
</ins><span class="cx"> std::unique_ptr<MessageRecorder::MessageProcessingToken> token;
</span><span class="cx"> if (!alreadyRecordedMessage)
</span><span class="cx"> token = MessageRecorder::recordOutgoingMessage(*this, *encoder);
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> {
</span><span class="cx"> std::lock_guard<std::mutex> lock(m_outgoingMessagesMutex);
</span><span class="lines">@@ -477,7 +483,9 @@
</span><span class="cx">
</span><span class="cx"> ++m_inSendSyncCount;
</span><span class="cx">
</span><ins>+#if HAVE(DTRACE)
</ins><span class="cx"> auto token = MessageRecorder::recordOutgoingMessage(*this, *encoder);
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> // First send the message.
</span><span class="cx"> sendMessage(WTF::move(encoder), DispatchMessageEvenWhenWaitingForSyncReply, true);
</span><span class="lines">@@ -521,7 +529,9 @@
</span><span class="cx"> m_secondaryThreadPendingSyncReplyMap.add(syncRequestID, &pendingReply);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if HAVE(DTRACE)
</ins><span class="cx"> auto token = MessageRecorder::recordOutgoingMessage(*this, *encoder);
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> sendMessage(WTF::move(encoder), 0, true);
</span><span class="cx">
</span><span class="lines">@@ -776,7 +786,11 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if HAVE(DTRACE)
</ins><span class="cx"> auto replyEncoder = std::make_unique<MessageEncoder>("IPC", "SyncMessageReply", syncRequestID, decoder.UUID());
</span><ins>+#else
+ auto replyEncoder = std::make_unique<MessageEncoder>("IPC", "SyncMessageReply", syncRequestID);
+#endif
</ins><span class="cx">
</span><span class="cx"> // Hand off both the decoder and encoder to the client.
</span><span class="cx"> m_client->didReceiveSyncMessage(*this, decoder, replyEncoder);
</span><span class="lines">@@ -823,7 +837,9 @@
</span><span class="cx">
</span><span class="cx"> void Connection::dispatchMessage(std::unique_ptr<MessageDecoder> message)
</span><span class="cx"> {
</span><ins>+#if HAVE(DTRACE)
</ins><span class="cx"> MessageRecorder::recordIncomingMessage(*this, *message);
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> if (!m_client)
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCMessageDecodercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/MessageDecoder.cpp (179345 => 179346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/MessageDecoder.cpp 2015-01-29 16:58:15 UTC (rev 179345)
+++ trunk/Source/WebKit2/Platform/IPC/MessageDecoder.cpp 2015-01-29 18:23:45 UTC (rev 179346)
</span><span class="lines">@@ -55,8 +55,9 @@
</span><span class="cx">
</span><span class="cx"> if (!decode(m_destinationID))
</span><span class="cx"> return;
</span><del>-
</del><ins>+#if HAVE(DTRACE)
</ins><span class="cx"> decode(m_UUID);
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool MessageDecoder::isSyncMessage() const
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCMessageDecoderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/MessageDecoder.h (179345 => 179346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/MessageDecoder.h 2015-01-29 16:58:15 UTC (rev 179345)
+++ trunk/Source/WebKit2/Platform/IPC/MessageDecoder.h 2015-01-29 18:23:45 UTC (rev 179346)
</span><span class="lines">@@ -29,7 +29,10 @@
</span><span class="cx"> #include "ArgumentDecoder.h"
</span><span class="cx"> #include "MessageRecorder.h"
</span><span class="cx"> #include "StringReference.h"
</span><ins>+
+#if HAVE(DTRACE)
</ins><span class="cx"> #include <uuid/uuid.h>
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> namespace IPC {
</span><span class="cx">
</span><span class="lines">@@ -52,9 +55,11 @@
</span><span class="cx"> void setImportanceAssertion(std::unique_ptr<ImportanceAssertion>);
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if HAVE(DTRACE)
</ins><span class="cx"> void setMessageProcessingToken(std::unique_ptr<MessageRecorder::MessageProcessingToken> token) { m_processingToken = WTF::move(token); }
</span><span class="cx">
</span><span class="cx"> const uuid_t& UUID() const { return m_UUID; }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> uint8_t m_messageFlags;
</span><span class="lines">@@ -63,13 +68,14 @@
</span><span class="cx">
</span><span class="cx"> uint64_t m_destinationID;
</span><span class="cx">
</span><ins>+#if HAVE(DTRACE)
</ins><span class="cx"> uuid_t m_UUID;
</span><ins>+ std::unique_ptr<MessageRecorder::MessageProcessingToken> m_processingToken;
+#endif
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
</span><span class="cx"> std::unique_ptr<ImportanceAssertion> m_importanceAssertion;
</span><span class="cx"> #endif
</span><del>-
- std::unique_ptr<MessageRecorder::MessageProcessingToken> m_processingToken;
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace IPC
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCMessageEncodercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/MessageEncoder.cpp (179345 => 179346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/MessageEncoder.cpp 2015-01-29 16:58:15 UTC (rev 179345)
+++ trunk/Source/WebKit2/Platform/IPC/MessageEncoder.cpp 2015-01-29 18:23:45 UTC (rev 179346)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx">
</span><span class="cx"> static uint8_t defaultMessageFlags = 0;
</span><span class="cx">
</span><ins>+#if HAVE(DTRACE)
</ins><span class="cx"> MessageEncoder::MessageEncoder(StringReference messageReceiverName, StringReference messageName, uint64_t destinationID, const uuid_t& UUID)
</span><span class="cx"> : m_messageReceiverName(messageReceiverName)
</span><span class="cx"> , m_messageName(messageName)
</span><span class="lines">@@ -43,13 +44,16 @@
</span><span class="cx"> uuid_copy(m_UUID, UUID);
</span><span class="cx"> encodeHeader();
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> MessageEncoder::MessageEncoder(StringReference messageReceiverName, StringReference messageName, uint64_t destinationID)
</span><span class="cx"> : m_messageReceiverName(messageReceiverName)
</span><span class="cx"> , m_messageName(messageName)
</span><span class="cx"> , m_destinationID(destinationID)
</span><span class="cx"> {
</span><ins>+#if HAVE(DTRACE)
</ins><span class="cx"> uuid_generate(m_UUID);
</span><ins>+#endif
</ins><span class="cx"> encodeHeader();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -65,7 +69,9 @@
</span><span class="cx"> *this << m_messageReceiverName;
</span><span class="cx"> *this << m_messageName;
</span><span class="cx"> *this << m_destinationID;
</span><ins>+#if HAVE(DTRACE)
</ins><span class="cx"> *this << m_UUID;
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool MessageEncoder::isSyncMessage() const
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCMessageEncoderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/MessageEncoder.h (179345 => 179346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/MessageEncoder.h 2015-01-29 16:58:15 UTC (rev 179345)
+++ trunk/Source/WebKit2/Platform/IPC/MessageEncoder.h 2015-01-29 18:23:45 UTC (rev 179346)
</span><span class="lines">@@ -28,9 +28,12 @@
</span><span class="cx">
</span><span class="cx"> #include "ArgumentEncoder.h"
</span><span class="cx"> #include "StringReference.h"
</span><del>-#include <uuid/uuid.h>
</del><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx">
</span><ins>+#if HAVE(DTRACE)
+#include <uuid/uuid.h>
+#endif
+
</ins><span class="cx"> namespace IPC {
</span><span class="cx">
</span><span class="cx"> class StringReference;
</span><span class="lines">@@ -38,7 +41,9 @@
</span><span class="cx"> class MessageEncoder : public ArgumentEncoder {
</span><span class="cx"> public:
</span><span class="cx"> MessageEncoder(StringReference messageReceiverName, StringReference messageName, uint64_t destinationID);
</span><ins>+#if HAVE(DTRACE)
</ins><span class="cx"> MessageEncoder(StringReference messageReceiverName, StringReference messageName, uint64_t destinationID, const uuid_t&);
</span><ins>+#endif
</ins><span class="cx"> virtual ~MessageEncoder();
</span><span class="cx">
</span><span class="cx"> StringReference messageReceiverName() const { return m_messageReceiverName; }
</span><span class="lines">@@ -51,7 +56,9 @@
</span><span class="cx"> void setShouldDispatchMessageWhenWaitingForSyncReply(bool);
</span><span class="cx"> bool shouldDispatchMessageWhenWaitingForSyncReply() const;
</span><span class="cx">
</span><ins>+#if HAVE(DTRACE)
</ins><span class="cx"> const uuid_t& UUID() const { return m_UUID; }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> void encodeHeader();
</span><span class="lines">@@ -59,7 +66,9 @@
</span><span class="cx"> StringReference m_messageReceiverName;
</span><span class="cx"> StringReference m_messageName;
</span><span class="cx"> uint64_t m_destinationID;
</span><ins>+#if HAVE(DTRACE)
</ins><span class="cx"> uuid_t m_UUID;
</span><ins>+#endif
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace IPC
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCMessageRecorderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/MessageRecorder.h (179345 => 179346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/MessageRecorder.h 2015-01-29 16:58:15 UTC (rev 179345)
+++ trunk/Source/WebKit2/Platform/IPC/MessageRecorder.h 2015-01-29 18:23:45 UTC (rev 179346)
</span><span class="lines">@@ -26,6 +26,8 @@
</span><span class="cx"> #ifndef MessageRecorder_h
</span><span class="cx"> #define MessageRecorder_h
</span><span class="cx">
</span><ins>+#if HAVE(DTRACE)
+
</ins><span class="cx"> #include "ProcessType.h"
</span><span class="cx"> #include <uuid/uuid.h>
</span><span class="cx"> #include <wtf/Forward.h>
</span><span class="lines">@@ -84,4 +86,6 @@
</span><span class="cx">
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+#endif // HAVE(DTRACE)
+
</ins><span class="cx"> #endif // MessageRecorder_h
</span></span></pre>
</div>
</div>
</body>
</html>