<!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>[196454] 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/196454">196454</a></dd>

<dt>Author</dt> <dd>bburg@apple.com</dd>

<dt>Date</dt> <dd>2016-02-11 16:02:29 -0800 (Thu, 11 Feb 2016)</dd>

</dl>

<h3>Log Message</h3>

<pre>Web Inspector: RemoteInspector's listings should include whether an AutomationTarget is paired

https://bugs.webkit.org/show_bug.cgi?id=154077

&lt;rdar://problem/24589133&gt;

Reviewed by Joseph Pecoraro.

Instead of not generating a listing for the target when it is occupied,

generate the listing with a 'paired' flag. The old flag was redundant

because a _WKAutomationDelegate will not create a session if it doesn't

support automation or it already has an active session.

* inspector/remote/RemoteAutomationTarget.cpp:

(Inspector::RemoteAutomationTarget::setIsPaired):

(Inspector::RemoteAutomationTarget::setAutomationAllowed): Deleted.

* inspector/remote/RemoteAutomationTarget.h:

Return false for remoteControlAllowed() if the target is already paired.

This function is used by RemoteInspector to deny incoming connections.

* inspector/remote/RemoteInspector.mm:

(Inspector::RemoteInspector::listingForAutomationTarget):

* inspector/remote/RemoteInspectorConstants.h:</pre>

<h3>Modified Paths</h3>

<ul>

<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>

<li><a href="#trunkSourceJavaScriptCoreinspectorremoteRemoteAutomationTargetcpp">trunk/Source/JavaScriptCore/inspector/remote/RemoteAutomationTarget.cpp</a></li>

<li><a href="#trunkSourceJavaScriptCoreinspectorremoteRemoteAutomationTargeth">trunk/Source/JavaScriptCore/inspector/remote/RemoteAutomationTarget.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 (196453 => 196454)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog        2016-02-12 00:02:03 UTC (rev 196453)

+++ trunk/Source/JavaScriptCore/ChangeLog        2016-02-12 00:02:29 UTC (rev 196454)

</span><span class="lines">@@ -1,3 +1,27 @@

</span><ins>+2016-02-11  Brian Burg  &lt;bburg@apple.com&gt;

+

+        Web Inspector: RemoteInspector's listings should include whether an AutomationTarget is paired

+        https://bugs.webkit.org/show_bug.cgi?id=154077

+        &lt;rdar://problem/24589133&gt;

+

+        Reviewed by Joseph Pecoraro.

+

+        Instead of not generating a listing for the target when it is occupied,

+        generate the listing with a 'paired' flag. The old flag was redundant

+        because a _WKAutomationDelegate will not create a session if it doesn't

+        support automation or it already has an active session.

+

+        * inspector/remote/RemoteAutomationTarget.cpp:

+        (Inspector::RemoteAutomationTarget::setIsPaired):

+        (Inspector::RemoteAutomationTarget::setAutomationAllowed): Deleted.

+        * inspector/remote/RemoteAutomationTarget.h:

+        Return false for remoteControlAllowed() if the target is already paired.

+        This function is used by RemoteInspector to deny incoming connections.

+

+        * inspector/remote/RemoteInspector.mm:

+        (Inspector::RemoteInspector::listingForAutomationTarget):

+        * inspector/remote/RemoteInspectorConstants.h:

+

</ins><span class="cx"> 2016-02-11  Filip Pizlo  &lt;fpizlo@apple.com&gt;

</span><span class="cx"> 

</span><span class="cx">         DFG::ByteCodeParser needs to null check the result of presenceLike()

</span></span></pre></div>

<a id="trunkSourceJavaScriptCoreinspectorremoteRemoteAutomationTargetcpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/remote/RemoteAutomationTarget.cpp (196453 => 196454)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/inspector/remote/RemoteAutomationTarget.cpp        2016-02-12 00:02:03 UTC (rev 196453)

+++ trunk/Source/JavaScriptCore/inspector/remote/RemoteAutomationTarget.cpp        2016-02-12 00:02:29 UTC (rev 196454)

</span><span class="lines">@@ -1,5 +1,5 @@

