<!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>[196667] trunk/Source/JavaScriptCore</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/196667">196667</a></dd>
<dt>Author</dt> <dd>bburg@apple.com</dd>
<dt>Date</dt> <dd>2016-02-16 15:45:27 -0800 (Tue, 16 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>RemoteInspector should forward new automation session requests to its client
https://bugs.webkit.org/show_bug.cgi?id=154260
<rdar://problem/24663313>
Reviewed by Timothy Hatcher.
* inspector/remote/RemoteInspector.h:
* inspector/remote/RemoteInspector.mm:
(Inspector::RemoteInspector::xpcConnectionReceivedMessage):
(Inspector::RemoteInspector::listingForAutomationTarget):
Use the correct key for the session identifier in the listing. The name()
override for RemoteAutomationTarget is actually the session identifier.
(Inspector::RemoteInspector::receivedAutomationSessionRequestMessage):
* inspector/remote/RemoteInspectorConstants.h: Add new constants.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorremoteRemoteInspectorh">trunk/Source/JavaScriptCore/inspector/remote/RemoteInspector.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorremoteRemoteInspectormm">trunk/Source/JavaScriptCore/inspector/remote/RemoteInspector.mm</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorremoteRemoteInspectorConstantsh">trunk/Source/JavaScriptCore/inspector/remote/RemoteInspectorConstants.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (196666 => 196667)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-02-16 23:24:14 UTC (rev 196666)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-02-16 23:45:27 UTC (rev 196667)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-02-16 Brian Burg <bburg@apple.com>
+
+ RemoteInspector should forward new automation session requests to its client
+ https://bugs.webkit.org/show_bug.cgi?id=154260
+ <rdar://problem/24663313>
+
+ Reviewed by Timothy Hatcher.
+
+ * inspector/remote/RemoteInspector.h:
+ * inspector/remote/RemoteInspector.mm:
+ (Inspector::RemoteInspector::xpcConnectionReceivedMessage):
+ (Inspector::RemoteInspector::listingForAutomationTarget):
+ Use the correct key for the session identifier in the listing. The name()
+ override for RemoteAutomationTarget is actually the session identifier.
+
+ (Inspector::RemoteInspector::receivedAutomationSessionRequestMessage):
+ * inspector/remote/RemoteInspectorConstants.h: Add new constants.
+
</ins><span class="cx"> 2016-02-16 Saam barati <sbarati@apple.com>
</span><span class="cx">
</span><span class="cx"> SamplingProfiler still fails with ASan enabled
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorremoteRemoteInspectorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/remote/RemoteInspector.h (196666 => 196667)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/remote/RemoteInspector.h 2016-02-16 23:24:14 UTC (rev 196666)
+++ trunk/Source/JavaScriptCore/inspector/remote/RemoteInspector.h 2016-02-16 23:45:27 UTC (rev 196667)
</span><span class="lines">@@ -117,6 +117,7 @@
</span><span class="cx"> void receivedConnectionDiedMessage(NSDictionary *userInfo);
</span><span class="cx"> void receivedAutomaticInspectionConfigurationMessage(NSDictionary *userInfo);
</span><span class="cx"> void receivedAutomaticInspectionRejectMessage(NSDictionary *userInfo);
</span><ins>+ void receivedAutomationSessionRequestMessage(NSDictionary *userInfo);
</ins><span class="cx">
</span><span class="cx"> static bool startEnabled;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorremoteRemoteInspectormm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/remote/RemoteInspector.mm (196666 => 196667)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/remote/RemoteInspector.mm 2016-02-16 23:24:14 UTC (rev 196666)
+++ trunk/Source/JavaScriptCore/inspector/remote/RemoteInspector.mm 2016-02-16 23:45:27 UTC (rev 196667)
</span><span class="lines">@@ -440,6 +440,8 @@
</span><span class="cx"> receivedAutomaticInspectionConfigurationMessage(userInfo);
</span><span class="cx"> else if ([messageName isEqualToString:WIRAutomaticInspectionRejectMessage])
</span><span class="cx"> receivedAutomaticInspectionRejectMessage(userInfo);
</span><ins>+ else if ([messageName isEqualToString:WIRAutomationSessionRequestMessage])
+ receivedAutomationSessionRequestMessage(userInfo);
</ins><span class="cx"> else
</span><span class="cx"> NSLog(@"Unrecognized RemoteInspector XPC Message: %@", messageName);
</span><span class="cx"> }
</span><span class="lines">@@ -527,7 +529,7 @@
</span><span class="cx">
</span><span class="cx"> RetainPtr<NSMutableDictionary> listing = adoptNS([[NSMutableDictionary alloc] init]);
</span><span class="cx"> [listing setObject:@(target.targetIdentifier()) forKey:WIRTargetIdentifierKey];
</span><del>- [listing setObject:target.name() forKey:WIRTitleKey];
</del><ins>+ [listing setObject:target.name() forKey:WIRSessionIdentifierKey];
</ins><span class="cx"> [listing setObject:WIRTypeAutomation forKey:WIRTypeKey];
</span><span class="cx"> [listing setObject:@(target.isPaired()) forKey:WIRAutomationTargetIsPairedKey];
</span><span class="cx">
</span><span class="lines">@@ -776,6 +778,21 @@
</span><span class="cx"> m_automaticInspectionPaused = false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void RemoteInspector::receivedAutomationSessionRequestMessage(NSDictionary *userInfo)
+{
+ if (!m_client)
+ return;
+
+ if (!m_client->remoteAutomationAllowed())
+ return;
+
+ NSString *suggestedSessionIdentifier = [userInfo objectForKey:WIRSessionIdentifierKey];
+ if (!suggestedSessionIdentifier)
+ return;
+
+ m_client->requestAutomationSession(suggestedSessionIdentifier);
+}
+
</ins><span class="cx"> } // namespace Inspector
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(REMOTE_INSPECTOR)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorremoteRemoteInspectorConstantsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/remote/RemoteInspectorConstants.h (196666 => 196667)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/remote/RemoteInspectorConstants.h 2016-02-16 23:24:14 UTC (rev 196666)
+++ trunk/Source/JavaScriptCore/inspector/remote/RemoteInspectorConstants.h 2016-02-16 23:45:27 UTC (rev 196667)
</span><span class="lines">@@ -84,6 +84,8 @@
</span><span class="cx"> #define WIRAutomaticInspectionCandidateMessage @"WIRAutomaticInspectionCandidateMessage"
</span><span class="cx">
</span><span class="cx"> #define WIRAutomationTargetIsPairedKey @"WIRAutomationTargetIsPairedKey"
</span><ins>+#define WIRSessionIdentifierKey @"WIRSessionIdentifierKey"
+#define WIRAutomationSessionRequestMessage @"WIRAutomationSessionRequestMessage"
</ins><span class="cx">
</span><span class="cx"> // These definitions are shared with a Simulator webinspectord and
</span><span class="cx"> // OS X process communicating with it.
</span></span></pre>
</div>
</div>
</body>
</html>