<!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>[243160] trunk/Source</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/243160">243160</a></dd>
<dt>Author</dt> <dd>drousso@apple.com</dd>
<dt>Date</dt> <dd>2019-03-19 12:25:52 -0700 (Tue, 19 Mar 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>Web Inspector: ScriptProfiler: lazily create the agent
https://bugs.webkit.org/show_bug.cgi?id=195591
<rdar://problem/48791756>

Reviewed by Joseph Pecoraro.

Source/JavaScriptCore:

* inspector/JSGlobalObjectConsoleClient.h:
(Inspector::JSGlobalObjectConsoleClient::setInspectorScriptProfilerAgent): Added.
* inspector/JSGlobalObjectConsoleClient.cpp:
(Inspector::JSGlobalObjectConsoleClient::JSGlobalObjectConsoleClient):
(Inspector::JSGlobalObjectConsoleClient::startConsoleProfile):
(Inspector::JSGlobalObjectConsoleClient::stopConsoleProfile):

* inspector/JSGlobalObjectInspectorController.cpp:
(Inspector::JSGlobalObjectInspectorController::JSGlobalObjectInspectorController):
(Inspector::JSGlobalObjectInspectorController::createLazyAgents):

Source/WebCore:

No change in functionality.

* inspector/InspectorController.cpp:
(WebCore::InspectorController::InspectorController):
(WebCore::InspectorController::createLazyAgents):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorJSGlobalObjectConsoleClientcpp">trunk/Source/JavaScriptCore/inspector/JSGlobalObjectConsoleClient.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorJSGlobalObjectConsoleClienth">trunk/Source/JavaScriptCore/inspector/JSGlobalObjectConsoleClient.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorJSGlobalObjectInspectorControllercpp">trunk/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorControllercpp">trunk/Source/WebCore/inspector/InspectorController.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (243159 => 243160)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog    2019-03-19 19:19:21 UTC (rev 243159)
+++ trunk/Source/JavaScriptCore/ChangeLog       2019-03-19 19:25:52 UTC (rev 243160)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2019-03-19  Devin Rousso  <drousso@apple.com>
</span><span class="cx"> 
</span><ins>+        Web Inspector: ScriptProfiler: lazily create the agent
+        https://bugs.webkit.org/show_bug.cgi?id=195591
+        <rdar://problem/48791756>
+
+        Reviewed by Joseph Pecoraro.
+
+        * inspector/JSGlobalObjectConsoleClient.h:
+        (Inspector::JSGlobalObjectConsoleClient::setInspectorScriptProfilerAgent): Added.
+        * inspector/JSGlobalObjectConsoleClient.cpp:
+        (Inspector::JSGlobalObjectConsoleClient::JSGlobalObjectConsoleClient):
+        (Inspector::JSGlobalObjectConsoleClient::startConsoleProfile):
+        (Inspector::JSGlobalObjectConsoleClient::stopConsoleProfile):
+
+        * inspector/JSGlobalObjectInspectorController.cpp:
+        (Inspector::JSGlobalObjectInspectorController::JSGlobalObjectInspectorController):
+        (Inspector::JSGlobalObjectInspectorController::createLazyAgents):
+
+2019-03-19  Devin Rousso  <drousso@apple.com>
+
</ins><span class="cx">         Web Inspector: Heap: lazily create the agent
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=195590
</span><span class="cx">         <rdar://problem/48791750>
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorJSGlobalObjectConsoleClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/JSGlobalObjectConsoleClient.cpp (243159 => 243160)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/JSGlobalObjectConsoleClient.cpp    2019-03-19 19:19:21 UTC (rev 243159)
+++ trunk/Source/JavaScriptCore/inspector/JSGlobalObjectConsoleClient.cpp       2019-03-19 19:25:52 UTC (rev 243160)
</span><span class="lines">@@ -54,11 +54,10 @@
</span><span class="cx">     sLogToSystemConsole = shouldLog;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-JSGlobalObjectConsoleClient::JSGlobalObjectConsoleClient(InspectorConsoleAgent* consoleAgent, InspectorDebuggerAgent* debuggerAgent, InspectorScriptProfilerAgent* scriptProfilerAgent)
</del><ins>+JSGlobalObjectConsoleClient::JSGlobalObjectConsoleClient(InspectorConsoleAgent* consoleAgent, InspectorDebuggerAgent* debuggerAgent)
</ins><span class="cx">     : ConsoleClient()
</span><span class="cx">     , m_consoleAgent(consoleAgent)
</span><span class="cx">     , m_debuggerAgent(debuggerAgent)
</span><del>-    , m_scriptProfilerAgent(scriptProfilerAgent)
</del><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -121,27 +120,33 @@
</span><span class="cx"> 
</span><span class="cx"> void JSGlobalObjectConsoleClient::startConsoleProfile()
</span><span class="cx"> {
</span><ins>+    ErrorString unused;
+
</ins><span class="cx">     // FIXME: <https://webkit.org/b/158753> Generalize the concept of Instruments on the backend to work equally for JSContext and Web inspection
</span><del>-    m_scriptProfilerAgent->programmaticCaptureStarted();
</del><ins>+    if (m_scriptProfilerAgent)
+        m_scriptProfilerAgent->programmaticCaptureStarted();
</ins><span class="cx"> 
</span><span class="cx">     m_profileRestoreBreakpointActiveValue = m_debuggerAgent->breakpointsActive();
</span><del>-
-    ErrorString unused;
</del><span class="cx">     m_debuggerAgent->setBreakpointsActive(unused, false);
</span><span class="cx"> 
</span><del>-    const bool includeSamples = true;
-    m_scriptProfilerAgent->startTracking(unused, &includeSamples);
</del><ins>+    if (m_scriptProfilerAgent) {
+        const bool includeSamples = true;
+        m_scriptProfilerAgent->startTracking(unused, &includeSamples);
+    }
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void JSGlobalObjectConsoleClient::stopConsoleProfile()
</span><span class="cx"> {
</span><span class="cx">     ErrorString unused;
</span><del>-    m_scriptProfilerAgent->stopTracking(unused);
</del><span class="cx"> 
</span><ins>+    if (m_scriptProfilerAgent)
+        m_scriptProfilerAgent->stopTracking(unused);
+
</ins><span class="cx">     m_debuggerAgent->setBreakpointsActive(unused, m_profileRestoreBreakpointActiveValue);
</span><span class="cx"> 
</span><span class="cx">     // FIXME: <https://webkit.org/b/158753> Generalize the concept of Instruments on the backend to work equally for JSContext and Web inspection
</span><del>-    m_scriptProfilerAgent->programmaticCaptureStopped();
</del><ins>+    if (m_scriptProfilerAgent)
+        m_scriptProfilerAgent->programmaticCaptureStopped();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void JSGlobalObjectConsoleClient::takeHeapSnapshot(JSC::ExecState*, const String& title)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorJSGlobalObjectConsoleClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/JSGlobalObjectConsoleClient.h (243159 => 243160)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/JSGlobalObjectConsoleClient.h      2019-03-19 19:19:21 UTC (rev 243159)
+++ trunk/Source/JavaScriptCore/inspector/JSGlobalObjectConsoleClient.h 2019-03-19 19:25:52 UTC (rev 243160)
</span><span class="lines">@@ -38,12 +38,14 @@
</span><span class="cx"> class JSGlobalObjectConsoleClient final : public JSC::ConsoleClient {
</span><span class="cx">     WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>-    explicit JSGlobalObjectConsoleClient(InspectorConsoleAgent*, InspectorDebuggerAgent*, InspectorScriptProfilerAgent*);
</del><ins>+    explicit JSGlobalObjectConsoleClient(InspectorConsoleAgent*, InspectorDebuggerAgent*);
</ins><span class="cx">     virtual ~JSGlobalObjectConsoleClient() { }
</span><span class="cx"> 
</span><span class="cx">     static bool logToSystemConsole();
</span><span class="cx">     static void setLogToSystemConsole(bool);
</span><span class="cx"> 
</span><ins>+    void setInspectorScriptProfilerAgent(InspectorScriptProfilerAgent* agent) { m_scriptProfilerAgent = agent; }
+
</ins><span class="cx"> protected:
</span><span class="cx">     void messageWithTypeAndLevel(MessageType, MessageLevel, JSC::ExecState*, Ref<ScriptArguments>&&) override;
</span><span class="cx">     void count(JSC::ExecState*, Ref<ScriptArguments>&&) override;
</span><span class="lines">@@ -66,7 +68,7 @@
</span><span class="cx"> 
</span><span class="cx">     InspectorConsoleAgent* m_consoleAgent;
</span><span class="cx">     InspectorDebuggerAgent* m_debuggerAgent;
</span><del>-    InspectorScriptProfilerAgent* m_scriptProfilerAgent;
</del><ins>+    InspectorScriptProfilerAgent* m_scriptProfilerAgent { nullptr };
</ins><span class="cx">     Vector<String> m_profiles;
</span><span class="cx">     bool m_profileRestoreBreakpointActiveValue { false };
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorJSGlobalObjectInspectorControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp (243159 => 243160)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp      2019-03-19 19:19:21 UTC (rev 243159)
+++ trunk/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp 2019-03-19 19:25:52 UTC (rev 243160)
</span><span class="lines">@@ -75,18 +75,16 @@
</span><span class="cx">     auto runtimeAgent = std::make_unique<JSGlobalObjectRuntimeAgent>(context);
</span><span class="cx">     auto consoleAgent = std::make_unique<InspectorConsoleAgent>(context);
</span><span class="cx">     auto debuggerAgent = std::make_unique<JSGlobalObjectDebuggerAgent>(context, consoleAgent.get());
</span><del>-    auto scriptProfilerAgent = std::make_unique<InspectorScriptProfilerAgent>(context);
</del><span class="cx"> 
</span><span class="cx">     m_inspectorAgent = inspectorAgent.get();
</span><span class="cx">     m_debuggerAgent = debuggerAgent.get();
</span><span class="cx">     m_consoleAgent = consoleAgent.get();
</span><del>-    m_consoleClient = std::make_unique<JSGlobalObjectConsoleClient>(m_consoleAgent, m_debuggerAgent, scriptProfilerAgent.get());
</del><ins>+    m_consoleClient = std::make_unique<JSGlobalObjectConsoleClient>(m_consoleAgent, m_debuggerAgent);
</ins><span class="cx"> 
</span><span class="cx">     m_agents.append(WTFMove(inspectorAgent));
</span><span class="cx">     m_agents.append(WTFMove(runtimeAgent));
</span><span class="cx">     m_agents.append(WTFMove(consoleAgent));
</span><span class="cx">     m_agents.append(WTFMove(debuggerAgent));
</span><del>-    m_agents.append(WTFMove(scriptProfilerAgent));
</del><span class="cx"> 
</span><span class="cx">     m_executionStopwatch->start();
</span><span class="cx"> }
</span><span class="lines">@@ -312,6 +310,10 @@
</span><span class="cx"> 
</span><span class="cx">     auto context = jsAgentContext();
</span><span class="cx"> 
</span><ins>+    auto scriptProfilerAgentPtr = std::make_unique<InspectorScriptProfilerAgent>(context);
+    m_consoleClient->setInspectorScriptProfilerAgent(scriptProfilerAgentPtr.get());
+    m_agents.append(WTFMove(scriptProfilerAgentPtr));
+
</ins><span class="cx">     auto heapAgent = std::make_unique<InspectorHeapAgent>(context);
</span><span class="cx">     if (m_consoleAgent)
</span><span class="cx">         m_consoleAgent->setInspectorHeapAgent(heapAgent.get());
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (243159 => 243160)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2019-03-19 19:19:21 UTC (rev 243159)
+++ trunk/Source/WebCore/ChangeLog      2019-03-19 19:25:52 UTC (rev 243160)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2019-03-19  Devin Rousso  <drousso@apple.com>
</span><span class="cx"> 
</span><ins>+        Web Inspector: ScriptProfiler: lazily create the agent
+        https://bugs.webkit.org/show_bug.cgi?id=195591
+        <rdar://problem/48791756>
+
+        Reviewed by Joseph Pecoraro.
+
+        No change in functionality.
+
+        * inspector/InspectorController.cpp:
+        (WebCore::InspectorController::InspectorController):
+        (WebCore::InspectorController::createLazyAgents):
+
+2019-03-19  Devin Rousso  <drousso@apple.com>
+
</ins><span class="cx">         Web Inspector: DOMStorage: lazily create the agent
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=195588
</span><span class="cx">         <rdar://problem/48791878>
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorController.cpp (243159 => 243160)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorController.cpp   2019-03-19 19:19:21 UTC (rev 243159)
+++ trunk/Source/WebCore/inspector/InspectorController.cpp      2019-03-19 19:25:52 UTC (rev 243160)
</span><span class="lines">@@ -127,10 +127,6 @@
</span><span class="cx">     InspectorDatabaseAgent* databaseAgent = databaseAgentPtr.get();
</span><span class="cx">     m_agents.append(WTFMove(databaseAgentPtr));
</span><span class="cx"> 
</span><del>-    auto scriptProfilerAgentPtr = std::make_unique<InspectorScriptProfilerAgent>(pageContext);
-    m_instrumentingAgents->setInspectorScriptProfilerAgent(scriptProfilerAgentPtr.get());
-    m_agents.append(WTFMove(scriptProfilerAgentPtr));
-
</del><span class="cx">     auto consoleAgentPtr = std::make_unique<PageConsoleAgent>(pageContext, m_domAgent);
</span><span class="cx">     WebConsoleAgent* consoleAgent = consoleAgentPtr.get();
</span><span class="cx">     m_instrumentingAgents->setWebConsoleAgent(consoleAgentPtr.get());
</span><span class="lines">@@ -192,6 +188,11 @@
</span><span class="cx"> #if ENABLE(INDEXED_DATABASE)
</span><span class="cx">     m_agents.append(std::make_unique<InspectorIndexedDBAgent>(pageContext, m_pageAgent));
</span><span class="cx"> #endif
</span><ins>+
+    auto scriptProfilerAgentPtr = std::make_unique<InspectorScriptProfilerAgent>(pageContext);
+    m_instrumentingAgents->setInspectorScriptProfilerAgent(scriptProfilerAgentPtr.get());
+    m_agents.append(WTFMove(scriptProfilerAgentPtr));
+
</ins><span class="cx"> #if ENABLE(RESOURCE_USAGE)
</span><span class="cx">     m_agents.append(std::make_unique<InspectorCPUProfilerAgent>(pageContext));
</span><span class="cx">     m_agents.append(std::make_unique<InspectorMemoryAgent>(pageContext));
</span></span></pre>
</div>
</div>

</body>
</html>