</span><span class="cx"> /*

</span><del>- * Copyright (C) 2015 Apple Inc. All rights reserved.

</del><ins>+ * Copyright (C) 2015, 2016 Apple Inc. All rights reserved.

</ins><span class="cx">  *

</span><span class="cx">  * Redistribution and use in source and binary forms, with or without

</span><span class="cx">  * modification, are permitted provided that the following conditions

</span><span class="lines">@@ -32,12 +32,12 @@

</span><span class="cx"> 

</span><span class="cx"> namespace Inspector {

</span><span class="cx"> 

</span><del>-void RemoteAutomationTarget::setAutomationAllowed(bool allowed)

</del><ins>+void RemoteAutomationTarget::setIsPaired(bool paired)

</ins><span class="cx"> {

</span><del>-    if (m_allowed == allowed)

</del><ins>+    if (m_paired == paired)

</ins><span class="cx">         return;

</span><span class="cx"> 

</span><del>-    m_allowed = allowed;

</del><ins>+    m_paired = paired;

</ins><span class="cx"> 

</span><span class="cx">     update();

</span><span class="cx"> }

</span></span></pre></div>

<a id="trunkSourceJavaScriptCoreinspectorremoteRemoteAutomationTargeth"></a>

<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/remote/RemoteAutomationTarget.h (196453 => 196454)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/inspector/remote/RemoteAutomationTarget.h        2016-02-12 00:02:03 UTC (rev 196453)

+++ trunk/Source/JavaScriptCore/inspector/remote/RemoteAutomationTarget.h        2016-02-12 00:02:29 UTC (rev 196454)

</span><span class="lines">@@ -1,5 +1,5 @@

</span><span class="cx"> /*

</del><ins>+ * Copyright (C) 2015, 2016 Apple Inc. All rights reserved.

</ins><span class="cx">  *

</span><span class="cx">  * Redistribution and use in source and binary forms, with or without

</span><span class="cx">  * modification, are permitted provided that the following conditions

</span><span class="lines">@@ -39,15 +39,15 @@

</span><span class="cx"> public:

</span><span class="cx">     virtual ~RemoteAutomationTarget() { }

</span><span class="cx"> 

</span><del>-    bool automationAllowed() const { return m_allowed; }

-    void setAutomationAllowed(bool);

</del><ins>+    bool isPaired() const { return m_paired; }

+    void setIsPaired(bool);

</ins><span class="cx"> 

</span><span class="cx">     virtual String name() const = 0;

</span><span class="cx">     virtual RemoteControllableTarget::Type type() const override { return RemoteControllableTarget::Type::Automation; }

</span><del>-    virtual bool remoteControlAllowed() const override { return automationAllowed(); };

</del><ins>+    virtual bool remoteControlAllowed() const override { return !m_paired; };

</ins><span class="cx"> 

</span><span class="cx"> private:

</span><del>-    bool m_allowed { false };

</del><ins>+    bool m_paired { false };

</ins><span class="cx"> };

</span><span class="cx"> 

</span><span class="cx"> } // namespace Inspector

</span></span></pre></div>

<a id="trunkSourceJavaScriptCoreinspectorremoteRemoteInspectormm"></a>

<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/remote/RemoteInspector.mm (196453 => 196454)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/inspector/remote/RemoteInspector.mm        2016-02-12 00:02:03 UTC (rev 196453)

+++ trunk/Source/JavaScriptCore/inspector/remote/RemoteInspector.mm        2016-02-12 00:02:29 UTC (rev 196454)

</span><span class="lines">@@ -525,13 +525,11 @@

</span><span class="cx">     // implemented by non-threadsafe JSC / WebCore classes such as JSGlobalObject or WebCore::Page.

</span><span class="cx">     ASSERT(isMainThread());

</span><span class="cx"> 

</span><del>-    if (!target.automationAllowed())

-        return nil;

-

</del><span class="cx">     RetainPtr&lt;NSMutableDictionary&gt; listing = adoptNS([[NSMutableDictionary alloc] init]);

</span><span class="cx">     [listing setObject:@(target.identifier()) forKey:WIRPageIdentifierKey];

</span><span class="cx">     [listing setObject:target.name() forKey:WIRTitleKey];

</span><span class="cx">     [listing setObject:WIRTypeAutomation forKey:WIRTypeKey];

</span><ins>+    [listing setObject:@(target.isPaired()) forKey:WIRAutomationTargetIsPairedKey];

</ins><span class="cx"> 

</span><span class="cx">     if (auto connection = m_connectionMap.get(target.identifier()))

</span><span class="cx">         [listing setObject:connection-&gt;connectionIdentifier() forKey:WIRConnectionIdentifierKey];

</span></span></pre></div>

<a id="trunkSourceJavaScriptCoreinspectorremoteRemoteInspectorConstantsh"></a>

<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/remote/RemoteInspectorConstants.h (196453 => 196454)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/inspector/remote/RemoteInspectorConstants.h        2016-02-12 00:02:03 UTC (rev 196453)

+++ trunk/Source/JavaScriptCore/inspector/remote/RemoteInspectorConstants.h        2016-02-12 00:02:29 UTC (rev 196454)

</span><span class="lines">@@ -82,6 +82,8 @@

</span><span class="cx"> #define WIRAutomaticInspectionRejectMessage        @&quot;WIRAutomaticInspectionRejectMessage&quot;

</span><span class="cx"> #define WIRAutomaticInspectionCandidateMessage     @&quot;WIRAutomaticInspectionCandidateMessage&quot;

</span><span class="cx"> 

</span><ins>+#define WIRAutomationTargetIsPairedKey             @&quot;WIRAutomationTargetIsPairedKey&quot;

+

</ins><span class="cx"> // These definitions are shared with a Simulator webinspectord and

</span><span class="cx"> // OS X process communicating with it.

</span><span class="cx"> 

</span></span></pre>

</div>

</div>

</body>

</html>