<!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>[244861] 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/244861">244861</a></dd>
<dt>Author</dt> <dd>ross.kirsling@sony.com</dd>
<dt>Date</dt> <dd>2019-05-01 17:25:46 -0700 (Wed, 01 May 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>RemoteInspector::updateAutomaticInspectionCandidate should have a default implementation.
https://bugs.webkit.org/show_bug.cgi?id=197439

Reviewed by Devin Rousso.

On non-Cocoa platforms, automatic inspection is not currently implemented,
so updateAutomaticInspectionCandidate falls back to the logic of updateTarget.
This logic already existed in three places, so refactor it into a common private method
and allow our websocket-based RWI implementation to make use of it too.

* inspector/remote/RemoteInspector.cpp:
(Inspector::RemoteInspector::updateTarget):
(Inspector::RemoteInspector::updateTargetMap):
(Inspector::RemoteInspector::updateAutomaticInspectionCandidate):
* inspector/remote/RemoteInspector.h:
* inspector/remote/cocoa/RemoteInspectorCocoa.mm:
(Inspector::RemoteInspector::updateAutomaticInspectionCandidate):
* inspector/remote/glib/RemoteInspectorGlib.cpp:
(Inspector::RemoteInspector::updateAutomaticInspectionCandidate): Deleted.
* inspector/remote/socket/RemoteInspectorSocket.cpp:
(Inspector::RemoteInspector::updateAutomaticInspectionCandidate): Deleted.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorremoteRemoteInspectorcpp">trunk/Source/JavaScriptCore/inspector/remote/RemoteInspector.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorremoteRemoteInspectorh">trunk/Source/JavaScriptCore/inspector/remote/RemoteInspector.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorremotecocoaRemoteInspectorCocoamm">trunk/Source/JavaScriptCore/inspector/remote/cocoa/RemoteInspectorCocoa.mm</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorremoteglibRemoteInspectorGlibcpp">trunk/Source/JavaScriptCore/inspector/remote/glib/RemoteInspectorGlib.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorremotesocketRemoteInspectorSocketcpp">trunk/Source/JavaScriptCore/inspector/remote/socket/RemoteInspectorSocket.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (244860 => 244861)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog    2019-05-02 00:20:38 UTC (rev 244860)
+++ trunk/Source/JavaScriptCore/ChangeLog       2019-05-02 00:25:46 UTC (rev 244861)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2019-05-01  Ross Kirsling  <ross.kirsling@sony.com>
+
+        RemoteInspector::updateAutomaticInspectionCandidate should have a default implementation.
+        https://bugs.webkit.org/show_bug.cgi?id=197439
+
+        Reviewed by Devin Rousso.
+
+        On non-Cocoa platforms, automatic inspection is not currently implemented,
+        so updateAutomaticInspectionCandidate falls back to the logic of updateTarget.
+        This logic already existed in three places, so refactor it into a common private method
+        and allow our websocket-based RWI implementation to make use of it too.
+
+        * inspector/remote/RemoteInspector.cpp:
+        (Inspector::RemoteInspector::updateTarget):
+        (Inspector::RemoteInspector::updateTargetMap):
+        (Inspector::RemoteInspector::updateAutomaticInspectionCandidate):
+        * inspector/remote/RemoteInspector.h:
+        * inspector/remote/cocoa/RemoteInspectorCocoa.mm:
+        (Inspector::RemoteInspector::updateAutomaticInspectionCandidate):
+        * inspector/remote/glib/RemoteInspectorGlib.cpp:
+        (Inspector::RemoteInspector::updateAutomaticInspectionCandidate): Deleted.
+        * inspector/remote/socket/RemoteInspectorSocket.cpp:
+        (Inspector::RemoteInspector::updateAutomaticInspectionCandidate): Deleted.
+
</ins><span class="cx"> 2019-05-01  Darin Adler  <darin@apple.com>
</span><span class="cx"> 
</span><span class="cx">         WebKit has too much of its own UTF-8 code and should rely more on ICU's UTF-8 support
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorremoteRemoteInspectorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/remote/RemoteInspector.cpp (244860 => 244861)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/remote/RemoteInspector.cpp 2019-05-02 00:20:38 UTC (rev 244860)
+++ trunk/Source/JavaScriptCore/inspector/remote/RemoteInspector.cpp    2019-05-02 00:25:46 UTC (rev 244861)
</span><span class="lines">@@ -104,14 +104,22 @@
</span><span class="cx"> 
</span><span class="cx">     LockHolder lock(m_mutex);
</span><span class="cx"> 
</span><ins>+    if (!updateTargetMap(target))
+        return;
+
+    pushListingsSoon();
+}
+
+bool RemoteInspector::updateTargetMap(RemoteControllableTarget* target)
+{
+    ASSERT(m_mutex.isLocked());
+
</ins><span class="cx">     auto targetIdentifier = target->targetIdentifier();
</span><span class="cx">     if (!targetIdentifier)
</span><del>-        return;
</del><ins>+        return false;
</ins><span class="cx"> 
</span><del>-    {
-        auto result = m_targetMap.set(targetIdentifier, target);
-        ASSERT_UNUSED(result, !result.isNewEntry);
-    }
</del><ins>+    auto result = m_targetMap.set(targetIdentifier, target);
+    ASSERT_UNUSED(result, !result.isNewEntry);
</ins><span class="cx"> 
</span><span class="cx">     // If the target has just allowed remote control, then the listing won't exist yet.
</span><span class="cx">     // If the target has no identifier remove the old listing.
</span><span class="lines">@@ -120,9 +128,17 @@
</span><span class="cx">     else
</span><span class="cx">         m_targetListingMap.remove(targetIdentifier);
</span><span class="cx"> 
</span><del>-    pushListingsSoon();
</del><ins>+    return true;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><ins>+#if !PLATFORM(COCOA)
+void RemoteInspector::updateAutomaticInspectionCandidate(RemoteInspectionTarget* target)
+{
+    // FIXME: Implement automatic inspection.
+    updateTarget(target);
+}
+#endif
+
</ins><span class="cx"> void RemoteInspector::updateClientCapabilities()
</span><span class="cx"> {
</span><span class="cx">     ASSERT(isMainThread());
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorremoteRemoteInspectorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/remote/RemoteInspector.h (244860 => 244861)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/remote/RemoteInspector.h   2019-05-02 00:20:38 UTC (rev 244860)
+++ trunk/Source/JavaScriptCore/inspector/remote/RemoteInspector.h      2019-05-02 00:25:46 UTC (rev 244861)
</span><span class="lines">@@ -180,6 +180,8 @@
</span><span class="cx">     TargetListing listingForInspectionTarget(const RemoteInspectionTarget&) const;
</span><span class="cx">     TargetListing listingForAutomationTarget(const RemoteAutomationTarget&) const;
</span><span class="cx"> 
</span><ins>+    bool updateTargetMap(RemoteControllableTarget*);
+
</ins><span class="cx">     void pushListingsNow();
</span><span class="cx">     void pushListingsSoon();
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorremotecocoaRemoteInspectorCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/remote/cocoa/RemoteInspectorCocoa.mm (244860 => 244861)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/remote/cocoa/RemoteInspectorCocoa.mm       2019-05-02 00:20:38 UTC (rev 244860)
+++ trunk/Source/JavaScriptCore/inspector/remote/cocoa/RemoteInspectorCocoa.mm  2019-05-02 00:25:46 UTC (rev 244861)
</span><span class="lines">@@ -122,20 +122,9 @@
</span><span class="cx">     {
</span><span class="cx">         LockHolder lock(m_mutex);
</span><span class="cx"> 
</span><del>-        auto targetIdentifier = target->targetIdentifier();
-        if (!targetIdentifier)
</del><ins>+        if (!updateTargetMap(target))
</ins><span class="cx">             return;
</span><span class="cx"> 
</span><del>-        auto result = m_targetMap.set(targetIdentifier, target);
-        ASSERT_UNUSED(result, !result.isNewEntry);
-
-        // If the target has just allowed remote control, then the listing won't exist yet.
-        // If the target has no identifier remove the old listing.
-        if (RetainPtr<NSDictionary> targetListing = listingForTarget(*target))
-            m_targetListingMap.set(targetIdentifier, targetListing);
-        else
-            m_targetListingMap.remove(targetIdentifier);
-
</del><span class="cx">         // Don't allow automatic inspection unless it is allowed or we are stopped.
</span><span class="cx">         if (!m_automaticInspectionEnabled || !m_enabled) {
</span><span class="cx">             pushListingsSoon();
</span><span class="lines">@@ -142,6 +131,8 @@
</span><span class="cx">             return;
</span><span class="cx">         }
</span><span class="cx"> 
</span><ins>+        auto targetIdentifier = target->targetIdentifier();
+
</ins><span class="cx">         // FIXME: We should handle multiple debuggables trying to pause at the same time on different threads.
</span><span class="cx">         // To make this work we will need to change m_automaticInspectionCandidateTargetIdentifier to be a per-thread value.
</span><span class="cx">         // Multiple attempts on the same thread should not be possible because our nested run loop is in a special RWI mode.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorremoteglibRemoteInspectorGlibcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/remote/glib/RemoteInspectorGlib.cpp (244860 => 244861)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/remote/glib/RemoteInspectorGlib.cpp        2019-05-02 00:20:38 UTC (rev 244860)
+++ trunk/Source/JavaScriptCore/inspector/remote/glib/RemoteInspectorGlib.cpp   2019-05-02 00:25:46 UTC (rev 244861)
</span><span class="lines">@@ -240,28 +240,6 @@
</span><span class="cx">     });
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void RemoteInspector::updateAutomaticInspectionCandidate(RemoteInspectionTarget* target)
-{
-    LockHolder lock(m_mutex);
-
-    ASSERT(target);
-    auto targetIdentifier = target->targetIdentifier();
-    if (!targetIdentifier)
-        return;
-
-    auto result = m_targetMap.set(targetIdentifier, target);
-    ASSERT_UNUSED(result, !result.isNewEntry);
-
-    // If the target has just allowed remote control, then the listing won't exist yet.
-    // If the target has no identifier remove the old listing.
-    if (auto targetListing = listingForTarget(*target))
-        m_targetListingMap.set(targetIdentifier, targetListing);
-    else
-        m_targetListingMap.remove(targetIdentifier);
-    // FIXME: Implement automatic inspection.
-    pushListingsSoon();
-}
-
</del><span class="cx"> void RemoteInspector::sendAutomaticInspectionCandidateMessage()
</span><span class="cx"> {
</span><span class="cx">     ASSERT(m_enabled);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorremotesocketRemoteInspectorSocketcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/remote/socket/RemoteInspectorSocket.cpp (244860 => 244861)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/remote/socket/RemoteInspectorSocket.cpp    2019-05-02 00:20:38 UTC (rev 244860)
+++ trunk/Source/JavaScriptCore/inspector/remote/socket/RemoteInspectorSocket.cpp       2019-05-02 00:25:46 UTC (rev 244861)
</span><span class="lines">@@ -184,10 +184,6 @@
</span><span class="cx">     });
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void RemoteInspector::updateAutomaticInspectionCandidate(RemoteInspectionTarget*)
-{
-}
-
</del><span class="cx"> void RemoteInspector::sendAutomaticInspectionCandidateMessage()
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre>
</div>
</div>

</body>
</html>