<!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>[244167] 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/244167">244167</a></dd>
<dt>Author</dt> <dd>drousso@apple.com</dd>
<dt>Date</dt> <dd>2019-04-10 16:15:08 -0700 (Wed, 10 Apr 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>Web Inspector: REGRESSION: lazy agents used outside of frontend/instrumentation can be accessed before being created
https://bugs.webkit.org/show_bug.cgi?id=196725
<rdar://problem/49669810>

Reviewed by Timothy Hatcher.

Source/WebCore:

Move the logic for creating the `InspectorPageAgent` and `InspectorDOMAgent` into separate
functions so that callers into `InspectorController` can be guaranteed to have a valid
instance of the agent.

This doesn't interfere with the `Page.enable` command, as it doesn't clear any saved state.
There is no `DOM.enable` command, so there's no issue there either.

* inspector/InspectorController.h:
(WebCore::InspectorController::pageAgent): Deleted.
* inspector/InspectorController.cpp:
(WebCore::InspectorController::createLazyAgents):
(WebCore::InspectorController::inspect):
(WebCore::InspectorController::hideHighlight):
(WebCore::InspectorController::ensureDOMAgent): Added.
(WebCore::InspectorController::ensurePageAgent): Added.

* inspector/InspectorFrontendClientLocal.cpp:
(WebCore::InspectorFrontendClientLocal::showMainResourceForFrame):

Source/WebKit:

* WebProcess/WebPage/WebInspector.cpp:
(WebKit::WebInspector::showMainResourceForFrame):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorControllercpp">trunk/Source/WebCore/inspector/InspectorController.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorControllerh">trunk/Source/WebCore/inspector/InspectorController.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorFrontendClientLocalcpp">trunk/Source/WebCore/inspector/InspectorFrontendClientLocal.cpp</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitWebProcessWebPageWebInspectorcpp">trunk/Source/WebKit/WebProcess/WebPage/WebInspector.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (244166 => 244167)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2019-04-10 23:04:38 UTC (rev 244166)
+++ trunk/Source/WebCore/ChangeLog      2019-04-10 23:15:08 UTC (rev 244167)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2019-04-10  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: REGRESSION: lazy agents used outside of frontend/instrumentation can be accessed before being created
+        https://bugs.webkit.org/show_bug.cgi?id=196725
+        <rdar://problem/49669810>
+
+        Reviewed by Timothy Hatcher.
+
+        Move the logic for creating the `InspectorPageAgent` and `InspectorDOMAgent` into separate
+        functions so that callers into `InspectorController` can be guaranteed to have a valid
+        instance of the agent.
+
+        This doesn't interfere with the `Page.enable` command, as it doesn't clear any saved state.
+        There is no `DOM.enable` command, so there's no issue there either.
+
+        * inspector/InspectorController.h:
+        (WebCore::InspectorController::pageAgent): Deleted.
+        * inspector/InspectorController.cpp:
+        (WebCore::InspectorController::createLazyAgents):
+        (WebCore::InspectorController::inspect):
+        (WebCore::InspectorController::hideHighlight):
+        (WebCore::InspectorController::ensureDOMAgent): Added.
+        (WebCore::InspectorController::ensurePageAgent): Added.
+
+        * inspector/InspectorFrontendClientLocal.cpp:
+        (WebCore::InspectorFrontendClientLocal::showMainResourceForFrame):
+
</ins><span class="cx"> 2019-04-10  Alex Christensen  <achristensen@webkit.org>
</span><span class="cx"> 
</span><span class="cx">         Add SPI WKNavigationResponse._downloadAttribute
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorController.cpp (244166 => 244167)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorController.cpp   2019-04-10 23:04:38 UTC (rev 244166)
+++ trunk/Source/WebCore/inspector/InspectorController.cpp      2019-04-10 23:15:08 UTC (rev 244167)
</span><span class="lines">@@ -157,9 +157,7 @@
</span><span class="cx"> 
</span><span class="cx">     auto pageContext = pageAgentContext();
</span><span class="cx"> 
</span><del>-    auto pageAgentPtr = std::make_unique<InspectorPageAgent>(pageContext, m_inspectorClient, m_overlay.get());
-    m_pageAgent = pageAgentPtr.get();
-    m_agents.append(WTFMove(pageAgentPtr));
</del><ins>+    ensurePageAgent();
</ins><span class="cx"> 
</span><span class="cx">     m_agents.append(std::make_unique<PageRuntimeAgent>(pageContext));
</span><span class="cx"> 
</span><span class="lines">@@ -169,7 +167,7 @@
</span><span class="cx"> 
</span><span class="cx">     m_agents.append(std::make_unique<PageNetworkAgent>(pageContext));
</span><span class="cx">     m_agents.append(std::make_unique<InspectorCSSAgent>(pageContext));
</span><del>-    m_agents.append(std::make_unique<InspectorDOMAgent>(pageContext, m_overlay.get()));
</del><ins>+    ensureDOMAgent();
</ins><span class="cx">     m_agents.append(std::make_unique<InspectorDOMDebuggerAgent>(pageContext, debuggerAgentPtr));
</span><span class="cx">     m_agents.append(std::make_unique<InspectorApplicationCacheAgent>(pageContext));
</span><span class="cx">     m_agents.append(std::make_unique<InspectorLayerTreeAgent>(pageContext));
</span><span class="lines">@@ -382,8 +380,7 @@
</span><span class="cx">     if (!hasRemoteFrontend())
</span><span class="cx">         show();
</span><span class="cx"> 
</span><del>-    if (auto* domAgent = m_instrumentingAgents->inspectorDOMAgent())
-        domAgent->inspect(node);
</del><ins>+    ensureDOMAgent().inspect(node);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> bool InspectorController::enabled() const
</span><span class="lines">@@ -403,10 +400,7 @@
</span><span class="cx"> 
</span><span class="cx"> void InspectorController::hideHighlight()
</span><span class="cx"> {
</span><del>-    if (auto* domAgent = m_instrumentingAgents->inspectorDOMAgent()) {
-        ErrorString unused;
-        domAgent->hideHighlight(unused);
-    }
</del><ins>+    m_overlay->hideHighlight();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> Node* InspectorController::highlightedNode() const
</span><span class="lines">@@ -426,6 +420,28 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+InspectorDOMAgent& InspectorController::ensureDOMAgent()
+{
+    if (!m_inspectorDOMAgent) {
+        auto pageContext = pageAgentContext();
+        auto domAgent = std::make_unique<InspectorDOMAgent>(pageContext, m_overlay.get());
+        m_inspectorDOMAgent = domAgent.get();
+        m_agents.append(WTFMove(domAgent));
+    }
+    return *m_inspectorDOMAgent;
+}
+
+InspectorPageAgent& InspectorController::ensurePageAgent()
+{
+    if (!m_inspectorPageAgent) {
+        auto pageContext = pageAgentContext();
+        auto pageAgent = std::make_unique<InspectorPageAgent>(pageContext, m_inspectorClient, m_overlay.get());
+        m_inspectorPageAgent = pageAgent.get();
+        m_agents.append(WTFMove(pageAgent));
+    }
+    return *m_inspectorPageAgent;
+}
+
</ins><span class="cx"> bool InspectorController::developerExtrasEnabled() const
</span><span class="cx"> {
</span><span class="cx">     return m_page.settings().developerExtrasEnabled();
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorController.h (244166 => 244167)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorController.h     2019-04-10 23:04:38 UTC (rev 244166)
+++ trunk/Source/WebCore/inspector/InspectorController.h        2019-04-10 23:15:08 UTC (rev 244167)
</span><span class="lines">@@ -52,6 +52,7 @@
</span><span class="cx"> class Frame;
</span><span class="cx"> class GraphicsContext;
</span><span class="cx"> class InspectorClient;
</span><ins>+class InspectorDOMAgent;
</ins><span class="cx"> class InspectorFrontendClient;
</span><span class="cx"> class InspectorInstrumentation;
</span><span class="cx"> class InspectorPageAgent;
</span><span class="lines">@@ -104,8 +105,10 @@
</span><span class="cx"> 
</span><span class="cx">     InspectorClient* inspectorClient() const { return m_inspectorClient; }
</span><span class="cx">     InspectorFrontendClient* inspectorFrontendClient() const { return m_inspectorFrontendClient; }
</span><del>-    InspectorPageAgent* pageAgent() const { return m_pageAgent; }
</del><span class="cx"> 
</span><ins>+    InspectorDOMAgent& ensureDOMAgent();
+    WEBCORE_EXPORT InspectorPageAgent& ensurePageAgent();
+
</ins><span class="cx">     // InspectorEnvironment
</span><span class="cx">     bool developerExtrasEnabled() const override;
</span><span class="cx">     bool canAccessInspectedScriptState(JSC::ExecState*) const override;
</span><span class="lines">@@ -136,8 +139,11 @@
</span><span class="cx">     InspectorFrontendClient* m_inspectorFrontendClient { nullptr };
</span><span class="cx"> 
</span><span class="cx">     Inspector::InspectorAgent* m_inspectorAgent { nullptr };
</span><del>-    InspectorPageAgent* m_pageAgent { nullptr };
</del><span class="cx"> 
</span><ins>+    // Lazy, but also on-demand agents.
+    InspectorDOMAgent* m_inspectorDOMAgent { nullptr };
+    InspectorPageAgent* m_inspectorPageAgent { nullptr };
+
</ins><span class="cx">     bool m_isUnderTest { false };
</span><span class="cx">     bool m_isAutomaticInspection { false };
</span><span class="cx">     bool m_pauseAfterInitialization = { false };
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorFrontendClientLocalcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorFrontendClientLocal.cpp (244166 => 244167)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorFrontendClientLocal.cpp  2019-04-10 23:04:38 UTC (rev 244166)
+++ trunk/Source/WebCore/inspector/InspectorFrontendClientLocal.cpp     2019-04-10 23:15:08 UTC (rev 244167)
</span><span class="lines">@@ -338,7 +338,7 @@
</span><span class="cx"> 
</span><span class="cx"> void InspectorFrontendClientLocal::showMainResourceForFrame(Frame* frame)
</span><span class="cx"> {
</span><del>-    String frameId = m_inspectedPageController->pageAgent()->frameId(frame);
</del><ins>+    String frameId = m_inspectedPageController->ensurePageAgent().frameId(frame);
</ins><span class="cx">     evaluateOnLoad(makeString("[\"showMainResourceForFrame\", \"", frameId, "\"]"));
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (244166 => 244167)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2019-04-10 23:04:38 UTC (rev 244166)
+++ trunk/Source/WebKit/ChangeLog       2019-04-10 23:15:08 UTC (rev 244167)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2019-04-10  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: REGRESSION: lazy agents used outside of frontend/instrumentation can be accessed before being created
+        https://bugs.webkit.org/show_bug.cgi?id=196725
+        <rdar://problem/49669810>
+
+        Reviewed by Timothy Hatcher.
+
+        * WebProcess/WebPage/WebInspector.cpp:
+        (WebKit::WebInspector::showMainResourceForFrame):
+
</ins><span class="cx"> 2019-04-10  Youenn Fablet  <youenn@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Clear Cache Storage structures before removing all related files
</span></span></pre></div>
<a id="trunkSourceWebKitWebProcessWebPageWebInspectorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebProcess/WebPage/WebInspector.cpp (244166 => 244167)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebProcess/WebPage/WebInspector.cpp  2019-04-10 23:04:38 UTC (rev 244166)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebInspector.cpp     2019-04-10 23:15:08 UTC (rev 244167)
</span><span class="lines">@@ -232,7 +232,7 @@
</span><span class="cx"> 
</span><span class="cx">     m_page->corePage()->inspectorController().show();
</span><span class="cx"> 
</span><del>-    String inspectorFrameIdentifier = m_page->corePage()->inspectorController().pageAgent()->frameId(frame->coreFrame());
</del><ins>+    String inspectorFrameIdentifier = m_page->corePage()->inspectorController().ensurePageAgent().frameId(frame->coreFrame());
</ins><span class="cx"> 
</span><span class="cx">     whenFrontendConnectionEstablished([=] {
</span><span class="cx">         m_frontendConnection->send(Messages::WebInspectorUI::ShowMainResourceForFrame(inspectorFrameIdentifier), 0);
</span></span></pre>
</div>
</div>

</body>
</html>