<!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>[189218] 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/189218">189218</a></dd>
<dt>Author</dt> <dd>bburg@apple.com</dd>
<dt>Date</dt> <dd>2015-09-01 10:52:15 -0700 (Tue, 01 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: tighten up lifetimes for InspectorController-owned objects; add brace initializers to agents
https://bugs.webkit.org/show_bug.cgi?id=148612
Reviewed by Joseph Pecoraro.
Both InjectedScriptManager and AgentRegistry (thus all agents) are
Source/JavaScriptCore:
owned by JSGlobalObjectInspectorController. So, use references.
Add brace initalizers for scalar and pointer members in agent classes.
* inspector/ConsoleMessage.cpp:
(Inspector::ConsoleMessage::addToFrontend):
(Inspector::ConsoleMessage::updateRepeatCountInConsole):
(Inspector::ConsoleMessage::ConsoleMessage):
* inspector/ConsoleMessage.h:
* inspector/JSGlobalObjectInspectorController.cpp:
(Inspector::JSGlobalObjectInspectorController::JSGlobalObjectInspectorController):
* inspector/agents/InspectorAgent.cpp:
(Inspector::InspectorAgent::InspectorAgent):
* inspector/agents/InspectorAgent.h:
* inspector/agents/InspectorConsoleAgent.cpp:
(Inspector::InspectorConsoleAgent::InspectorConsoleAgent):
(Inspector::InspectorConsoleAgent::enable):
(Inspector::InspectorConsoleAgent::clearMessages):
(Inspector::InspectorConsoleAgent::addMessageToConsole):
(Inspector::InspectorConsoleAgent::addConsoleMessage):
* inspector/agents/InspectorConsoleAgent.h:
* inspector/agents/InspectorDebuggerAgent.cpp:
(Inspector::InspectorDebuggerAgent::InspectorDebuggerAgent):
(Inspector::InspectorDebuggerAgent::removeBreakpoint):
(Inspector::InspectorDebuggerAgent::getFunctionDetails):
(Inspector::InspectorDebuggerAgent::evaluateOnCallFrame):
(Inspector::InspectorDebuggerAgent::didPause):
(Inspector::InspectorDebuggerAgent::breakpointActionProbe):
(Inspector::InspectorDebuggerAgent::didContinue):
(Inspector::InspectorDebuggerAgent::clearExceptionValue):
* inspector/agents/InspectorDebuggerAgent.h:
* inspector/agents/InspectorRuntimeAgent.cpp:
(Inspector::InspectorRuntimeAgent::InspectorRuntimeAgent):
(Inspector::InspectorRuntimeAgent::callFunctionOn):
(Inspector::InspectorRuntimeAgent::getProperties):
(Inspector::InspectorRuntimeAgent::getDisplayableProperties):
(Inspector::InspectorRuntimeAgent::getCollectionEntries):
(Inspector::InspectorRuntimeAgent::saveResult):
(Inspector::InspectorRuntimeAgent::releaseObject):
(Inspector::InspectorRuntimeAgent::releaseObjectGroup):
* inspector/agents/InspectorRuntimeAgent.h:
* inspector/agents/JSGlobalObjectConsoleAgent.cpp:
(Inspector::JSGlobalObjectConsoleAgent::JSGlobalObjectConsoleAgent):
* inspector/agents/JSGlobalObjectConsoleAgent.h:
* inspector/agents/JSGlobalObjectDebuggerAgent.cpp:
(Inspector::JSGlobalObjectDebuggerAgent::JSGlobalObjectDebuggerAgent):
(Inspector::JSGlobalObjectDebuggerAgent::injectedScriptForEval):
* inspector/agents/JSGlobalObjectDebuggerAgent.h:
* inspector/agents/JSGlobalObjectRuntimeAgent.cpp:
(Inspector::JSGlobalObjectRuntimeAgent::JSGlobalObjectRuntimeAgent):
(Inspector::JSGlobalObjectRuntimeAgent::injectedScriptForEval):
* inspector/agents/JSGlobalObjectRuntimeAgent.h:
Source/WebCore:
owned by [Worker]InspectorController. So, use references.
InstrumentingAgents is morally owned by InspectorController as well, but
must be a Ref for now since instrumentation cookies take a strong reference.
Add brace initalizers for scalar and pointer members in agent classes.
No new tests, no behavior change.
* inspector/InspectorApplicationCacheAgent.cpp:
(WebCore::InspectorApplicationCacheAgent::InspectorApplicationCacheAgent):
(WebCore::InspectorApplicationCacheAgent::willDestroyFrontendAndBackend):
(WebCore::InspectorApplicationCacheAgent::enable):
* inspector/InspectorApplicationCacheAgent.h:
* inspector/InspectorCSSAgent.cpp:
(WebCore::InspectorCSSAgent::InspectorCSSAgent):
(WebCore::InspectorCSSAgent::enable):
(WebCore::InspectorCSSAgent::disable):
* inspector/InspectorCSSAgent.h:
* inspector/InspectorConsoleInstrumentation.h:
(WebCore::InspectorInstrumentation::addMessageToConsole):
(WebCore::InspectorInstrumentation::consoleCount):
(WebCore::InspectorInstrumentation::startProfiling):
(WebCore::InspectorInstrumentation::stopProfiling):
* inspector/InspectorController.cpp:
(WebCore::InspectorController::InspectorController):
(WebCore::InspectorController::connectFrontend):
(WebCore::InspectorController::disconnectFrontend):
(WebCore::InspectorController::disconnectAllFrontends):
* inspector/InspectorController.h:
* inspector/InspectorDOMAgent.cpp:
(WebCore::InspectorDOMAgent::InspectorDOMAgent):
(WebCore::InspectorDOMAgent::didCreateFrontendAndBackend):
(WebCore::InspectorDOMAgent::willDestroyFrontendAndBackend):
(WebCore::InspectorDOMAgent::focusNode):
(WebCore::InspectorDOMAgent::buildObjectForEventListener):
(WebCore::InspectorDOMAgent::nodeForObjectId):
(WebCore::InspectorDOMAgent::resolveNode):
* inspector/InspectorDOMAgent.h:
* inspector/InspectorDOMDebuggerAgent.cpp:
(WebCore::InspectorDOMDebuggerAgent::InspectorDOMDebuggerAgent):
(WebCore::InspectorDOMDebuggerAgent::~InspectorDOMDebuggerAgent):
(WebCore::InspectorDOMDebuggerAgent::debuggerWasEnabled):
(WebCore::InspectorDOMDebuggerAgent::disable):
* inspector/InspectorDOMDebuggerAgent.h:
* inspector/InspectorDOMStorageAgent.cpp:
(WebCore::InspectorDOMStorageAgent::InspectorDOMStorageAgent):
(WebCore::InspectorDOMStorageAgent::~InspectorDOMStorageAgent):
* inspector/InspectorDOMStorageAgent.h:
* inspector/InspectorDatabaseAgent.cpp:
(WebCore::InspectorDatabaseAgent::InspectorDatabaseAgent):
(WebCore::InspectorDatabaseAgent::~InspectorDatabaseAgent):
* inspector/InspectorDatabaseAgent.h:
* inspector/InspectorIndexedDBAgent.cpp:
(WebCore::InspectorIndexedDBAgent::InspectorIndexedDBAgent):
(WebCore::InspectorIndexedDBAgent::requestData):
* inspector/InspectorIndexedDBAgent.h:
* inspector/InspectorInstrumentation.cpp:
(WebCore::InspectorInstrumentation::instrumentingAgentsForPage):
(WebCore::InspectorInstrumentation::instrumentingAgentsForWorkerGlobalScope):
* inspector/InspectorInstrumentation.h:
(WebCore::InspectorInstrumentation::mouseDidMoveOverElement):
(WebCore::InspectorInstrumentation::scriptsEnabled):
(WebCore::InspectorInstrumentation::didScroll):
(WebCore::InspectorInstrumentation::markResourceAsCached):
(WebCore::InspectorInstrumentation::didLoadResourceFromMemoryCache):
(WebCore::InspectorInstrumentation::willRunJavaScriptDialog):
(WebCore::InspectorInstrumentation::sessionCreated):
(WebCore::InspectorInstrumentation::sessionLoaded):
(WebCore::InspectorInstrumentation::sessionModified):
(WebCore::InspectorInstrumentation::segmentCreated):
(WebCore::InspectorInstrumentation::segmentCompleted):
(WebCore::InspectorInstrumentation::segmentLoaded):
(WebCore::InspectorInstrumentation::segmentUnloaded):
(WebCore::InspectorInstrumentation::captureStarted):
(WebCore::InspectorInstrumentation::captureStopped):
(WebCore::InspectorInstrumentation::playbackStarted):
(WebCore::InspectorInstrumentation::playbackPaused):
(WebCore::InspectorInstrumentation::playbackFinished):
(WebCore::InspectorInstrumentation::playbackHitPosition):
* inspector/InspectorLayerTreeAgent.cpp:
(WebCore::InspectorLayerTreeAgent::InspectorLayerTreeAgent):
(WebCore::InspectorLayerTreeAgent::enable):
(WebCore::InspectorLayerTreeAgent::disable):
(WebCore::InspectorLayerTreeAgent::layersForNode):
(WebCore::InspectorLayerTreeAgent::idForNode):
* inspector/InspectorLayerTreeAgent.h:
* inspector/InspectorPageAgent.cpp:
(WebCore::InspectorPageAgent::InspectorPageAgent):
(WebCore::InspectorPageAgent::timestamp):
(WebCore::InspectorPageAgent::enable):
(WebCore::InspectorPageAgent::disable):
(WebCore::InspectorPageAgent::frameStartedLoading):
(WebCore::InspectorPageAgent::snapshotNode):
* inspector/InspectorPageAgent.h:
* inspector/InspectorReplayAgent.cpp:
(WebCore::InspectorReplayAgent::InspectorReplayAgent):
(WebCore::InspectorReplayAgent::didCreateFrontendAndBackend):
(WebCore::InspectorReplayAgent::willDestroyFrontendAndBackend):
* inspector/InspectorReplayAgent.h:
* inspector/InspectorResourceAgent.cpp:
(WebCore::InspectorResourceAgent::InspectorResourceAgent):
(WebCore::InspectorResourceAgent::~InspectorResourceAgent):
(WebCore::InspectorResourceAgent::timestamp):
(WebCore::InspectorResourceAgent::enable):
(WebCore::InspectorResourceAgent::disable):
* inspector/InspectorResourceAgent.h:
* inspector/InspectorTimelineAgent.cpp:
(WebCore::InspectorTimelineAgent::didCreateFrontendAndBackend):
(WebCore::InspectorTimelineAgent::willDestroyFrontendAndBackend):
(WebCore::InspectorTimelineAgent::internalStart):
(WebCore::InspectorTimelineAgent::internalStop):
(WebCore::InspectorTimelineAgent::timestamp):
(WebCore::InspectorTimelineAgent::startFromConsole):
(WebCore::InspectorTimelineAgent::willCallFunction):
(WebCore::InspectorTimelineAgent::willEvaluateScript):
(WebCore::InspectorTimelineAgent::InspectorTimelineAgent):
* inspector/InspectorTimelineAgent.h:
* inspector/InspectorWebAgentBase.h:
(WebCore::InspectorAgentBase::InspectorAgentBase):
* inspector/InspectorWorkerAgent.cpp:
(WebCore::InspectorWorkerAgent::InspectorWorkerAgent):
(WebCore::InspectorWorkerAgent::~InspectorWorkerAgent):
* inspector/InspectorWorkerAgent.h:
* inspector/InstrumentingAgents.cpp:
(WebCore::InstrumentingAgents::InstrumentingAgents): Deleted.
* inspector/InstrumentingAgents.h:
(WebCore::InstrumentingAgents::create):
* inspector/PageConsoleAgent.cpp:
(WebCore::PageConsoleAgent::PageConsoleAgent):
(WebCore::PageConsoleAgent::addInspectedNode):
* inspector/PageConsoleAgent.h:
* inspector/PageDebuggerAgent.cpp:
(WebCore::PageDebuggerAgent::PageDebuggerAgent):
(WebCore::PageDebuggerAgent::enable):
(WebCore::PageDebuggerAgent::disable):
(WebCore::PageDebuggerAgent::injectedScriptForEval):
* inspector/PageDebuggerAgent.h:
* inspector/PageRuntimeAgent.cpp:
(WebCore::PageRuntimeAgent::PageRuntimeAgent):
(WebCore::PageRuntimeAgent::injectedScriptForEval):
(WebCore::PageRuntimeAgent::notifyContextCreated):
* inspector/PageRuntimeAgent.h:
* inspector/WebConsoleAgent.cpp:
(WebCore::WebConsoleAgent::WebConsoleAgent):
(WebCore::WebConsoleAgent::frameWindowDiscarded):
(WebCore::WebConsoleAgent::didFinishXHRLoading):
(WebCore::WebConsoleAgent::didReceiveResponse):
(WebCore::WebConsoleAgent::didFailLoading):
* inspector/WebConsoleAgent.h:
* inspector/WebDebuggerAgent.cpp:
(WebCore::WebDebuggerAgent::WebDebuggerAgent):
(WebCore::WebDebuggerAgent::enable):
(WebCore::WebDebuggerAgent::disable):
* inspector/WebDebuggerAgent.h:
* inspector/WorkerConsoleAgent.cpp:
(WebCore::WorkerConsoleAgent::WorkerConsoleAgent):
* inspector/WorkerConsoleAgent.h:
* inspector/WorkerDebuggerAgent.cpp:
(WebCore::WorkerDebuggerAgent::WorkerDebuggerAgent):
(WebCore::WorkerDebuggerAgent::injectedScriptForEval):
* inspector/WorkerDebuggerAgent.h:
* inspector/WorkerInspectorController.cpp:
(WebCore::WorkerInspectorController::WorkerInspectorController):
* inspector/WorkerInspectorController.h:
* inspector/WorkerRuntimeAgent.cpp:
(WebCore::WorkerRuntimeAgent::WorkerRuntimeAgent):
(WebCore::WorkerRuntimeAgent::injectedScriptForEval):
* inspector/WorkerRuntimeAgent.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorConsoleMessagecpp">trunk/Source/JavaScriptCore/inspector/ConsoleMessage.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorConsoleMessageh">trunk/Source/JavaScriptCore/inspector/ConsoleMessage.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorJSGlobalObjectInspectorControllercpp">trunk/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsInspectorAgentcpp">trunk/Source/JavaScriptCore/inspector/agents/InspectorAgent.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsInspectorAgenth">trunk/Source/JavaScriptCore/inspector/agents/InspectorAgent.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsInspectorConsoleAgentcpp">trunk/Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsInspectorConsoleAgenth">trunk/Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsInspectorDebuggerAgentcpp">trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsInspectorDebuggerAgenth">trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsInspectorRuntimeAgentcpp">trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsInspectorRuntimeAgenth">trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsJSGlobalObjectConsoleAgentcpp">trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectConsoleAgent.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsJSGlobalObjectConsoleAgenth">trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectConsoleAgent.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsJSGlobalObjectDebuggerAgentcpp">trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectDebuggerAgent.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsJSGlobalObjectDebuggerAgenth">trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectDebuggerAgent.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsJSGlobalObjectRuntimeAgentcpp">trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectRuntimeAgent.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsJSGlobalObjectRuntimeAgenth">trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectRuntimeAgent.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorApplicationCacheAgentcpp">trunk/Source/WebCore/inspector/InspectorApplicationCacheAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorApplicationCacheAgenth">trunk/Source/WebCore/inspector/InspectorApplicationCacheAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorCSSAgentcpp">trunk/Source/WebCore/inspector/InspectorCSSAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorCSSAgenth">trunk/Source/WebCore/inspector/InspectorCSSAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorConsoleInstrumentationh">trunk/Source/WebCore/inspector/InspectorConsoleInstrumentation.h</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="#trunkSourceWebCoreinspectorInspectorDOMAgentcpp">trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorDOMAgenth">trunk/Source/WebCore/inspector/InspectorDOMAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorDOMDebuggerAgentcpp">trunk/Source/WebCore/inspector/InspectorDOMDebuggerAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorDOMDebuggerAgenth">trunk/Source/WebCore/inspector/InspectorDOMDebuggerAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorDOMStorageAgentcpp">trunk/Source/WebCore/inspector/InspectorDOMStorageAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorDOMStorageAgenth">trunk/Source/WebCore/inspector/InspectorDOMStorageAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorDatabaseAgentcpp">trunk/Source/WebCore/inspector/InspectorDatabaseAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorDatabaseAgenth">trunk/Source/WebCore/inspector/InspectorDatabaseAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorIndexedDBAgentcpp">trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorIndexedDBAgenth">trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorInstrumentationcpp">trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorInstrumentationh">trunk/Source/WebCore/inspector/InspectorInstrumentation.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorLayerTreeAgentcpp">trunk/Source/WebCore/inspector/InspectorLayerTreeAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorLayerTreeAgenth">trunk/Source/WebCore/inspector/InspectorLayerTreeAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorPageAgentcpp">trunk/Source/WebCore/inspector/InspectorPageAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorPageAgenth">trunk/Source/WebCore/inspector/InspectorPageAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorReplayAgentcpp">trunk/Source/WebCore/inspector/InspectorReplayAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorReplayAgenth">trunk/Source/WebCore/inspector/InspectorReplayAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorResourceAgentcpp">trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorResourceAgenth">trunk/Source/WebCore/inspector/InspectorResourceAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorTimelineAgentcpp">trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorTimelineAgenth">trunk/Source/WebCore/inspector/InspectorTimelineAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorWebAgentBaseh">trunk/Source/WebCore/inspector/InspectorWebAgentBase.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorWorkerAgentcpp">trunk/Source/WebCore/inspector/InspectorWorkerAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorWorkerAgenth">trunk/Source/WebCore/inspector/InspectorWorkerAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInstrumentingAgentscpp">trunk/Source/WebCore/inspector/InstrumentingAgents.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInstrumentingAgentsh">trunk/Source/WebCore/inspector/InstrumentingAgents.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorPageConsoleAgentcpp">trunk/Source/WebCore/inspector/PageConsoleAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorPageConsoleAgenth">trunk/Source/WebCore/inspector/PageConsoleAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorPageDebuggerAgentcpp">trunk/Source/WebCore/inspector/PageDebuggerAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorPageDebuggerAgenth">trunk/Source/WebCore/inspector/PageDebuggerAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorPageRuntimeAgentcpp">trunk/Source/WebCore/inspector/PageRuntimeAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorPageRuntimeAgenth">trunk/Source/WebCore/inspector/PageRuntimeAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorWebConsoleAgentcpp">trunk/Source/WebCore/inspector/WebConsoleAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorWebConsoleAgenth">trunk/Source/WebCore/inspector/WebConsoleAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorWebDebuggerAgentcpp">trunk/Source/WebCore/inspector/WebDebuggerAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorWebDebuggerAgenth">trunk/Source/WebCore/inspector/WebDebuggerAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorWorkerConsoleAgentcpp">trunk/Source/WebCore/inspector/WorkerConsoleAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorWorkerConsoleAgenth">trunk/Source/WebCore/inspector/WorkerConsoleAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorWorkerDebuggerAgentcpp">trunk/Source/WebCore/inspector/WorkerDebuggerAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorWorkerDebuggerAgenth">trunk/Source/WebCore/inspector/WorkerDebuggerAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorWorkerInspectorControllercpp">trunk/Source/WebCore/inspector/WorkerInspectorController.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorWorkerInspectorControllerh">trunk/Source/WebCore/inspector/WorkerInspectorController.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorWorkerRuntimeAgentcpp">trunk/Source/WebCore/inspector/WorkerRuntimeAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorWorkerRuntimeAgenth">trunk/Source/WebCore/inspector/WorkerRuntimeAgent.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (189217 => 189218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-09-01 17:44:35 UTC (rev 189217)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-09-01 17:52:15 UTC (rev 189218)
</span><span class="lines">@@ -1,3 +1,64 @@
</span><ins>+2015-09-01 Brian Burg <bburg@apple.com>
+
+ Web Inspector: tighten up lifetimes for InspectorController-owned objects; add brace initializers to agents
+ https://bugs.webkit.org/show_bug.cgi?id=148612
+
+ Reviewed by Joseph Pecoraro.
+
+ Both InjectedScriptManager and AgentRegistry (thus all agents) are
+ owned by JSGlobalObjectInspectorController. So, use references.
+
+ Add brace initalizers for scalar and pointer members in agent classes.
+
+ * inspector/ConsoleMessage.cpp:
+ (Inspector::ConsoleMessage::addToFrontend):
+ (Inspector::ConsoleMessage::updateRepeatCountInConsole):
+ (Inspector::ConsoleMessage::ConsoleMessage):
+ * inspector/ConsoleMessage.h:
+ * inspector/JSGlobalObjectInspectorController.cpp:
+ (Inspector::JSGlobalObjectInspectorController::JSGlobalObjectInspectorController):
+ * inspector/agents/InspectorAgent.cpp:
+ (Inspector::InspectorAgent::InspectorAgent):
+ * inspector/agents/InspectorAgent.h:
+ * inspector/agents/InspectorConsoleAgent.cpp:
+ (Inspector::InspectorConsoleAgent::InspectorConsoleAgent):
+ (Inspector::InspectorConsoleAgent::enable):
+ (Inspector::InspectorConsoleAgent::clearMessages):
+ (Inspector::InspectorConsoleAgent::addMessageToConsole):
+ (Inspector::InspectorConsoleAgent::addConsoleMessage):
+ * inspector/agents/InspectorConsoleAgent.h:
+ * inspector/agents/InspectorDebuggerAgent.cpp:
+ (Inspector::InspectorDebuggerAgent::InspectorDebuggerAgent):
+ (Inspector::InspectorDebuggerAgent::removeBreakpoint):
+ (Inspector::InspectorDebuggerAgent::getFunctionDetails):
+ (Inspector::InspectorDebuggerAgent::evaluateOnCallFrame):
+ (Inspector::InspectorDebuggerAgent::didPause):
+ (Inspector::InspectorDebuggerAgent::breakpointActionProbe):
+ (Inspector::InspectorDebuggerAgent::didContinue):
+ (Inspector::InspectorDebuggerAgent::clearExceptionValue):
+ * inspector/agents/InspectorDebuggerAgent.h:
+ * inspector/agents/InspectorRuntimeAgent.cpp:
+ (Inspector::InspectorRuntimeAgent::InspectorRuntimeAgent):
+ (Inspector::InspectorRuntimeAgent::callFunctionOn):
+ (Inspector::InspectorRuntimeAgent::getProperties):
+ (Inspector::InspectorRuntimeAgent::getDisplayableProperties):
+ (Inspector::InspectorRuntimeAgent::getCollectionEntries):
+ (Inspector::InspectorRuntimeAgent::saveResult):
+ (Inspector::InspectorRuntimeAgent::releaseObject):
+ (Inspector::InspectorRuntimeAgent::releaseObjectGroup):
+ * inspector/agents/InspectorRuntimeAgent.h:
+ * inspector/agents/JSGlobalObjectConsoleAgent.cpp:
+ (Inspector::JSGlobalObjectConsoleAgent::JSGlobalObjectConsoleAgent):
+ * inspector/agents/JSGlobalObjectConsoleAgent.h:
+ * inspector/agents/JSGlobalObjectDebuggerAgent.cpp:
+ (Inspector::JSGlobalObjectDebuggerAgent::JSGlobalObjectDebuggerAgent):
+ (Inspector::JSGlobalObjectDebuggerAgent::injectedScriptForEval):
+ * inspector/agents/JSGlobalObjectDebuggerAgent.h:
+ * inspector/agents/JSGlobalObjectRuntimeAgent.cpp:
+ (Inspector::JSGlobalObjectRuntimeAgent::JSGlobalObjectRuntimeAgent):
+ (Inspector::JSGlobalObjectRuntimeAgent::injectedScriptForEval):
+ * inspector/agents/JSGlobalObjectRuntimeAgent.h:
+
</ins><span class="cx"> 2015-08-31 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> [ES6] Introduce ModuleProgramExecutable families and compile Module code to bytecode
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorConsoleMessagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/ConsoleMessage.cpp (189217 => 189218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/ConsoleMessage.cpp 2015-09-01 17:44:35 UTC (rev 189217)
+++ trunk/Source/JavaScriptCore/inspector/ConsoleMessage.cpp 2015-09-01 17:52:15 UTC (rev 189218)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2007, 2008, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2007, 2008, 2014, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2008 Matt Lilek <webkit@mattlilek.com>
</span><span class="cx"> * Copyright (C) 2009, 2010 Google Inc. All rights reserved.
</span><span class="cx"> *
</span><span class="lines">@@ -49,9 +49,6 @@
</span><span class="cx"> , m_level(level)
</span><span class="cx"> , m_message(message)
</span><span class="cx"> , m_url()
</span><del>- , m_line(0)
- , m_column(0)
- , m_repeatCount(1)
</del><span class="cx"> , m_requestId(IdentifiersFactory::requestId(requestIdentifier))
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -64,7 +61,6 @@
</span><span class="cx"> , m_url(url)
</span><span class="cx"> , m_line(line)
</span><span class="cx"> , m_column(column)
</span><del>- , m_repeatCount(1)
</del><span class="cx"> , m_requestId(IdentifiersFactory::requestId(requestIdentifier))
</span><span class="cx"> {
</span><span class="cx"> autogenerateMetadata(state);
</span><span class="lines">@@ -76,9 +72,6 @@
</span><span class="cx"> , m_level(level)
</span><span class="cx"> , m_message(message)
</span><span class="cx"> , m_url()
</span><del>- , m_line(0)
- , m_column(0)
- , m_repeatCount(1)
</del><span class="cx"> , m_requestId(IdentifiersFactory::requestId(requestIdentifier))
</span><span class="cx"> {
</span><span class="cx"> m_callStack = callStack;
</span><span class="lines">@@ -98,9 +91,6 @@
</span><span class="cx"> , m_message(message)
</span><span class="cx"> , m_arguments(arguments)
</span><span class="cx"> , m_url()
</span><del>- , m_line(0)
- , m_column(0)
- , m_repeatCount(1)
</del><span class="cx"> , m_requestId(IdentifiersFactory::requestId(requestIdentifier))
</span><span class="cx"> {
</span><span class="cx"> autogenerateMetadata(state);
</span><span class="lines">@@ -179,7 +169,7 @@
</span><span class="cx"> return Inspector::Protocol::Console::ConsoleMessage::Level::Log;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ConsoleMessage::addToFrontend(ConsoleFrontendDispatcher* consoleFrontendDispatcher, InjectedScriptManager* injectedScriptManager, bool generatePreview)
</del><ins>+void ConsoleMessage::addToFrontend(ConsoleFrontendDispatcher& consoleFrontendDispatcher, InjectedScriptManager& injectedScriptManager, bool generatePreview)
</ins><span class="cx"> {
</span><span class="cx"> Ref<Inspector::Protocol::Console::ConsoleMessage> jsonObj = Inspector::Protocol::Console::ConsoleMessage::create()
</span><span class="cx"> .setSource(messageSourceValue(m_source))
</span><span class="lines">@@ -198,7 +188,7 @@
</span><span class="cx"> jsonObj->setNetworkRequestId(m_requestId);
</span><span class="cx">
</span><span class="cx"> if (m_arguments && m_arguments->argumentCount()) {
</span><del>- InjectedScript injectedScript = injectedScriptManager->injectedScriptFor(m_arguments->globalState());
</del><ins>+ InjectedScript injectedScript = injectedScriptManager.injectedScriptFor(m_arguments->globalState());
</ins><span class="cx"> if (!injectedScript.hasNoValue()) {
</span><span class="cx"> Ref<Inspector::Protocol::Array<Inspector::Protocol::Runtime::RemoteObject>> jsonArgs = Inspector::Protocol::Array<Inspector::Protocol::Runtime::RemoteObject>::create();
</span><span class="cx"> if (m_type == MessageType::Table && generatePreview && m_arguments->argumentCount()) {
</span><span class="lines">@@ -229,12 +219,12 @@
</span><span class="cx"> if (m_callStack)
</span><span class="cx"> jsonObj->setStackTrace(m_callStack->buildInspectorArray());
</span><span class="cx">
</span><del>- consoleFrontendDispatcher->messageAdded(WTF::move(jsonObj));
</del><ins>+ consoleFrontendDispatcher.messageAdded(WTF::move(jsonObj));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void ConsoleMessage::updateRepeatCountInConsole(ConsoleFrontendDispatcher* consoleFrontendDispatcher)
</del><ins>+void ConsoleMessage::updateRepeatCountInConsole(ConsoleFrontendDispatcher& consoleFrontendDispatcher)
</ins><span class="cx"> {
</span><del>- consoleFrontendDispatcher->messageRepeatCountUpdated(m_repeatCount);
</del><ins>+ consoleFrontendDispatcher.messageRepeatCountUpdated(m_repeatCount);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool ConsoleMessage::isEqual(ConsoleMessage* msg) const
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorConsoleMessageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/ConsoleMessage.h (189217 => 189218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/ConsoleMessage.h 2015-09-01 17:44:35 UTC (rev 189217)
+++ trunk/Source/JavaScriptCore/inspector/ConsoleMessage.h 2015-09-01 17:52:15 UTC (rev 189218)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2007, 2008 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2007, 2008, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2008 Matt Lilek <webkit@mattlilek.com>
</span><span class="cx"> * Copyright (C) 2009, 2010 Google Inc. All rights reserved.
</span><span class="cx"> *
</span><span class="lines">@@ -55,8 +55,8 @@
</span><span class="cx"> ConsoleMessage(MessageSource, MessageType, MessageLevel, const String& message, PassRefPtr<ScriptArguments>, JSC::ExecState*, unsigned long requestIdentifier = 0);
</span><span class="cx"> ~ConsoleMessage();
</span><span class="cx">
</span><del>- void addToFrontend(ConsoleFrontendDispatcher*, InjectedScriptManager*, bool generatePreview);
- void updateRepeatCountInConsole(ConsoleFrontendDispatcher*);
</del><ins>+ void addToFrontend(ConsoleFrontendDispatcher&, InjectedScriptManager&, bool generatePreview);
+ void updateRepeatCountInConsole(ConsoleFrontendDispatcher&);
</ins><span class="cx">
</span><span class="cx"> MessageSource source() const { return m_source; }
</span><span class="cx"> const String& message() const { return m_message; }
</span><span class="lines">@@ -84,9 +84,9 @@
</span><span class="cx"> RefPtr<ScriptArguments> m_arguments;
</span><span class="cx"> RefPtr<ScriptCallStack> m_callStack;
</span><span class="cx"> String m_url;
</span><del>- unsigned m_line;
- unsigned m_column;
- unsigned m_repeatCount;
</del><ins>+ unsigned m_line { 0 };
+ unsigned m_column { 0 };
+ unsigned m_repeatCount { 1 };
</ins><span class="cx"> String m_requestId;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorJSGlobalObjectInspectorControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp (189217 => 189218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp 2015-09-01 17:44:35 UTC (rev 189217)
+++ trunk/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp 2015-09-01 17:52:15 UTC (rev 189218)
</span><span class="lines">@@ -72,9 +72,9 @@
</span><span class="cx"> #endif
</span><span class="cx"> {
</span><span class="cx"> auto inspectorAgent = std::make_unique<InspectorAgent>(*this);
</span><del>- auto runtimeAgent = std::make_unique<JSGlobalObjectRuntimeAgent>(m_injectedScriptManager.get(), m_globalObject);
- auto consoleAgent = std::make_unique<JSGlobalObjectConsoleAgent>(m_injectedScriptManager.get());
- auto debuggerAgent = std::make_unique<JSGlobalObjectDebuggerAgent>(m_injectedScriptManager.get(), m_globalObject, consoleAgent.get());
</del><ins>+ auto runtimeAgent = std::make_unique<JSGlobalObjectRuntimeAgent>(*m_injectedScriptManager, m_globalObject);
+ auto consoleAgent = std::make_unique<JSGlobalObjectConsoleAgent>(*m_injectedScriptManager);
+ auto debuggerAgent = std::make_unique<JSGlobalObjectDebuggerAgent>(*m_injectedScriptManager, m_globalObject, consoleAgent.get());
</ins><span class="cx">
</span><span class="cx"> m_inspectorAgent = inspectorAgent.get();
</span><span class="cx"> m_debuggerAgent = debuggerAgent.get();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorAgent.cpp (189217 => 189218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorAgent.cpp 2015-09-01 17:44:35 UTC (rev 189217)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorAgent.cpp 2015-09-01 17:52:15 UTC (rev 189218)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2007-2010, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2008 Matt Lilek <webkit@mattlilek.com>
</span><span class="cx"> * Copyright (C) 2011 Google Inc. All rights reserved.
</span><span class="cx"> *
</span><span class="lines">@@ -40,7 +40,6 @@
</span><span class="cx"> InspectorAgent::InspectorAgent(InspectorEnvironment& environment)
</span><span class="cx"> : InspectorAgentBase(ASCIILiteral("Inspector"))
</span><span class="cx"> , m_environment(environment)
</span><del>- , m_enabled(false)
</del><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorAgent.h (189217 => 189218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorAgent.h 2015-09-01 17:44:35 UTC (rev 189217)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorAgent.h 2015-09-01 17:52:15 UTC (rev 189218)
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
</span><span class="cx"> RefPtr<Inspector::Protocol::Array<String>> m_pendingExtraDomainsData;
</span><span class="cx"> #endif
</span><del>- bool m_enabled;
</del><ins>+ bool m_enabled { false };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorConsoleAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.cpp (189217 => 189218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.cpp 2015-09-01 17:44:35 UTC (rev 189217)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.cpp 2015-09-01 17:52:15 UTC (rev 189218)
</span><span class="lines">@@ -42,12 +42,9 @@
</span><span class="cx"> static const unsigned maximumConsoleMessages = 1000;
</span><span class="cx"> static const int expireConsoleMessagesStep = 100;
</span><span class="cx">
</span><del>-InspectorConsoleAgent::InspectorConsoleAgent(InjectedScriptManager* injectedScriptManager)
</del><ins>+InspectorConsoleAgent::InspectorConsoleAgent(InjectedScriptManager& injectedScriptManager)
</ins><span class="cx"> : InspectorAgentBase(ASCIILiteral("Console"))
</span><span class="cx"> , m_injectedScriptManager(injectedScriptManager)
</span><del>- , m_previousMessage(nullptr)
- , m_expiredConsoleMessageCount(0)
- , m_enabled(false)
</del><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -79,12 +76,12 @@
</span><span class="cx">
</span><span class="cx"> if (m_expiredConsoleMessageCount) {
</span><span class="cx"> ConsoleMessage expiredMessage(MessageSource::Other, MessageType::Log, MessageLevel::Warning, String::format("%d console messages are not shown.", m_expiredConsoleMessageCount));
</span><del>- expiredMessage.addToFrontend(m_frontendDispatcher.get(), m_injectedScriptManager, false);
</del><ins>+ expiredMessage.addToFrontend(*m_frontendDispatcher, m_injectedScriptManager, false);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> size_t messageCount = m_consoleMessages.size();
</span><span class="cx"> for (size_t i = 0; i < messageCount; ++i)
</span><del>- m_consoleMessages[i]->addToFrontend(m_frontendDispatcher.get(), m_injectedScriptManager, false);
</del><ins>+ m_consoleMessages[i]->addToFrontend(*m_frontendDispatcher, m_injectedScriptManager, false);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorConsoleAgent::disable(ErrorString&)
</span><span class="lines">@@ -101,7 +98,7 @@
</span><span class="cx"> m_expiredConsoleMessageCount = 0;
</span><span class="cx"> m_previousMessage = nullptr;
</span><span class="cx">
</span><del>- m_injectedScriptManager->releaseObjectGroup(ASCIILiteral("console"));
</del><ins>+ m_injectedScriptManager.releaseObjectGroup(ASCIILiteral("console"));
</ins><span class="cx">
</span><span class="cx"> if (m_frontendDispatcher && m_enabled)
</span><span class="cx"> m_frontendDispatcher->messagesCleared();
</span><span class="lines">@@ -118,7 +115,7 @@
</span><span class="cx">
</span><span class="cx"> void InspectorConsoleAgent::addMessageToConsole(std::unique_ptr<ConsoleMessage> message)
</span><span class="cx"> {
</span><del>- if (!m_injectedScriptManager->inspectorEnvironment().developerExtrasEnabled())
</del><ins>+ if (!m_injectedScriptManager.inspectorEnvironment().developerExtrasEnabled())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (message->type() == MessageType::Clear) {
</span><span class="lines">@@ -200,18 +197,18 @@
</span><span class="cx">
</span><span class="cx"> void InspectorConsoleAgent::addConsoleMessage(std::unique_ptr<ConsoleMessage> consoleMessage)
</span><span class="cx"> {
</span><del>- ASSERT(m_injectedScriptManager->inspectorEnvironment().developerExtrasEnabled());
</del><ins>+ ASSERT(m_injectedScriptManager.inspectorEnvironment().developerExtrasEnabled());
</ins><span class="cx"> ASSERT_ARG(consoleMessage, consoleMessage);
</span><span class="cx">
</span><span class="cx"> if (m_previousMessage && !isGroupMessage(m_previousMessage->type()) && m_previousMessage->isEqual(consoleMessage.get())) {
</span><span class="cx"> m_previousMessage->incrementCount();
</span><span class="cx"> if (m_frontendDispatcher && m_enabled)
</span><del>- m_previousMessage->updateRepeatCountInConsole(m_frontendDispatcher.get());
</del><ins>+ m_previousMessage->updateRepeatCountInConsole(*m_frontendDispatcher);
</ins><span class="cx"> } else {
</span><span class="cx"> m_previousMessage = consoleMessage.get();
</span><span class="cx"> m_consoleMessages.append(WTF::move(consoleMessage));
</span><span class="cx"> if (m_frontendDispatcher && m_enabled)
</span><del>- m_previousMessage->addToFrontend(m_frontendDispatcher.get(), m_injectedScriptManager, true);
</del><ins>+ m_previousMessage->addToFrontend(*m_frontendDispatcher, m_injectedScriptManager, true);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!m_frontendDispatcher && m_consoleMessages.size() >= maximumConsoleMessages) {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorConsoleAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.h (189217 => 189218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.h 2015-09-01 17:44:35 UTC (rev 189217)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.h 2015-09-01 17:52:15 UTC (rev 189218)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(InspectorConsoleAgent);
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- InspectorConsoleAgent(InjectedScriptManager*);
</del><ins>+ InspectorConsoleAgent(InjectedScriptManager&);
</ins><span class="cx"> virtual ~InspectorConsoleAgent();
</span><span class="cx">
</span><span class="cx"> virtual void didCreateFrontendAndBackend(FrontendChannel*, BackendDispatcher*) override;
</span><span class="lines">@@ -80,15 +80,15 @@
</span><span class="cx"> protected:
</span><span class="cx"> void addConsoleMessage(std::unique_ptr<ConsoleMessage>);
</span><span class="cx">
</span><del>- InjectedScriptManager* m_injectedScriptManager;
</del><ins>+ InjectedScriptManager& m_injectedScriptManager;
</ins><span class="cx"> std::unique_ptr<ConsoleFrontendDispatcher> m_frontendDispatcher;
</span><span class="cx"> RefPtr<ConsoleBackendDispatcher> m_backendDispatcher;
</span><del>- ConsoleMessage* m_previousMessage;
</del><ins>+ ConsoleMessage* m_previousMessage { nullptr };
</ins><span class="cx"> Vector<std::unique_ptr<ConsoleMessage>> m_consoleMessages;
</span><del>- int m_expiredConsoleMessageCount;
</del><ins>+ int m_expiredConsoleMessageCount { 0 };
</ins><span class="cx"> HashMap<String, unsigned> m_counts;
</span><span class="cx"> HashMap<String, double> m_times;
</span><del>- bool m_enabled;
</del><ins>+ bool m_enabled { false };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorDebuggerAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.cpp (189217 => 189218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.cpp 2015-09-01 17:44:35 UTC (rev 189217)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.cpp 2015-09-01 17:52:15 UTC (rev 189218)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> return makeString(objectGroup, String::number(action.identifier));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-InspectorDebuggerAgent::InspectorDebuggerAgent(InjectedScriptManager* injectedScriptManager)
</del><ins>+InspectorDebuggerAgent::InspectorDebuggerAgent(InjectedScriptManager& injectedScriptManager)
</ins><span class="cx"> : InspectorAgentBase(ASCIILiteral("Debugger"))
</span><span class="cx"> , m_injectedScriptManager(injectedScriptManager)
</span><span class="cx"> , m_continueToLocationBreakpointID(JSC::noBreakpointID)
</span><span class="lines">@@ -382,7 +382,7 @@
</span><span class="cx">
</span><span class="cx"> const BreakpointActions& breakpointActions = scriptDebugServer().getActionsForBreakpoint(breakpointID);
</span><span class="cx"> for (auto& action : breakpointActions)
</span><del>- m_injectedScriptManager->releaseObjectGroup(objectGroupForBreakpointAction(action));
</del><ins>+ m_injectedScriptManager.releaseObjectGroup(objectGroupForBreakpointAction(action));
</ins><span class="cx">
</span><span class="cx"> scriptDebugServer().removeBreakpoint(breakpointID);
</span><span class="cx"> }
</span><span class="lines">@@ -462,7 +462,7 @@
</span><span class="cx">
</span><span class="cx"> void InspectorDebuggerAgent::getFunctionDetails(ErrorString& errorString, const String& functionId, RefPtr<Inspector::Protocol::Debugger::FunctionDetails>& details)
</span><span class="cx"> {
</span><del>- InjectedScript injectedScript = m_injectedScriptManager->injectedScriptForObjectId(functionId);
</del><ins>+ InjectedScript injectedScript = m_injectedScriptManager.injectedScriptForObjectId(functionId);
</ins><span class="cx"> if (injectedScript.hasNoValue()) {
</span><span class="cx"> errorString = ASCIILiteral("Function object id is obsolete");
</span><span class="cx"> return;
</span><span class="lines">@@ -553,7 +553,7 @@
</span><span class="cx">
</span><span class="cx"> void InspectorDebuggerAgent::evaluateOnCallFrame(ErrorString& errorString, const String& callFrameId, const String& expression, const String* const objectGroup, const bool* const includeCommandLineAPI, const bool* const doNotPauseOnExceptionsAndMuteConsole, const bool* const returnByValue, const bool* generatePreview, const bool* saveResult, RefPtr<Inspector::Protocol::Runtime::RemoteObject>& result, Inspector::Protocol::OptOutput<bool>* wasThrown, Inspector::Protocol::OptOutput<int>* savedResultIndex)
</span><span class="cx"> {
</span><del>- InjectedScript injectedScript = m_injectedScriptManager->injectedScriptForObjectId(callFrameId);
</del><ins>+ InjectedScript injectedScript = m_injectedScriptManager.injectedScriptForObjectId(callFrameId);
</ins><span class="cx"> if (injectedScript.hasNoValue()) {
</span><span class="cx"> errorString = ASCIILiteral("Inspected frame has gone");
</span><span class="cx"> return;
</span><span class="lines">@@ -661,7 +661,7 @@
</span><span class="cx"> m_pausedScriptState = scriptState;
</span><span class="cx"> m_currentCallStack = callFrames;
</span><span class="cx">
</span><del>- InjectedScript injectedScript = m_injectedScriptManager->injectedScriptFor(scriptState);
</del><ins>+ InjectedScript injectedScript = m_injectedScriptManager.injectedScriptFor(scriptState);
</ins><span class="cx">
</span><span class="cx"> // If a high level pause pause reason is not already set, try to infer a reason from the debugger.
</span><span class="cx"> if (m_breakReason == DebuggerFrontendDispatcher::Reason::Other) {
</span><span class="lines">@@ -712,7 +712,7 @@
</span><span class="cx"> if (m_listener)
</span><span class="cx"> m_listener->didPause();
</span><span class="cx">
</span><del>- RefPtr<Stopwatch> stopwatch = m_injectedScriptManager->inspectorEnvironment().executionStopwatch();
</del><ins>+ RefPtr<Stopwatch> stopwatch = m_injectedScriptManager.inspectorEnvironment().executionStopwatch();
</ins><span class="cx"> if (stopwatch && stopwatch->isActive()) {
</span><span class="cx"> stopwatch->stop();
</span><span class="cx"> m_didPauseStopwatch = true;
</span><span class="lines">@@ -726,13 +726,13 @@
</span><span class="cx">
</span><span class="cx"> void InspectorDebuggerAgent::breakpointActionProbe(JSC::ExecState* scriptState, const ScriptBreakpointAction& action, unsigned batchId, unsigned sampleId, const Deprecated::ScriptValue& sample)
</span><span class="cx"> {
</span><del>- InjectedScript injectedScript = m_injectedScriptManager->injectedScriptFor(scriptState);
</del><ins>+ InjectedScript injectedScript = m_injectedScriptManager.injectedScriptFor(scriptState);
</ins><span class="cx"> RefPtr<Protocol::Runtime::RemoteObject> payload = injectedScript.wrapObject(sample, objectGroupForBreakpointAction(action), true);
</span><span class="cx"> auto result = Protocol::Debugger::ProbeSample::create()
</span><span class="cx"> .setProbeId(action.identifier)
</span><span class="cx"> .setBatchId(batchId)
</span><span class="cx"> .setSampleId(sampleId)
</span><del>- .setTimestamp(m_injectedScriptManager->inspectorEnvironment().executionStopwatch()->elapsedTime())
</del><ins>+ .setTimestamp(m_injectedScriptManager.inspectorEnvironment().executionStopwatch()->elapsedTime())
</ins><span class="cx"> .setPayload(payload.release())
</span><span class="cx"> .release();
</span><span class="cx">
</span><span class="lines">@@ -743,12 +743,12 @@
</span><span class="cx"> {
</span><span class="cx"> if (m_didPauseStopwatch) {
</span><span class="cx"> m_didPauseStopwatch = false;
</span><del>- m_injectedScriptManager->inspectorEnvironment().executionStopwatch()->start();
</del><ins>+ m_injectedScriptManager.inspectorEnvironment().executionStopwatch()->start();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_pausedScriptState = nullptr;
</span><span class="cx"> m_currentCallStack = Deprecated::ScriptValue();
</span><del>- m_injectedScriptManager->releaseObjectGroup(InspectorDebuggerAgent::backtraceObjectGroup);
</del><ins>+ m_injectedScriptManager.releaseObjectGroup(InspectorDebuggerAgent::backtraceObjectGroup);
</ins><span class="cx"> clearBreakDetails();
</span><span class="cx"> clearExceptionValue();
</span><span class="cx">
</span><span class="lines">@@ -821,7 +821,7 @@
</span><span class="cx"> void InspectorDebuggerAgent::clearExceptionValue()
</span><span class="cx"> {
</span><span class="cx"> if (m_hasExceptionValue) {
</span><del>- m_injectedScriptManager->clearExceptionValue();
</del><ins>+ m_injectedScriptManager.clearExceptionValue();
</ins><span class="cx"> m_hasExceptionValue = false;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorDebuggerAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.h (189217 => 189218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.h 2015-09-01 17:44:35 UTC (rev 189217)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.h 2015-09-01 17:52:15 UTC (rev 189218)
</span><span class="lines">@@ -109,9 +109,9 @@
</span><span class="cx"> virtual ScriptDebugServer& scriptDebugServer() = 0;
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- InspectorDebuggerAgent(InjectedScriptManager*);
</del><ins>+ InspectorDebuggerAgent(InjectedScriptManager&);
</ins><span class="cx">
</span><del>- InjectedScriptManager* injectedScriptManager() const { return m_injectedScriptManager; }
</del><ins>+ InjectedScriptManager& injectedScriptManager() const { return m_injectedScriptManager; }
</ins><span class="cx"> virtual InjectedScript injectedScriptForEval(ErrorString&, const int* executionContextId) = 0;
</span><span class="cx">
</span><span class="cx"> virtual void startListeningScriptDebugServer() = 0;
</span><span class="lines">@@ -154,11 +154,11 @@
</span><span class="cx"> typedef HashMap<String, RefPtr<InspectorObject>> BreakpointIdentifierToBreakpointMap;
</span><span class="cx"> typedef HashMap<JSC::BreakpointID, String> DebugServerBreakpointIDToBreakpointIdentifier;
</span><span class="cx">
</span><del>- InjectedScriptManager* m_injectedScriptManager;
</del><ins>+ InjectedScriptManager& m_injectedScriptManager;
</ins><span class="cx"> std::unique_ptr<DebuggerFrontendDispatcher> m_frontendDispatcher;
</span><span class="cx"> RefPtr<DebuggerBackendDispatcher> m_backendDispatcher;
</span><del>- Listener* m_listener {nullptr};
- JSC::ExecState* m_pausedScriptState {nullptr};
</del><ins>+ Listener* m_listener { nullptr };
+ JSC::ExecState* m_pausedScriptState { nullptr };
</ins><span class="cx"> Deprecated::ScriptValue m_currentCallStack;
</span><span class="cx"> ScriptsMap m_scripts;
</span><span class="cx"> BreakpointIdentifierToDebugServerBreakpointIDsMap m_breakpointIdentifierToDebugServerBreakpointIDs;
</span><span class="lines">@@ -167,10 +167,10 @@
</span><span class="cx"> JSC::BreakpointID m_continueToLocationBreakpointID;
</span><span class="cx"> DebuggerFrontendDispatcher::Reason m_breakReason;
</span><span class="cx"> RefPtr<InspectorObject> m_breakAuxData;
</span><del>- bool m_enabled {false};
- bool m_javaScriptPauseScheduled {false};
- bool m_hasExceptionValue {false};
- bool m_didPauseStopwatch {false};
</del><ins>+ bool m_enabled { false };
+ bool m_javaScriptPauseScheduled { false };
+ bool m_hasExceptionValue { false };
+ bool m_didPauseStopwatch { false };
</ins><span class="cx"> RefPtr<WTF::Stopwatch> m_stopwatch;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorRuntimeAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.cpp (189217 => 189218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.cpp 2015-09-01 17:44:35 UTC (rev 189217)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.cpp 2015-09-01 17:52:15 UTC (rev 189218)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2015 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2011 Google Inc. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -56,12 +56,9 @@
</span><span class="cx"> return b ? *b : false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-InspectorRuntimeAgent::InspectorRuntimeAgent(InjectedScriptManager* injectedScriptManager)
</del><ins>+InspectorRuntimeAgent::InspectorRuntimeAgent(InjectedScriptManager& injectedScriptManager)
</ins><span class="cx"> : InspectorAgentBase(ASCIILiteral("Runtime"))
</span><span class="cx"> , m_injectedScriptManager(injectedScriptManager)
</span><del>- , m_scriptDebugServer(nullptr)
- , m_enabled(false)
- , m_isTypeProfilingEnabled(false)
</del><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -137,7 +134,7 @@
</span><span class="cx">
</span><span class="cx"> void InspectorRuntimeAgent::callFunctionOn(ErrorString& errorString, const String& objectId, const String& expression, const InspectorArray* optionalArguments, const bool* const doNotPauseOnExceptionsAndMuteConsole, const bool* const returnByValue, const bool* generatePreview, RefPtr<Inspector::Protocol::Runtime::RemoteObject>& result, Inspector::Protocol::OptOutput<bool>* wasThrown)
</span><span class="cx"> {
</span><del>- InjectedScript injectedScript = m_injectedScriptManager->injectedScriptForObjectId(objectId);
</del><ins>+ InjectedScript injectedScript = m_injectedScriptManager.injectedScriptForObjectId(objectId);
</ins><span class="cx"> if (injectedScript.hasNoValue()) {
</span><span class="cx"> errorString = ASCIILiteral("Inspected frame has gone");
</span><span class="cx"> return;
</span><span class="lines">@@ -163,7 +160,7 @@
</span><span class="cx">
</span><span class="cx"> void InspectorRuntimeAgent::getProperties(ErrorString& errorString, const String& objectId, const bool* const ownProperties, const bool* const generatePreview, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::PropertyDescriptor>>& result, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::InternalPropertyDescriptor>>& internalProperties)
</span><span class="cx"> {
</span><del>- InjectedScript injectedScript = m_injectedScriptManager->injectedScriptForObjectId(objectId);
</del><ins>+ InjectedScript injectedScript = m_injectedScriptManager.injectedScriptForObjectId(objectId);
</ins><span class="cx"> if (injectedScript.hasNoValue()) {
</span><span class="cx"> errorString = ASCIILiteral("Inspected frame has gone");
</span><span class="cx"> return;
</span><span class="lines">@@ -181,7 +178,7 @@
</span><span class="cx">
</span><span class="cx"> void InspectorRuntimeAgent::getDisplayableProperties(ErrorString& errorString, const String& objectId, const bool* const generatePreview, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::PropertyDescriptor>>& result, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::InternalPropertyDescriptor>>& internalProperties)
</span><span class="cx"> {
</span><del>- InjectedScript injectedScript = m_injectedScriptManager->injectedScriptForObjectId(objectId);
</del><ins>+ InjectedScript injectedScript = m_injectedScriptManager.injectedScriptForObjectId(objectId);
</ins><span class="cx"> if (injectedScript.hasNoValue()) {
</span><span class="cx"> errorString = ASCIILiteral("Inspected frame has gone");
</span><span class="cx"> return;
</span><span class="lines">@@ -199,7 +196,7 @@
</span><span class="cx">
</span><span class="cx"> void InspectorRuntimeAgent::getCollectionEntries(ErrorString& errorString, const String& objectId, const String* objectGroup, const int* startIndex, const int* numberToFetch, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::CollectionEntry>>& entries)
</span><span class="cx"> {
</span><del>- InjectedScript injectedScript = m_injectedScriptManager->injectedScriptForObjectId(objectId);
</del><ins>+ InjectedScript injectedScript = m_injectedScriptManager.injectedScriptForObjectId(objectId);
</ins><span class="cx"> if (injectedScript.hasNoValue()) {
</span><span class="cx"> errorString = ASCIILiteral("Inspected frame has gone");
</span><span class="cx"> return;
</span><span class="lines">@@ -217,7 +214,7 @@
</span><span class="cx">
</span><span class="cx"> String objectId;
</span><span class="cx"> if (callArgument.getString(ASCIILiteral("objectId"), objectId)) {
</span><del>- injectedScript = m_injectedScriptManager->injectedScriptForObjectId(objectId);
</del><ins>+ injectedScript = m_injectedScriptManager.injectedScriptForObjectId(objectId);
</ins><span class="cx"> if (injectedScript.hasNoValue()) {
</span><span class="cx"> errorString = ASCIILiteral("Inspected frame has gone");
</span><span class="cx"> return;
</span><span class="lines">@@ -233,14 +230,14 @@
</span><span class="cx">
</span><span class="cx"> void InspectorRuntimeAgent::releaseObject(ErrorString&, const String& objectId)
</span><span class="cx"> {
</span><del>- InjectedScript injectedScript = m_injectedScriptManager->injectedScriptForObjectId(objectId);
</del><ins>+ InjectedScript injectedScript = m_injectedScriptManager.injectedScriptForObjectId(objectId);
</ins><span class="cx"> if (!injectedScript.hasNoValue())
</span><span class="cx"> injectedScript.releaseObject(objectId);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorRuntimeAgent::releaseObjectGroup(ErrorString&, const String& objectGroup)
</span><span class="cx"> {
</span><del>- m_injectedScriptManager->releaseObjectGroup(objectGroup);
</del><ins>+ m_injectedScriptManager.releaseObjectGroup(objectGroup);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorRuntimeAgent::run(ErrorString&)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorRuntimeAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.h (189217 => 189218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.h 2015-09-01 17:44:35 UTC (rev 189217)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.h 2015-09-01 17:52:15 UTC (rev 189218)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2011 Google Inc. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -79,9 +79,9 @@
</span><span class="cx"> bool enabled() const { return m_enabled; }
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- InspectorRuntimeAgent(InjectedScriptManager*);
</del><ins>+ InspectorRuntimeAgent(InjectedScriptManager&);
</ins><span class="cx">
</span><del>- InjectedScriptManager* injectedScriptManager() { return m_injectedScriptManager; }
</del><ins>+ InjectedScriptManager& injectedScriptManager() { return m_injectedScriptManager; }
</ins><span class="cx">
</span><span class="cx"> virtual JSC::VM& globalVM() = 0;
</span><span class="cx"> virtual InjectedScript injectedScriptForEval(ErrorString&, const int* executionContextId) = 0;
</span><span class="lines">@@ -92,10 +92,10 @@
</span><span class="cx"> private:
</span><span class="cx"> void setTypeProfilerEnabledState(bool);
</span><span class="cx">
</span><del>- InjectedScriptManager* m_injectedScriptManager;
- ScriptDebugServer* m_scriptDebugServer;
- bool m_enabled;
- bool m_isTypeProfilingEnabled;
</del><ins>+ InjectedScriptManager& m_injectedScriptManager;
+ ScriptDebugServer* m_scriptDebugServer { nullptr };
+ bool m_enabled { false };
+ bool m_isTypeProfilingEnabled { false };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsJSGlobalObjectConsoleAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectConsoleAgent.cpp (189217 => 189218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectConsoleAgent.cpp 2015-09-01 17:44:35 UTC (rev 189217)
+++ trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectConsoleAgent.cpp 2015-09-01 17:52:15 UTC (rev 189218)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2014, 2015 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">@@ -28,7 +28,7 @@
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><del>-JSGlobalObjectConsoleAgent::JSGlobalObjectConsoleAgent(InjectedScriptManager* injectedScriptManager)
</del><ins>+JSGlobalObjectConsoleAgent::JSGlobalObjectConsoleAgent(InjectedScriptManager& injectedScriptManager)
</ins><span class="cx"> : InspectorConsoleAgent(injectedScriptManager)
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsJSGlobalObjectConsoleAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectConsoleAgent.h (189217 => 189218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectConsoleAgent.h 2015-09-01 17:44:35 UTC (rev 189217)
+++ trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectConsoleAgent.h 2015-09-01 17:52:15 UTC (rev 189218)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2014, 2015 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">@@ -35,7 +35,7 @@
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(JSGlobalObjectConsoleAgent);
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- JSGlobalObjectConsoleAgent(InjectedScriptManager*);
</del><ins>+ JSGlobalObjectConsoleAgent(InjectedScriptManager&);
</ins><span class="cx"> virtual ~JSGlobalObjectConsoleAgent() { }
</span><span class="cx">
</span><span class="cx"> // FIXME: XHRs and Nodes only makes sense debugging a Web context. Can this be moved to a different agent?
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsJSGlobalObjectDebuggerAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectDebuggerAgent.cpp (189217 => 189218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectDebuggerAgent.cpp 2015-09-01 17:44:35 UTC (rev 189217)
+++ trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectDebuggerAgent.cpp 2015-09-01 17:52:15 UTC (rev 189218)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2014, 2015 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">@@ -38,7 +38,7 @@
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><del>-JSGlobalObjectDebuggerAgent::JSGlobalObjectDebuggerAgent(InjectedScriptManager* injectedScriptManager, JSC::JSGlobalObject& globalObject, InspectorConsoleAgent* consoleAgent)
</del><ins>+JSGlobalObjectDebuggerAgent::JSGlobalObjectDebuggerAgent(InjectedScriptManager& injectedScriptManager, JSC::JSGlobalObject& globalObject, InspectorConsoleAgent* consoleAgent)
</ins><span class="cx"> : InspectorDebuggerAgent(injectedScriptManager)
</span><span class="cx"> , m_scriptDebugServer(globalObject)
</span><span class="cx"> , m_consoleAgent(consoleAgent)
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ExecState* exec = m_scriptDebugServer.globalObject().globalExec();
</span><del>- return injectedScriptManager()->injectedScriptFor(exec);
</del><ins>+ return injectedScriptManager().injectedScriptFor(exec);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JSGlobalObjectDebuggerAgent::breakpointActionLog(JSC::ExecState* exec, const String& message)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsJSGlobalObjectDebuggerAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectDebuggerAgent.h (189217 => 189218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectDebuggerAgent.h 2015-09-01 17:44:35 UTC (rev 189217)
+++ trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectDebuggerAgent.h 2015-09-01 17:52:15 UTC (rev 189218)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2014, 2015 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">@@ -37,7 +37,7 @@
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(JSGlobalObjectDebuggerAgent);
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- JSGlobalObjectDebuggerAgent(InjectedScriptManager*, JSC::JSGlobalObject&, InspectorConsoleAgent*);
</del><ins>+ JSGlobalObjectDebuggerAgent(InjectedScriptManager&, JSC::JSGlobalObject&, InspectorConsoleAgent*);
</ins><span class="cx"> virtual ~JSGlobalObjectDebuggerAgent() { }
</span><span class="cx">
</span><span class="cx"> virtual JSGlobalObjectScriptDebugServer& scriptDebugServer() override { return m_scriptDebugServer; }
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> JSGlobalObjectScriptDebugServer m_scriptDebugServer;
</span><del>- InspectorConsoleAgent* m_consoleAgent;
</del><ins>+ InspectorConsoleAgent* m_consoleAgent { nullptr };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsJSGlobalObjectRuntimeAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectRuntimeAgent.cpp (189217 => 189218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectRuntimeAgent.cpp 2015-09-01 17:44:35 UTC (rev 189217)
+++ trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectRuntimeAgent.cpp 2015-09-01 17:52:15 UTC (rev 189218)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><del>-JSGlobalObjectRuntimeAgent::JSGlobalObjectRuntimeAgent(InjectedScriptManager* injectedScriptManager, JSGlobalObject& globalObject)
</del><ins>+JSGlobalObjectRuntimeAgent::JSGlobalObjectRuntimeAgent(InjectedScriptManager& injectedScriptManager, JSGlobalObject& globalObject)
</ins><span class="cx"> : InspectorRuntimeAgent(injectedScriptManager)
</span><span class="cx"> , m_globalObject(globalObject)
</span><span class="cx"> {
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> ASSERT_UNUSED(executionContextId, !executionContextId);
</span><span class="cx">
</span><span class="cx"> JSC::ExecState* scriptState = m_globalObject.globalExec();
</span><del>- InjectedScript injectedScript = injectedScriptManager()->injectedScriptFor(scriptState);
</del><ins>+ InjectedScript injectedScript = injectedScriptManager().injectedScriptFor(scriptState);
</ins><span class="cx"> if (injectedScript.hasNoValue())
</span><span class="cx"> errorString = ASCIILiteral("Internal error: main world execution context not found.");
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsJSGlobalObjectRuntimeAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectRuntimeAgent.h (189217 => 189218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectRuntimeAgent.h 2015-09-01 17:44:35 UTC (rev 189217)
+++ trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectRuntimeAgent.h 2015-09-01 17:52:15 UTC (rev 189218)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx">
</span><span class="cx"> class JSGlobalObjectRuntimeAgent final : public InspectorRuntimeAgent {
</span><span class="cx"> public:
</span><del>- JSGlobalObjectRuntimeAgent(InjectedScriptManager*, JSC::JSGlobalObject&);
</del><ins>+ JSGlobalObjectRuntimeAgent(InjectedScriptManager&, JSC::JSGlobalObject&);
</ins><span class="cx">
</span><span class="cx"> virtual void didCreateFrontendAndBackend(FrontendChannel*, BackendDispatcher*) override;
</span><span class="cx"> virtual void willDestroyFrontendAndBackend(DisconnectReason) override;
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (189217 => 189218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-09-01 17:44:35 UTC (rev 189217)
+++ trunk/Source/WebCore/ChangeLog 2015-09-01 17:52:15 UTC (rev 189218)
</span><span class="lines">@@ -1,3 +1,181 @@
</span><ins>+2015-09-01 Brian Burg <bburg@apple.com>
+
+ Web Inspector: tighten up lifetimes for InspectorController-owned objects; add brace initializers to agents
+ https://bugs.webkit.org/show_bug.cgi?id=148612
+
+ Reviewed by Joseph Pecoraro.
+
+ Both InjectedScriptManager and AgentRegistry (thus all agents) are
+ owned by [Worker]InspectorController. So, use references.
+
+ InstrumentingAgents is morally owned by InspectorController as well, but
+ must be a Ref for now since instrumentation cookies take a strong reference.
+
+ Add brace initalizers for scalar and pointer members in agent classes.
+
+ No new tests, no behavior change.
+
+ * inspector/InspectorApplicationCacheAgent.cpp:
+ (WebCore::InspectorApplicationCacheAgent::InspectorApplicationCacheAgent):
+ (WebCore::InspectorApplicationCacheAgent::willDestroyFrontendAndBackend):
+ (WebCore::InspectorApplicationCacheAgent::enable):
+ * inspector/InspectorApplicationCacheAgent.h:
+ * inspector/InspectorCSSAgent.cpp:
+ (WebCore::InspectorCSSAgent::InspectorCSSAgent):
+ (WebCore::InspectorCSSAgent::enable):
+ (WebCore::InspectorCSSAgent::disable):
+ * inspector/InspectorCSSAgent.h:
+ * inspector/InspectorConsoleInstrumentation.h:
+ (WebCore::InspectorInstrumentation::addMessageToConsole):
+ (WebCore::InspectorInstrumentation::consoleCount):
+ (WebCore::InspectorInstrumentation::startProfiling):
+ (WebCore::InspectorInstrumentation::stopProfiling):
+ * inspector/InspectorController.cpp:
+ (WebCore::InspectorController::InspectorController):
+ (WebCore::InspectorController::connectFrontend):
+ (WebCore::InspectorController::disconnectFrontend):
+ (WebCore::InspectorController::disconnectAllFrontends):
+ * inspector/InspectorController.h:
+ * inspector/InspectorDOMAgent.cpp:
+ (WebCore::InspectorDOMAgent::InspectorDOMAgent):
+ (WebCore::InspectorDOMAgent::didCreateFrontendAndBackend):
+ (WebCore::InspectorDOMAgent::willDestroyFrontendAndBackend):
+ (WebCore::InspectorDOMAgent::focusNode):
+ (WebCore::InspectorDOMAgent::buildObjectForEventListener):
+ (WebCore::InspectorDOMAgent::nodeForObjectId):
+ (WebCore::InspectorDOMAgent::resolveNode):
+ * inspector/InspectorDOMAgent.h:
+ * inspector/InspectorDOMDebuggerAgent.cpp:
+ (WebCore::InspectorDOMDebuggerAgent::InspectorDOMDebuggerAgent):
+ (WebCore::InspectorDOMDebuggerAgent::~InspectorDOMDebuggerAgent):
+ (WebCore::InspectorDOMDebuggerAgent::debuggerWasEnabled):
+ (WebCore::InspectorDOMDebuggerAgent::disable):
+ * inspector/InspectorDOMDebuggerAgent.h:
+ * inspector/InspectorDOMStorageAgent.cpp:
+ (WebCore::InspectorDOMStorageAgent::InspectorDOMStorageAgent):
+ (WebCore::InspectorDOMStorageAgent::~InspectorDOMStorageAgent):
+ * inspector/InspectorDOMStorageAgent.h:
+ * inspector/InspectorDatabaseAgent.cpp:
+ (WebCore::InspectorDatabaseAgent::InspectorDatabaseAgent):
+ (WebCore::InspectorDatabaseAgent::~InspectorDatabaseAgent):
+ * inspector/InspectorDatabaseAgent.h:
+ * inspector/InspectorIndexedDBAgent.cpp:
+ (WebCore::InspectorIndexedDBAgent::InspectorIndexedDBAgent):
+ (WebCore::InspectorIndexedDBAgent::requestData):
+ * inspector/InspectorIndexedDBAgent.h:
+ * inspector/InspectorInstrumentation.cpp:
+ (WebCore::InspectorInstrumentation::instrumentingAgentsForPage):
+ (WebCore::InspectorInstrumentation::instrumentingAgentsForWorkerGlobalScope):
+ * inspector/InspectorInstrumentation.h:
+ (WebCore::InspectorInstrumentation::mouseDidMoveOverElement):
+ (WebCore::InspectorInstrumentation::scriptsEnabled):
+ (WebCore::InspectorInstrumentation::didScroll):
+ (WebCore::InspectorInstrumentation::markResourceAsCached):
+ (WebCore::InspectorInstrumentation::didLoadResourceFromMemoryCache):
+ (WebCore::InspectorInstrumentation::willRunJavaScriptDialog):
+ (WebCore::InspectorInstrumentation::sessionCreated):
+ (WebCore::InspectorInstrumentation::sessionLoaded):
+ (WebCore::InspectorInstrumentation::sessionModified):
+ (WebCore::InspectorInstrumentation::segmentCreated):
+ (WebCore::InspectorInstrumentation::segmentCompleted):
+ (WebCore::InspectorInstrumentation::segmentLoaded):
+ (WebCore::InspectorInstrumentation::segmentUnloaded):
+ (WebCore::InspectorInstrumentation::captureStarted):
+ (WebCore::InspectorInstrumentation::captureStopped):
+ (WebCore::InspectorInstrumentation::playbackStarted):
+ (WebCore::InspectorInstrumentation::playbackPaused):
+ (WebCore::InspectorInstrumentation::playbackFinished):
+ (WebCore::InspectorInstrumentation::playbackHitPosition):
+ * inspector/InspectorLayerTreeAgent.cpp:
+ (WebCore::InspectorLayerTreeAgent::InspectorLayerTreeAgent):
+ (WebCore::InspectorLayerTreeAgent::enable):
+ (WebCore::InspectorLayerTreeAgent::disable):
+ (WebCore::InspectorLayerTreeAgent::layersForNode):
+ (WebCore::InspectorLayerTreeAgent::idForNode):
+ * inspector/InspectorLayerTreeAgent.h:
+ * inspector/InspectorPageAgent.cpp:
+ (WebCore::InspectorPageAgent::InspectorPageAgent):
+ (WebCore::InspectorPageAgent::timestamp):
+ (WebCore::InspectorPageAgent::enable):
+ (WebCore::InspectorPageAgent::disable):
+ (WebCore::InspectorPageAgent::frameStartedLoading):
+ (WebCore::InspectorPageAgent::snapshotNode):
+ * inspector/InspectorPageAgent.h:
+ * inspector/InspectorReplayAgent.cpp:
+ (WebCore::InspectorReplayAgent::InspectorReplayAgent):
+ (WebCore::InspectorReplayAgent::didCreateFrontendAndBackend):
+ (WebCore::InspectorReplayAgent::willDestroyFrontendAndBackend):
+ * inspector/InspectorReplayAgent.h:
+ * inspector/InspectorResourceAgent.cpp:
+ (WebCore::InspectorResourceAgent::InspectorResourceAgent):
+ (WebCore::InspectorResourceAgent::~InspectorResourceAgent):
+ (WebCore::InspectorResourceAgent::timestamp):
+ (WebCore::InspectorResourceAgent::enable):
+ (WebCore::InspectorResourceAgent::disable):
+ * inspector/InspectorResourceAgent.h:
+ * inspector/InspectorTimelineAgent.cpp:
+ (WebCore::InspectorTimelineAgent::didCreateFrontendAndBackend):
+ (WebCore::InspectorTimelineAgent::willDestroyFrontendAndBackend):
+ (WebCore::InspectorTimelineAgent::internalStart):
+ (WebCore::InspectorTimelineAgent::internalStop):
+ (WebCore::InspectorTimelineAgent::timestamp):
+ (WebCore::InspectorTimelineAgent::startFromConsole):
+ (WebCore::InspectorTimelineAgent::willCallFunction):
+ (WebCore::InspectorTimelineAgent::willEvaluateScript):
+ (WebCore::InspectorTimelineAgent::InspectorTimelineAgent):
+ * inspector/InspectorTimelineAgent.h:
+ * inspector/InspectorWebAgentBase.h:
+ (WebCore::InspectorAgentBase::InspectorAgentBase):
+ * inspector/InspectorWorkerAgent.cpp:
+ (WebCore::InspectorWorkerAgent::InspectorWorkerAgent):
+ (WebCore::InspectorWorkerAgent::~InspectorWorkerAgent):
+ * inspector/InspectorWorkerAgent.h:
+ * inspector/InstrumentingAgents.cpp:
+ (WebCore::InstrumentingAgents::InstrumentingAgents): Deleted.
+ * inspector/InstrumentingAgents.h:
+ (WebCore::InstrumentingAgents::create):
+ * inspector/PageConsoleAgent.cpp:
+ (WebCore::PageConsoleAgent::PageConsoleAgent):
+ (WebCore::PageConsoleAgent::addInspectedNode):
+ * inspector/PageConsoleAgent.h:
+ * inspector/PageDebuggerAgent.cpp:
+ (WebCore::PageDebuggerAgent::PageDebuggerAgent):
+ (WebCore::PageDebuggerAgent::enable):
+ (WebCore::PageDebuggerAgent::disable):
+ (WebCore::PageDebuggerAgent::injectedScriptForEval):
+ * inspector/PageDebuggerAgent.h:
+ * inspector/PageRuntimeAgent.cpp:
+ (WebCore::PageRuntimeAgent::PageRuntimeAgent):
+ (WebCore::PageRuntimeAgent::injectedScriptForEval):
+ (WebCore::PageRuntimeAgent::notifyContextCreated):
+ * inspector/PageRuntimeAgent.h:
+ * inspector/WebConsoleAgent.cpp:
+ (WebCore::WebConsoleAgent::WebConsoleAgent):
+ (WebCore::WebConsoleAgent::frameWindowDiscarded):
+ (WebCore::WebConsoleAgent::didFinishXHRLoading):
+ (WebCore::WebConsoleAgent::didReceiveResponse):
+ (WebCore::WebConsoleAgent::didFailLoading):
+ * inspector/WebConsoleAgent.h:
+ * inspector/WebDebuggerAgent.cpp:
+ (WebCore::WebDebuggerAgent::WebDebuggerAgent):
+ (WebCore::WebDebuggerAgent::enable):
+ (WebCore::WebDebuggerAgent::disable):
+ * inspector/WebDebuggerAgent.h:
+ * inspector/WorkerConsoleAgent.cpp:
+ (WebCore::WorkerConsoleAgent::WorkerConsoleAgent):
+ * inspector/WorkerConsoleAgent.h:
+ * inspector/WorkerDebuggerAgent.cpp:
+ (WebCore::WorkerDebuggerAgent::WorkerDebuggerAgent):
+ (WebCore::WorkerDebuggerAgent::injectedScriptForEval):
+ * inspector/WorkerDebuggerAgent.h:
+ * inspector/WorkerInspectorController.cpp:
+ (WebCore::WorkerInspectorController::WorkerInspectorController):
+ * inspector/WorkerInspectorController.h:
+ * inspector/WorkerRuntimeAgent.cpp:
+ (WebCore::WorkerRuntimeAgent::WorkerRuntimeAgent):
+ (WebCore::WorkerRuntimeAgent::injectedScriptForEval):
+ * inspector/WorkerRuntimeAgent.h:
+
</ins><span class="cx"> 2015-09-01 Jinyoung Hur <hur.ims@navercorp.com>
</span><span class="cx">
</span><span class="cx"> [Cairo][WebGL] Upload the accelerated canvas as a texture by copying via GPU directly
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorApplicationCacheAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorApplicationCacheAgent.cpp (189217 => 189218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorApplicationCacheAgent.cpp 2015-09-01 17:44:35 UTC (rev 189217)
+++ trunk/Source/WebCore/inspector/InspectorApplicationCacheAgent.cpp 2015-09-01 17:52:15 UTC (rev 189218)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-InspectorApplicationCacheAgent::InspectorApplicationCacheAgent(InstrumentingAgents* instrumentingAgents, InspectorPageAgent* pageAgent)
</del><ins>+InspectorApplicationCacheAgent::InspectorApplicationCacheAgent(InstrumentingAgents& instrumentingAgents, InspectorPageAgent* pageAgent)
</ins><span class="cx"> : InspectorAgentBase(ASCIILiteral("ApplicationCache"), instrumentingAgents)
</span><span class="cx"> , m_pageAgent(pageAgent)
</span><span class="cx"> {
</span><span class="lines">@@ -60,12 +60,12 @@
</span><span class="cx"> m_frontendDispatcher = nullptr;
</span><span class="cx"> m_backendDispatcher = nullptr;
</span><span class="cx">
</span><del>- m_instrumentingAgents->setInspectorApplicationCacheAgent(nullptr);
</del><ins>+ m_instrumentingAgents.setInspectorApplicationCacheAgent(nullptr);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorApplicationCacheAgent::enable(ErrorString&)
</span><span class="cx"> {
</span><del>- m_instrumentingAgents->setInspectorApplicationCacheAgent(this);
</del><ins>+ m_instrumentingAgents.setInspectorApplicationCacheAgent(this);
</ins><span class="cx">
</span><span class="cx"> // We need to pass initial navigator.onOnline.
</span><span class="cx"> networkStateChanged();
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorApplicationCacheAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorApplicationCacheAgent.h (189217 => 189218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorApplicationCacheAgent.h 2015-09-01 17:44:35 UTC (rev 189217)
+++ trunk/Source/WebCore/inspector/InspectorApplicationCacheAgent.h 2015-09-01 17:52:15 UTC (rev 189218)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> class InspectorApplicationCacheAgent final : public InspectorAgentBase, public Inspector::ApplicationCacheBackendDispatcherHandler {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(InspectorApplicationCacheAgent); WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- InspectorApplicationCacheAgent(InstrumentingAgents*, InspectorPageAgent*);
</del><ins>+ InspectorApplicationCacheAgent(InstrumentingAgents&, InspectorPageAgent*);
</ins><span class="cx"> virtual ~InspectorApplicationCacheAgent() { }
</span><span class="cx">
</span><span class="cx"> virtual void didCreateFrontendAndBackend(Inspector::FrontendChannel*, Inspector::BackendDispatcher*) override;
</span><span class="lines">@@ -71,9 +71,9 @@
</span><span class="cx">
</span><span class="cx"> DocumentLoader* assertFrameWithDocumentLoader(ErrorString&, const String& frameId);
</span><span class="cx">
</span><del>- InspectorPageAgent* m_pageAgent;
</del><span class="cx"> std::unique_ptr<Inspector::ApplicationCacheFrontendDispatcher> m_frontendDispatcher;
</span><span class="cx"> RefPtr<Inspector::ApplicationCacheBackendDispatcher> m_backendDispatcher;
</span><ins>+ InspectorPageAgent* m_pageAgent { nullptr };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorCSSAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorCSSAgent.cpp (189217 => 189218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorCSSAgent.cpp 2015-09-01 17:44:35 UTC (rev 189217)
+++ trunk/Source/WebCore/inspector/InspectorCSSAgent.cpp 2015-09-01 17:52:15 UTC (rev 189218)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2010, Google Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2010 Google Inc. All rights reserved.
+ * Copyright (C) 2015 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">@@ -340,10 +341,9 @@
</span><span class="cx"> return downcast<CSSStyleRule>(&rule);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-InspectorCSSAgent::InspectorCSSAgent(InstrumentingAgents* instrumentingAgents, InspectorDOMAgent* domAgent)
</del><ins>+InspectorCSSAgent::InspectorCSSAgent(InstrumentingAgents& instrumentingAgents, InspectorDOMAgent* domAgent)
</ins><span class="cx"> : InspectorAgentBase(ASCIILiteral("CSS"), instrumentingAgents)
</span><span class="cx"> , m_domAgent(domAgent)
</span><del>- , m_lastStyleSheetId(1)
</del><span class="cx"> {
</span><span class="cx"> m_domAgent->setDOMListener(this);
</span><span class="cx"> }
</span><span class="lines">@@ -395,7 +395,7 @@
</span><span class="cx">
</span><span class="cx"> void InspectorCSSAgent::enable(ErrorString&)
</span><span class="cx"> {
</span><del>- m_instrumentingAgents->setInspectorCSSAgent(this);
</del><ins>+ m_instrumentingAgents.setInspectorCSSAgent(this);
</ins><span class="cx">
</span><span class="cx"> for (auto* document : m_domAgent->documents())
</span><span class="cx"> activeStyleSheetsUpdated(*document);
</span><span class="lines">@@ -403,7 +403,7 @@
</span><span class="cx">
</span><span class="cx"> void InspectorCSSAgent::disable(ErrorString&)
</span><span class="cx"> {
</span><del>- m_instrumentingAgents->setInspectorCSSAgent(nullptr);
</del><ins>+ m_instrumentingAgents.setInspectorCSSAgent(nullptr);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorCSSAgent::documentDetached(Document& document)
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorCSSAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorCSSAgent.h (189217 => 189218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorCSSAgent.h 2015-09-01 17:44:35 UTC (rev 189217)
+++ trunk/Source/WebCore/inspector/InspectorCSSAgent.h 2015-09-01 17:52:15 UTC (rev 189218)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2010, Google Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2010 Google Inc. All rights reserved.
+ * Copyright (C) 2015 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">@@ -81,7 +82,7 @@
</span><span class="cx"> ContentSecurityPolicy* m_contentSecurityPolicy;
</span><span class="cx"> };
</span><span class="cx">
</span><del>- InspectorCSSAgent(InstrumentingAgents*, InspectorDOMAgent*);
</del><ins>+ InspectorCSSAgent(InstrumentingAgents&, InspectorDOMAgent*);
</ins><span class="cx"> virtual ~InspectorCSSAgent();
</span><span class="cx">
</span><span class="cx"> static CSSStyleRule* asCSSStyleRule(CSSRule&);
</span><span class="lines">@@ -169,7 +170,7 @@
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<Inspector::CSSFrontendDispatcher> m_frontendDispatcher;
</span><span class="cx"> RefPtr<Inspector::CSSBackendDispatcher> m_backendDispatcher;
</span><del>- InspectorDOMAgent* m_domAgent;
</del><ins>+ InspectorDOMAgent* m_domAgent { nullptr };
</ins><span class="cx">
</span><span class="cx"> IdToInspectorStyleSheet m_idToInspectorStyleSheet;
</span><span class="cx"> CSSStyleSheetToInspectorStyleSheet m_cssStyleSheetToInspectorStyleSheet;
</span><span class="lines">@@ -180,7 +181,7 @@
</span><span class="cx"> HashSet<int> m_namedFlowCollectionsRequested;
</span><span class="cx"> std::unique_ptr<ChangeRegionOversetTask> m_changeRegionOversetTask;
</span><span class="cx">
</span><del>- int m_lastStyleSheetId;
</del><ins>+ int m_lastStyleSheetId { 1 };
</ins><span class="cx"> bool m_creatingViaInspectorStyleSheet { false };
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorConsoleInstrumentationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorConsoleInstrumentation.h (189217 => 189218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorConsoleInstrumentation.h 2015-09-01 17:44:35 UTC (rev 189217)
+++ trunk/Source/WebCore/inspector/InspectorConsoleInstrumentation.h 2015-09-01 17:52:15 UTC (rev 189218)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2011 Google Inc. All rights reserved.
</span><ins>+* Copyright (C) 2015 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 are
</span><span class="lines">@@ -40,8 +41,7 @@
</span><span class="cx">
</span><span class="cx"> inline void InspectorInstrumentation::addMessageToConsole(Page& page, std::unique_ptr<Inspector::ConsoleMessage> message)
</span><span class="cx"> {
</span><del>- if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForPage(page))
- addMessageToConsoleImpl(*instrumentingAgents, WTF::move(message));
</del><ins>+ addMessageToConsoleImpl(instrumentingAgentsForPage(page), WTF::move(message));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline void InspectorInstrumentation::addMessageToConsole(WorkerGlobalScope* workerGlobalScope, std::unique_ptr<Inspector::ConsoleMessage> message)
</span><span class="lines">@@ -52,8 +52,7 @@
</span><span class="cx">
</span><span class="cx"> inline void InspectorInstrumentation::consoleCount(Page& page, JSC::ExecState* state, RefPtr<Inspector::ScriptArguments>&& arguments)
</span><span class="cx"> {
</span><del>- if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForPage(page))
- consoleCountImpl(*instrumentingAgents, state, WTF::move(arguments));
</del><ins>+ consoleCountImpl(instrumentingAgentsForPage(page), state, WTF::move(arguments));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline void InspectorInstrumentation::startConsoleTiming(Frame& frame, const String& title)
</span><span class="lines">@@ -77,15 +76,12 @@
</span><span class="cx">
</span><span class="cx"> inline void InspectorInstrumentation::startProfiling(Page& page, JSC::ExecState* exec, const String &title)
</span><span class="cx"> {
</span><del>- if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForPage(page))
- startProfilingImpl(*instrumentingAgents, exec, title);
</del><ins>+ startProfilingImpl(instrumentingAgentsForPage(page), exec, title);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline RefPtr<JSC::Profile> InspectorInstrumentation::stopProfiling(Page& page, JSC::ExecState* exec, const String &title)
</span><span class="cx"> {
</span><del>- if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForPage(page))
- return stopProfilingImpl(*instrumentingAgents, exec, title);
- return nullptr;
</del><ins>+ return stopProfilingImpl(instrumentingAgentsForPage(page), exec, title);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorController.cpp (189217 => 189218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorController.cpp 2015-09-01 17:44:35 UTC (rev 189217)
+++ trunk/Source/WebCore/inspector/InspectorController.cpp 2015-09-01 17:52:15 UTC (rev 189218)
</span><span class="lines">@@ -102,12 +102,12 @@
</span><span class="cx"> m_pageAgent = pageAgentPtr.get();
</span><span class="cx"> m_agents.append(WTF::move(pageAgentPtr));
</span><span class="cx">
</span><del>- auto runtimeAgentPtr = std::make_unique<PageRuntimeAgent>(m_injectedScriptManager.get(), &page, pageAgent);
</del><ins>+ auto runtimeAgentPtr = std::make_unique<PageRuntimeAgent>(*m_injectedScriptManager, &page, pageAgent);
</ins><span class="cx"> PageRuntimeAgent* runtimeAgent = runtimeAgentPtr.get();
</span><span class="cx"> m_instrumentingAgents->setPageRuntimeAgent(runtimeAgent);
</span><span class="cx"> m_agents.append(WTF::move(runtimeAgentPtr));
</span><span class="cx">
</span><del>- auto domAgentPtr = std::make_unique<InspectorDOMAgent>(m_instrumentingAgents.get(), pageAgent, m_injectedScriptManager.get(), m_overlay.get());
</del><ins>+ auto domAgentPtr = std::make_unique<InspectorDOMAgent>(m_instrumentingAgents.get(), pageAgent, *m_injectedScriptManager, m_overlay.get());
</ins><span class="cx"> m_domAgent = domAgentPtr.get();
</span><span class="cx"> m_agents.append(WTF::move(domAgentPtr));
</span><span class="cx">
</span><span class="lines">@@ -118,7 +118,7 @@
</span><span class="cx"> m_agents.append(WTF::move(databaseAgentPtr));
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INDEXED_DATABASE)
</span><del>- m_agents.append(std::make_unique<InspectorIndexedDBAgent>(m_instrumentingAgents.get(), m_injectedScriptManager.get(), pageAgent));
</del><ins>+ m_agents.append(std::make_unique<InspectorIndexedDBAgent>(m_instrumentingAgents.get(), *m_injectedScriptManager, pageAgent));
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_REPLAY)
</span><span class="lines">@@ -137,12 +137,12 @@
</span><span class="cx"> m_resourceAgent = resourceAgentPtr.get();
</span><span class="cx"> m_agents.append(WTF::move(resourceAgentPtr));
</span><span class="cx">
</span><del>- auto consoleAgentPtr = std::make_unique<PageConsoleAgent>(m_injectedScriptManager.get(), m_domAgent);
</del><ins>+ auto consoleAgentPtr = std::make_unique<PageConsoleAgent>(*m_injectedScriptManager, m_domAgent);
</ins><span class="cx"> WebConsoleAgent* consoleAgent = consoleAgentPtr.get();
</span><span class="cx"> m_instrumentingAgents->setWebConsoleAgent(consoleAgentPtr.get());
</span><span class="cx"> m_agents.append(WTF::move(consoleAgentPtr));
</span><span class="cx">
</span><del>- auto debuggerAgentPtr = std::make_unique<PageDebuggerAgent>(m_injectedScriptManager.get(), m_instrumentingAgents.get(), pageAgent, m_overlay.get());
</del><ins>+ auto debuggerAgentPtr = std::make_unique<PageDebuggerAgent>(*m_injectedScriptManager, m_instrumentingAgents.get(), pageAgent, m_overlay.get());
</ins><span class="cx"> m_debuggerAgent = debuggerAgentPtr.get();
</span><span class="cx"> m_agents.append(WTF::move(debuggerAgentPtr));
</span><span class="cx">
</span><span class="lines">@@ -231,7 +231,7 @@
</span><span class="cx">
</span><span class="cx"> m_agents.didCreateFrontendAndBackend(frontendChannel, m_backendDispatcher.get());
</span><span class="cx">
</span><del>- InspectorInstrumentation::registerInstrumentingAgents(*m_instrumentingAgents);
</del><ins>+ InspectorInstrumentation::registerInstrumentingAgents(m_instrumentingAgents.get());
</ins><span class="cx"> InspectorInstrumentation::frontendCreated();
</span><span class="cx">
</span><span class="cx"> #if ENABLE(REMOTE_INSPECTOR)
</span><span class="lines">@@ -261,7 +261,7 @@
</span><span class="cx"> // Release overlay page resources.
</span><span class="cx"> m_overlay->freePage();
</span><span class="cx"> InspectorInstrumentation::frontendDeleted();
</span><del>- InspectorInstrumentation::unregisterInstrumentingAgents(*m_instrumentingAgents);
</del><ins>+ InspectorInstrumentation::unregisterInstrumentingAgents(m_instrumentingAgents.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorController::show()
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorController.h (189217 => 189218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorController.h 2015-09-01 17:44:35 UTC (rev 189217)
+++ trunk/Source/WebCore/inspector/InspectorController.h 2015-09-01 17:52:15 UTC (rev 189218)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2011 Google Inc. All rights reserved.
</span><ins>+ * Copyright (C) 2015 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 are
</span><span class="lines">@@ -137,25 +138,26 @@
</span><span class="cx"> private:
</span><span class="cx"> friend class InspectorInstrumentation;
</span><span class="cx">
</span><del>- RefPtr<InstrumentingAgents> m_instrumentingAgents;
</del><ins>+ Ref<InstrumentingAgents> m_instrumentingAgents;
</ins><span class="cx"> std::unique_ptr<WebInjectedScriptManager> m_injectedScriptManager;
</span><del>- std::unique_ptr<InspectorOverlay> m_overlay;
-
- Inspector::InspectorAgent* m_inspectorAgent;
- InspectorDOMAgent* m_domAgent;
- InspectorResourceAgent* m_resourceAgent;
- InspectorPageAgent* m_pageAgent;
- PageDebuggerAgent* m_debuggerAgent;
- InspectorDOMDebuggerAgent* m_domDebuggerAgent;
- InspectorTimelineAgent* m_timelineAgent;
-
</del><span class="cx"> RefPtr<Inspector::BackendDispatcher> m_backendDispatcher;
</span><span class="cx"> Inspector::FrontendChannel* m_frontendChannel { nullptr };
</span><ins>+ std::unique_ptr<InspectorOverlay> m_overlay;
</ins><span class="cx"> Ref<WTF::Stopwatch> m_executionStopwatch;
</span><ins>+ Inspector::AgentRegistry m_agents;
+
</ins><span class="cx"> Page& m_page;
</span><span class="cx"> InspectorClient* m_inspectorClient;
</span><span class="cx"> InspectorFrontendClient* m_inspectorFrontendClient { nullptr };
</span><del>- Inspector::AgentRegistry m_agents;
</del><ins>+
+ Inspector::InspectorAgent* m_inspectorAgent { nullptr };
+ InspectorDOMAgent* m_domAgent { nullptr };
+ InspectorResourceAgent* m_resourceAgent { nullptr };
+ InspectorPageAgent* m_pageAgent { nullptr };
+ PageDebuggerAgent* m_debuggerAgent { nullptr };
+ InspectorDOMDebuggerAgent* m_domDebuggerAgent { nullptr };
+ InspectorTimelineAgent* m_timelineAgent { nullptr };
+
</ins><span class="cx"> Vector<InspectorInstrumentationCookie, 2> m_injectedScriptInstrumentationCookies;
</span><span class="cx"> bool m_isUnderTest { false };
</span><span class="cx"> bool m_isAutomaticInspection { false };
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDOMAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp (189217 => 189218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp 2015-09-01 17:44:35 UTC (rev 189217)
+++ trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp 2015-09-01 17:52:15 UTC (rev 189218)
</span><span class="lines">@@ -201,17 +201,11 @@
</span><span class="cx"> return "";
</span><span class="cx"> }
</span><span class="cx">
</span><del>-InspectorDOMAgent::InspectorDOMAgent(InstrumentingAgents* instrumentingAgents, InspectorPageAgent* pageAgent, InjectedScriptManager* injectedScriptManager, InspectorOverlay* overlay)
</del><ins>+InspectorDOMAgent::InspectorDOMAgent(InstrumentingAgents& instrumentingAgents, InspectorPageAgent* pageAgent, InjectedScriptManager& injectedScriptManager, InspectorOverlay* overlay)
</ins><span class="cx"> : InspectorAgentBase(ASCIILiteral("DOM"), instrumentingAgents)
</span><del>- , m_pageAgent(pageAgent)
</del><span class="cx"> , m_injectedScriptManager(injectedScriptManager)
</span><ins>+ , m_pageAgent(pageAgent)
</ins><span class="cx"> , m_overlay(overlay)
</span><del>- , m_domListener(0)
- , m_lastNodeId(1)
- , m_lastBackendNodeId(-1)
- , m_searchingForNode(false)
- , m_suppressAttributeModifiedEvent(false)
- , m_documentRequested(false)
</del><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -229,7 +223,7 @@
</span><span class="cx"> m_history = std::make_unique<InspectorHistory>();
</span><span class="cx"> m_domEditor = std::make_unique<DOMEditor>(m_history.get());
</span><span class="cx">
</span><del>- m_instrumentingAgents->setInspectorDOMAgent(this);
</del><ins>+ m_instrumentingAgents.setInspectorDOMAgent(this);
</ins><span class="cx"> m_document = m_pageAgent->mainFrame()->document();
</span><span class="cx">
</span><span class="cx"> if (m_nodeToFocus)
</span><span class="lines">@@ -248,7 +242,7 @@
</span><span class="cx"> setSearchingForNode(unused, false, 0);
</span><span class="cx"> hideHighlight(unused);
</span><span class="cx">
</span><del>- m_instrumentingAgents->setInspectorDOMAgent(0);
</del><ins>+ m_instrumentingAgents.setInspectorDOMAgent(0);
</ins><span class="cx"> m_documentRequested = false;
</span><span class="cx"> reset();
</span><span class="cx"> }
</span><span class="lines">@@ -1006,7 +1000,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> JSC::ExecState* scriptState = mainWorldExecState(frame);
</span><del>- InjectedScript injectedScript = m_injectedScriptManager->injectedScriptFor(scriptState);
</del><ins>+ InjectedScript injectedScript = m_injectedScriptManager.injectedScriptFor(scriptState);
</ins><span class="cx"> if (injectedScript.hasNoValue())
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -1482,7 +1476,7 @@
</span><span class="cx"> .setHandlerBody(body)
</span><span class="cx"> .release();
</span><span class="cx"> if (objectGroupId && handler && state) {
</span><del>- InjectedScript injectedScript = m_injectedScriptManager->injectedScriptFor(state);
</del><ins>+ InjectedScript injectedScript = m_injectedScriptManager.injectedScriptFor(state);
</ins><span class="cx"> if (!injectedScript.hasNoValue())
</span><span class="cx"> value->setHandler(injectedScript.wrapObject(Deprecated::ScriptValue(state->vm(), handler), *objectGroupId));
</span><span class="cx"> }
</span><span class="lines">@@ -2072,7 +2066,7 @@
</span><span class="cx">
</span><span class="cx"> Node* InspectorDOMAgent::nodeForObjectId(const String& objectId)
</span><span class="cx"> {
</span><del>- InjectedScript injectedScript = m_injectedScriptManager->injectedScriptForObjectId(objectId);
</del><ins>+ InjectedScript injectedScript = m_injectedScriptManager.injectedScriptForObjectId(objectId);
</ins><span class="cx"> if (injectedScript.hasNoValue())
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="lines">@@ -2112,7 +2106,7 @@
</span><span class="cx"> return 0;
</span><span class="cx">
</span><span class="cx"> JSC::ExecState* scriptState = mainWorldExecState(frame);
</span><del>- InjectedScript injectedScript = m_injectedScriptManager->injectedScriptFor(scriptState);
</del><ins>+ InjectedScript injectedScript = m_injectedScriptManager.injectedScriptFor(scriptState);
</ins><span class="cx"> if (injectedScript.hasNoValue())
</span><span class="cx"> return 0;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDOMAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDOMAgent.h (189217 => 189218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDOMAgent.h 2015-09-01 17:44:35 UTC (rev 189217)
+++ trunk/Source/WebCore/inspector/InspectorDOMAgent.h 2015-09-01 17:52:15 UTC (rev 189218)
</span><span class="lines">@@ -104,7 +104,7 @@
</span><span class="cx"> virtual void didModifyDOMAttr(Element*) = 0;
</span><span class="cx"> };
</span><span class="cx">
</span><del>- InspectorDOMAgent(InstrumentingAgents*, InspectorPageAgent*, Inspector::InjectedScriptManager*, InspectorOverlay*);
</del><ins>+ InspectorDOMAgent(InstrumentingAgents&, InspectorPageAgent*, Inspector::InjectedScriptManager&, InspectorOverlay*);
</ins><span class="cx"> virtual ~InspectorDOMAgent();
</span><span class="cx">
</span><span class="cx"> static String toErrorString(const ExceptionCode&);
</span><span class="lines">@@ -247,12 +247,13 @@
</span><span class="cx">
</span><span class="cx"> void innerHighlightQuad(std::unique_ptr<FloatQuad>, const Inspector::InspectorObject* color, const Inspector::InspectorObject* outlineColor, const bool* usePageCoordinates);
</span><span class="cx">
</span><del>- InspectorPageAgent* m_pageAgent;
- Inspector::InjectedScriptManager* m_injectedScriptManager;
- InspectorOverlay* m_overlay;
</del><span class="cx"> std::unique_ptr<Inspector::DOMFrontendDispatcher> m_frontendDispatcher;
</span><span class="cx"> RefPtr<Inspector::DOMBackendDispatcher> m_backendDispatcher;
</span><del>- DOMListener* m_domListener;
</del><ins>+ Inspector::InjectedScriptManager& m_injectedScriptManager;
+ InspectorPageAgent* m_pageAgent { nullptr };
+
+ InspectorOverlay* m_overlay { nullptr };
+ DOMListener* m_domListener { nullptr };
</ins><span class="cx"> NodeToIdMap m_documentNodeToIdMap;
</span><span class="cx"> typedef HashMap<RefPtr<Node>, BackendNodeId> NodeToBackendIdMap;
</span><span class="cx"> HashMap<String, NodeToBackendIdMap> m_nodeGroupToBackendIdMap;
</span><span class="lines">@@ -262,19 +263,19 @@
</span><span class="cx"> HashMap<int, NodeToIdMap*> m_idToNodesMap;
</span><span class="cx"> HashSet<int> m_childrenRequested;
</span><span class="cx"> HashMap<BackendNodeId, std::pair<Node*, String>> m_backendIdToNode;
</span><del>- int m_lastNodeId;
- BackendNodeId m_lastBackendNodeId;
</del><ins>+ int m_lastNodeId { 1 };
+ BackendNodeId m_lastBackendNodeId { -1 };
</ins><span class="cx"> RefPtr<Document> m_document;
</span><span class="cx"> typedef HashMap<String, Vector<RefPtr<Node>>> SearchResults;
</span><span class="cx"> SearchResults m_searchResults;
</span><span class="cx"> std::unique_ptr<RevalidateStyleAttributeTask> m_revalidateStyleAttrTask;
</span><span class="cx"> RefPtr<Node> m_nodeToFocus;
</span><del>- bool m_searchingForNode;
</del><ins>+ bool m_searchingForNode { false };
</ins><span class="cx"> std::unique_ptr<HighlightConfig> m_inspectModeHighlightConfig;
</span><span class="cx"> std::unique_ptr<InspectorHistory> m_history;
</span><span class="cx"> std::unique_ptr<DOMEditor> m_domEditor;
</span><del>- bool m_suppressAttributeModifiedEvent;
- bool m_documentRequested;
</del><ins>+ bool m_suppressAttributeModifiedEvent { false };
+ bool m_documentRequested { false };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDOMDebuggerAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDOMDebuggerAgent.cpp (189217 => 189218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDOMDebuggerAgent.cpp 2015-09-01 17:44:35 UTC (rev 189217)
+++ trunk/Source/WebCore/inspector/InspectorDOMDebuggerAgent.cpp 2015-09-01 17:52:15 UTC (rev 189218)
</span><span class="lines">@@ -59,12 +59,10 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-InspectorDOMDebuggerAgent::InspectorDOMDebuggerAgent(InstrumentingAgents* instrumentingAgents, InspectorDOMAgent* domAgent, InspectorDebuggerAgent* debuggerAgent)
</del><ins>+InspectorDOMDebuggerAgent::InspectorDOMDebuggerAgent(InstrumentingAgents& instrumentingAgents, InspectorDOMAgent* domAgent, InspectorDebuggerAgent* debuggerAgent)
</ins><span class="cx"> : InspectorAgentBase(ASCIILiteral("DOMDebugger"), instrumentingAgents)
</span><span class="cx"> , m_domAgent(domAgent)
</span><span class="cx"> , m_debuggerAgent(debuggerAgent)
</span><del>- , m_pauseInNextEventListener(false)
- , m_pauseOnAllXHRsEnabled(false)
</del><span class="cx"> {
</span><span class="cx"> m_debuggerAgent->setListener(this);
</span><span class="cx"> }
</span><span class="lines">@@ -72,13 +70,13 @@
</span><span class="cx"> InspectorDOMDebuggerAgent::~InspectorDOMDebuggerAgent()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!m_debuggerAgent);
</span><del>- ASSERT(!m_instrumentingAgents->inspectorDOMDebuggerAgent());
</del><ins>+ ASSERT(!m_instrumentingAgents.inspectorDOMDebuggerAgent());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Browser debugger agent enabled only when JS debugger is enabled.
</span><span class="cx"> void InspectorDOMDebuggerAgent::debuggerWasEnabled()
</span><span class="cx"> {
</span><del>- m_instrumentingAgents->setInspectorDOMDebuggerAgent(this);
</del><ins>+ m_instrumentingAgents.setInspectorDOMDebuggerAgent(this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorDOMDebuggerAgent::debuggerWasDisabled()
</span><span class="lines">@@ -98,7 +96,7 @@
</span><span class="cx">
</span><span class="cx"> void InspectorDOMDebuggerAgent::disable()
</span><span class="cx"> {
</span><del>- m_instrumentingAgents->setInspectorDOMDebuggerAgent(nullptr);
</del><ins>+ m_instrumentingAgents.setInspectorDOMDebuggerAgent(nullptr);
</ins><span class="cx"> clear();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDOMDebuggerAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDOMDebuggerAgent.h (189217 => 189218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDOMDebuggerAgent.h 2015-09-01 17:44:35 UTC (rev 189217)
+++ trunk/Source/WebCore/inspector/InspectorDOMDebuggerAgent.h 2015-09-01 17:52:15 UTC (rev 189218)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(InspectorDOMDebuggerAgent);
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- InspectorDOMDebuggerAgent(InstrumentingAgents*, InspectorDOMAgent*, Inspector::InspectorDebuggerAgent*);
</del><ins>+ InspectorDOMDebuggerAgent(InstrumentingAgents&, InspectorDOMAgent*, Inspector::InspectorDebuggerAgent*);
</ins><span class="cx"> virtual ~InspectorDOMDebuggerAgent();
</span><span class="cx">
</span><span class="cx"> // DOMDebugger API
</span><span class="lines">@@ -99,14 +99,15 @@
</span><span class="cx">
</span><span class="cx"> void clear();
</span><span class="cx">
</span><del>- InspectorDOMAgent* m_domAgent;
- Inspector::InspectorDebuggerAgent* m_debuggerAgent;
</del><span class="cx"> RefPtr<Inspector::DOMDebuggerBackendDispatcher> m_backendDispatcher;
</span><ins>+ InspectorDOMAgent* m_domAgent { nullptr };
+ Inspector::InspectorDebuggerAgent* m_debuggerAgent { nullptr };
+
</ins><span class="cx"> HashMap<Node*, uint32_t> m_domBreakpoints;
</span><span class="cx"> HashSet<String> m_eventListenerBreakpoints;
</span><span class="cx"> HashSet<String> m_xhrBreakpoints;
</span><del>- bool m_pauseInNextEventListener;
- bool m_pauseOnAllXHRsEnabled;
</del><ins>+ bool m_pauseInNextEventListener { false };
+ bool m_pauseOnAllXHRsEnabled { false };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDOMStorageAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDOMStorageAgent.cpp (189217 => 189218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDOMStorageAgent.cpp 2015-09-01 17:44:35 UTC (rev 189217)
+++ trunk/Source/WebCore/inspector/InspectorDOMStorageAgent.cpp 2015-09-01 17:52:15 UTC (rev 189218)
</span><span class="lines">@@ -53,18 +53,16 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-InspectorDOMStorageAgent::InspectorDOMStorageAgent(InstrumentingAgents* instrumentingAgents, InspectorPageAgent* pageAgent)
</del><ins>+InspectorDOMStorageAgent::InspectorDOMStorageAgent(InstrumentingAgents& instrumentingAgents, InspectorPageAgent* pageAgent)
</ins><span class="cx"> : InspectorAgentBase(ASCIILiteral("DOMStorage"), instrumentingAgents)
</span><span class="cx"> , m_pageAgent(pageAgent)
</span><del>- , m_enabled(false)
</del><span class="cx"> {
</span><del>- m_instrumentingAgents->setInspectorDOMStorageAgent(this);
</del><ins>+ m_instrumentingAgents.setInspectorDOMStorageAgent(this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> InspectorDOMStorageAgent::~InspectorDOMStorageAgent()
</span><span class="cx"> {
</span><del>- m_instrumentingAgents->setInspectorDOMStorageAgent(nullptr);
- m_instrumentingAgents = nullptr;
</del><ins>+ m_instrumentingAgents.setInspectorDOMStorageAgent(nullptr);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorDOMStorageAgent::didCreateFrontendAndBackend(Inspector::FrontendChannel* frontendChannel, Inspector::BackendDispatcher* backendDispatcher)
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDOMStorageAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDOMStorageAgent.h (189217 => 189218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDOMStorageAgent.h 2015-09-01 17:44:35 UTC (rev 189217)
+++ trunk/Source/WebCore/inspector/InspectorDOMStorageAgent.h 2015-09-01 17:52:15 UTC (rev 189218)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> class InspectorDOMStorageAgent final : public InspectorAgentBase, public Inspector::DOMStorageBackendDispatcherHandler {
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- InspectorDOMStorageAgent(InstrumentingAgents*, InspectorPageAgent*);
</del><ins>+ InspectorDOMStorageAgent(InstrumentingAgents&, InspectorPageAgent*);
</ins><span class="cx"> virtual ~InspectorDOMStorageAgent();
</span><span class="cx">
</span><span class="cx"> virtual void didCreateFrontendAndBackend(Inspector::FrontendChannel*, Inspector::BackendDispatcher*) override;
</span><span class="lines">@@ -77,10 +77,11 @@
</span><span class="cx"> private:
</span><span class="cx"> RefPtr<StorageArea> findStorageArea(ErrorString&, const Inspector::InspectorObject&, Frame*&);
</span><span class="cx">
</span><del>- InspectorPageAgent* m_pageAgent;
</del><span class="cx"> std::unique_ptr<Inspector::DOMStorageFrontendDispatcher> m_frontendDispatcher;
</span><span class="cx"> RefPtr<Inspector::DOMStorageBackendDispatcher> m_backendDispatcher;
</span><del>- bool m_enabled;
</del><ins>+ InspectorPageAgent* m_pageAgent { nullptr };
+
+ bool m_enabled { false };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDatabaseAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDatabaseAgent.cpp (189217 => 189218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDatabaseAgent.cpp 2015-09-01 17:44:35 UTC (rev 189217)
+++ trunk/Source/WebCore/inspector/InspectorDatabaseAgent.cpp 2015-09-01 17:52:15 UTC (rev 189218)
</span><span class="lines">@@ -210,16 +210,15 @@
</span><span class="cx"> m_resources.clear();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-InspectorDatabaseAgent::InspectorDatabaseAgent(InstrumentingAgents* instrumentingAgents)
</del><ins>+InspectorDatabaseAgent::InspectorDatabaseAgent(InstrumentingAgents& instrumentingAgents)
</ins><span class="cx"> : InspectorAgentBase(ASCIILiteral("Database"), instrumentingAgents)
</span><del>- , m_enabled(false)
</del><span class="cx"> {
</span><del>- m_instrumentingAgents->setInspectorDatabaseAgent(this);
</del><ins>+ m_instrumentingAgents.setInspectorDatabaseAgent(this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> InspectorDatabaseAgent::~InspectorDatabaseAgent()
</span><span class="cx"> {
</span><del>- m_instrumentingAgents->setInspectorDatabaseAgent(nullptr);
</del><ins>+ m_instrumentingAgents.setInspectorDatabaseAgent(nullptr);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorDatabaseAgent::didCreateFrontendAndBackend(Inspector::FrontendChannel* frontendChannel, Inspector::BackendDispatcher* backendDispatcher)
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDatabaseAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDatabaseAgent.h (189217 => 189218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDatabaseAgent.h 2015-09-01 17:44:35 UTC (rev 189217)
+++ trunk/Source/WebCore/inspector/InspectorDatabaseAgent.h 2015-09-01 17:52:15 UTC (rev 189218)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> class InspectorDatabaseAgent final : public InspectorAgentBase, public Inspector::DatabaseBackendDispatcherHandler {
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- explicit InspectorDatabaseAgent(InstrumentingAgents*);
</del><ins>+ explicit InspectorDatabaseAgent(InstrumentingAgents&);
</ins><span class="cx"> virtual ~InspectorDatabaseAgent();
</span><span class="cx">
</span><span class="cx"> virtual void didCreateFrontendAndBackend(Inspector::FrontendChannel*, Inspector::BackendDispatcher*) override;
</span><span class="lines">@@ -74,9 +74,10 @@
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<Inspector::DatabaseFrontendDispatcher> m_frontendDispatcher;
</span><span class="cx"> RefPtr<Inspector::DatabaseBackendDispatcher> m_backendDispatcher;
</span><ins>+
</ins><span class="cx"> typedef HashMap<String, RefPtr<InspectorDatabaseResource>> DatabaseResourcesMap;
</span><span class="cx"> DatabaseResourcesMap m_resources;
</span><del>- bool m_enabled;
</del><ins>+ bool m_enabled { false };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorIndexedDBAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp (189217 => 189218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp 2015-09-01 17:44:35 UTC (rev 189217)
+++ trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp 2015-09-01 17:52:15 UTC (rev 189218)
</span><span class="lines">@@ -564,7 +564,7 @@
</span><span class="cx">
</span><span class="cx"> } // namespace
</span><span class="cx">
</span><del>-InspectorIndexedDBAgent::InspectorIndexedDBAgent(InstrumentingAgents* instrumentingAgents, InjectedScriptManager* injectedScriptManager, InspectorPageAgent* pageAgent)
</del><ins>+InspectorIndexedDBAgent::InspectorIndexedDBAgent(InstrumentingAgents& instrumentingAgents, InjectedScriptManager& injectedScriptManager, InspectorPageAgent* pageAgent)
</ins><span class="cx"> : InspectorAgentBase(ASCIILiteral("IndexedDB"), instrumentingAgents)
</span><span class="cx"> , m_injectedScriptManager(injectedScriptManager)
</span><span class="cx"> , m_pageAgent(pageAgent)
</span><span class="lines">@@ -666,7 +666,7 @@
</span><span class="cx"> if (!idbFactory)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- InjectedScript injectedScript = m_injectedScriptManager->injectedScriptFor(mainWorldExecState(frame));
</del><ins>+ InjectedScript injectedScript = m_injectedScriptManager.injectedScriptFor(mainWorldExecState(frame));
</ins><span class="cx">
</span><span class="cx"> RefPtr<IDBKeyRange> idbKeyRange = keyRange ? idbKeyRangeFromKeyRange(keyRange) : nullptr;
</span><span class="cx"> if (keyRange && !idbKeyRange) {
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorIndexedDBAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.h (189217 => 189218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.h 2015-09-01 17:44:35 UTC (rev 189217)
+++ trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.h 2015-09-01 17:52:15 UTC (rev 189218)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> class InspectorIndexedDBAgent final : public InspectorAgentBase, public Inspector::IndexedDBBackendDispatcherHandler {
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- InspectorIndexedDBAgent(InstrumentingAgents*, Inspector::InjectedScriptManager*, InspectorPageAgent*);
</del><ins>+ InspectorIndexedDBAgent(InstrumentingAgents&, Inspector::InjectedScriptManager&, InspectorPageAgent*);
</ins><span class="cx"> virtual ~InspectorIndexedDBAgent();
</span><span class="cx">
</span><span class="cx"> virtual void didCreateFrontendAndBackend(Inspector::FrontendChannel*, Inspector::BackendDispatcher*) override;
</span><span class="lines">@@ -65,9 +65,9 @@
</span><span class="cx"> virtual void clearObjectStore(ErrorString&, const String& in_securityOrigin, const String& in_databaseName, const String& in_objectStoreName, Ref<ClearObjectStoreCallback>&&) override;
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- Inspector::InjectedScriptManager* m_injectedScriptManager;
- InspectorPageAgent* m_pageAgent;
</del><span class="cx"> RefPtr<Inspector::IndexedDBBackendDispatcher> m_backendDispatcher;
</span><ins>+ Inspector::InjectedScriptManager& m_injectedScriptManager;
+ InspectorPageAgent* m_pageAgent { nullptr };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorInstrumentationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp (189217 => 189218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp 2015-09-01 17:44:35 UTC (rev 189217)
+++ trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp 2015-09-01 17:52:15 UTC (rev 189218)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2011 Google Inc. All rights reserved.
</span><del>-* Copyright (C) 2014 Apple Inc. All rights reserved.
</del><ins>+* Copyright (C) 2014, 2015 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 are
</span><span class="lines">@@ -1261,10 +1261,10 @@
</span><span class="cx">
</span><span class="cx"> InstrumentingAgents* InspectorInstrumentation::instrumentingAgentsForPage(Page* page)
</span><span class="cx"> {
</span><del>- return page ? instrumentingAgentsForPage(*page) : nullptr;
</del><ins>+ return page ? &instrumentingAgentsForPage(*page) : nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-InstrumentingAgents* InspectorInstrumentation::instrumentingAgentsForPage(Page& page)
</del><ins>+InstrumentingAgents& InspectorInstrumentation::instrumentingAgentsForPage(Page& page)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx"> return page.inspectorController().m_instrumentingAgents.get();
</span><span class="lines">@@ -1277,7 +1277,7 @@
</span><span class="cx">
</span><span class="cx"> InstrumentingAgents* InspectorInstrumentation::instrumentingAgentsForWorkerGlobalScope(WorkerGlobalScope* workerGlobalScope)
</span><span class="cx"> {
</span><del>- return workerGlobalScope ? workerGlobalScope->workerInspectorController().m_instrumentingAgents.get() : nullptr;
</del><ins>+ return workerGlobalScope ? &workerGlobalScope->workerInspectorController().m_instrumentingAgents.get() : nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> InstrumentingAgents* InspectorInstrumentation::instrumentingAgentsForNonDocumentContext(ScriptExecutionContext* context)
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorInstrumentationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorInstrumentation.h (189217 => 189218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorInstrumentation.h 2015-09-01 17:44:35 UTC (rev 189217)
+++ trunk/Source/WebCore/inspector/InspectorInstrumentation.h 2015-09-01 17:52:15 UTC (rev 189218)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2010 Google Inc. All rights reserved.
</span><del>-* Copyright (C) 2014 Apple Inc. All rights reserved.
</del><ins>+* Copyright (C) 2014, 2015 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 are
</span><span class="lines">@@ -457,7 +457,7 @@
</span><span class="cx"> static void layerTreeDidChangeImpl(InstrumentingAgents&);
</span><span class="cx"> static void renderLayerDestroyedImpl(InstrumentingAgents&, const RenderLayer&);
</span><span class="cx">
</span><del>- static InstrumentingAgents* instrumentingAgentsForPage(Page&);
</del><ins>+ static InstrumentingAgents& instrumentingAgentsForPage(Page&);
</ins><span class="cx"> static InstrumentingAgents* instrumentingAgentsForFrame(Frame&);
</span><span class="cx"> static InstrumentingAgents* instrumentingAgentsForFrame(Frame*);
</span><span class="cx"> static InstrumentingAgents* instrumentingAgentsForContext(ScriptExecutionContext*);
</span><span class="lines">@@ -639,8 +639,7 @@
</span><span class="cx"> inline void InspectorInstrumentation::mouseDidMoveOverElement(Page& page, const HitTestResult& result, unsigned modifierFlags)
</span><span class="cx"> {
</span><span class="cx"> FAST_RETURN_IF_NO_FRONTENDS(void());
</span><del>- if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForPage(page))
- mouseDidMoveOverElementImpl(*instrumentingAgents, result, modifierFlags);
</del><ins>+ mouseDidMoveOverElementImpl(instrumentingAgentsForPage(page), result, modifierFlags);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline bool InspectorInstrumentation::handleTouchEvent(Frame& frame, Node& node)
</span><span class="lines">@@ -789,8 +788,7 @@
</span><span class="cx"> inline void InspectorInstrumentation::scriptsEnabled(Page& page, bool isEnabled)
</span><span class="cx"> {
</span><span class="cx"> FAST_RETURN_IF_NO_FRONTENDS(void());
</span><del>- if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForPage(page))
- return scriptsEnabledImpl(*instrumentingAgents, isEnabled);
</del><ins>+ return scriptsEnabledImpl(instrumentingAgentsForPage(page), isEnabled);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline InspectorInstrumentationCookie InspectorInstrumentation::willFireTimer(ScriptExecutionContext* context, int timerId)
</span><span class="lines">@@ -833,8 +831,7 @@
</span><span class="cx"> inline void InspectorInstrumentation::didScroll(Page& page)
</span><span class="cx"> {
</span><span class="cx"> FAST_RETURN_IF_NO_FRONTENDS(void());
</span><del>- if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForPage(page))
- didScrollImpl(*instrumentingAgents);
</del><ins>+ didScrollImpl(instrumentingAgentsForPage(page));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline InspectorInstrumentationCookie InspectorInstrumentation::willDispatchXHRLoadEvent(ScriptExecutionContext* context, XMLHttpRequest& request)
</span><span class="lines">@@ -937,14 +934,12 @@
</span><span class="cx">
</span><span class="cx"> inline void InspectorInstrumentation::markResourceAsCached(Page& page, unsigned long identifier)
</span><span class="cx"> {
</span><del>- if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForPage(page))
- markResourceAsCachedImpl(*instrumentingAgents, identifier);
</del><ins>+ markResourceAsCachedImpl(instrumentingAgentsForPage(page), identifier);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline void InspectorInstrumentation::didLoadResourceFromMemoryCache(Page& page, DocumentLoader* loader, CachedResource* resource)
</span><span class="cx"> {
</span><del>- if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForPage(page))
- didLoadResourceFromMemoryCacheImpl(*instrumentingAgents, loader, resource);
</del><ins>+ didLoadResourceFromMemoryCacheImpl(instrumentingAgentsForPage(page), loader, resource);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline InspectorInstrumentationCookie InspectorInstrumentation::willReceiveResourceResponse(Frame* frame)
</span><span class="lines">@@ -1103,9 +1098,7 @@
</span><span class="cx"> inline InspectorInstrumentationCookie InspectorInstrumentation::willRunJavaScriptDialog(Page& page, const String& message)
</span><span class="cx"> {
</span><span class="cx"> FAST_RETURN_IF_NO_FRONTENDS(InspectorInstrumentationCookie());
</span><del>- if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForPage(page))
- return willRunJavaScriptDialogImpl(*instrumentingAgents, message);
- return InspectorInstrumentationCookie();
</del><ins>+ return willRunJavaScriptDialogImpl(instrumentingAgentsForPage(page), message);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline void InspectorInstrumentation::didRunJavaScriptDialog(const InspectorInstrumentationCookie& cookie)
</span><span class="lines">@@ -1211,92 +1204,79 @@
</span><span class="cx"> inline void InspectorInstrumentation::sessionCreated(Page& page, RefPtr<ReplaySession>&& session)
</span><span class="cx"> {
</span><span class="cx"> FAST_RETURN_IF_NO_FRONTENDS(void());
</span><del>- if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForPage(page))
- sessionCreatedImpl(*instrumentingAgents, WTF::move(session));
</del><ins>+ sessionCreatedImpl(instrumentingAgentsForPage(page), WTF::move(session));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline void InspectorInstrumentation::sessionLoaded(Page& page, RefPtr<ReplaySession>&& session)
</span><span class="cx"> {
</span><span class="cx"> FAST_RETURN_IF_NO_FRONTENDS(void());
</span><del>- if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForPage(page))
- sessionLoadedImpl(*instrumentingAgents, WTF::move(session));
</del><ins>+ sessionLoadedImpl(instrumentingAgentsForPage(page), WTF::move(session));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline void InspectorInstrumentation::sessionModified(Page& page, RefPtr<ReplaySession>&& session)
</span><span class="cx"> {
</span><span class="cx"> FAST_RETURN_IF_NO_FRONTENDS(void());
</span><del>- if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForPage(page))
- sessionModifiedImpl(*instrumentingAgents, WTF::move(session));
</del><ins>+ sessionModifiedImpl(instrumentingAgentsForPage(page), WTF::move(session));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline void InspectorInstrumentation::segmentCreated(Page& page, RefPtr<ReplaySessionSegment>&& segment)
</span><span class="cx"> {
</span><span class="cx"> FAST_RETURN_IF_NO_FRONTENDS(void());
</span><del>- if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForPage(page))
- segmentCreatedImpl(*instrumentingAgents, WTF::move(segment));
</del><ins>+ segmentCreatedImpl(instrumentingAgentsForPage(page), WTF::move(segment));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline void InspectorInstrumentation::segmentCompleted(Page& page, RefPtr<ReplaySessionSegment>&& segment)
</span><span class="cx"> {
</span><span class="cx"> FAST_RETURN_IF_NO_FRONTENDS(void());
</span><del>- if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForPage(page))
- segmentCompletedImpl(*instrumentingAgents, WTF::move(segment));
</del><ins>+ segmentCompletedImpl(instrumentingAgentsForPage(page), WTF::move(segment));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline void InspectorInstrumentation::segmentLoaded(Page& page, RefPtr<ReplaySessionSegment>&& segment)
</span><span class="cx"> {
</span><span class="cx"> FAST_RETURN_IF_NO_FRONTENDS(void());
</span><del>- if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForPage(page))
- segmentLoadedImpl(*instrumentingAgents, WTF::move(segment));
</del><ins>+ segmentLoadedImpl(instrumentingAgentsForPage(page), WTF::move(segment));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline void InspectorInstrumentation::segmentUnloaded(Page& page)
</span><span class="cx"> {
</span><span class="cx"> FAST_RETURN_IF_NO_FRONTENDS(void());
</span><del>- if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForPage(page))
- segmentUnloadedImpl(*instrumentingAgents);
</del><ins>+ segmentUnloadedImpl(instrumentingAgentsForPage(page));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline void InspectorInstrumentation::captureStarted(Page& page)
</span><span class="cx"> {
</span><span class="cx"> FAST_RETURN_IF_NO_FRONTENDS(void());
</span><del>- if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForPage(page))
- captureStartedImpl(*instrumentingAgents);
</del><ins>+ captureStartedImpl(instrumentingAgentsForPage(page));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline void InspectorInstrumentation::captureStopped(Page& page)
</span><span class="cx"> {
</span><span class="cx"> FAST_RETURN_IF_NO_FRONTENDS(void());
</span><del>- if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForPage(page))
- captureStoppedImpl(*instrumentingAgents);
</del><ins>+ captureStoppedImpl(instrumentingAgentsForPage(page));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline void InspectorInstrumentation::playbackStarted(Page& page)
</span><span class="cx"> {
</span><span class="cx"> FAST_RETURN_IF_NO_FRONTENDS(void());
</span><del>- if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForPage(page))
- playbackStartedImpl(*instrumentingAgents);
</del><ins>+ playbackStartedImpl(instrumentingAgentsForPage(page));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline void InspectorInstrumentation::playbackPaused(Page& page, const ReplayPosition& position)
</span><span class="cx"> {
</span><span class="cx"> FAST_RETURN_IF_NO_FRONTENDS(void());
</span><del>- if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForPage(page))
- playbackPausedImpl(*instrumentingAgents, position);
</del><ins>+ playbackPausedImpl(instrumentingAgentsForPage(page), position);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline void InspectorInstrumentation::playbackFinished(Page& page)
</span><span class="cx"> {
</span><span class="cx"> FAST_RETURN_IF_NO_FRONTENDS(void());
</span><del>- if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForPage(page))
- playbackFinishedImpl(*instrumentingAgents);
</del><ins>+ playbackFinishedImpl(instrumentingAgentsForPage(page));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline void InspectorInstrumentation::playbackHitPosition(Page& page, const ReplayPosition& position)
</span><span class="cx"> {
</span><span class="cx"> FAST_RETURN_IF_NO_FRONTENDS(void());
</span><del>- if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForPage(page))
- playbackHitPositionImpl(*instrumentingAgents, position);
</del><ins>+ playbackHitPositionImpl(instrumentingAgentsForPage(page), position);
</ins><span class="cx"> }
</span><span class="cx"> #endif // ENABLE(WEB_REPLAY)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorLayerTreeAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorLayerTreeAgent.cpp (189217 => 189218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorLayerTreeAgent.cpp 2015-09-01 17:44:35 UTC (rev 189217)
+++ trunk/Source/WebCore/inspector/InspectorLayerTreeAgent.cpp 2015-09-01 17:52:15 UTC (rev 189218)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-InspectorLayerTreeAgent::InspectorLayerTreeAgent(InstrumentingAgents* instrumentingAgents)
</del><ins>+InspectorLayerTreeAgent::InspectorLayerTreeAgent(InstrumentingAgents& instrumentingAgents)
</ins><span class="cx"> : InspectorAgentBase(ASCIILiteral("LayerTree"), instrumentingAgents)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -81,12 +81,12 @@
</span><span class="cx">
</span><span class="cx"> void InspectorLayerTreeAgent::enable(ErrorString&)
</span><span class="cx"> {
</span><del>- m_instrumentingAgents->setInspectorLayerTreeAgent(this);
</del><ins>+ m_instrumentingAgents.setInspectorLayerTreeAgent(this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorLayerTreeAgent::disable(ErrorString&)
</span><span class="cx"> {
</span><del>- m_instrumentingAgents->setInspectorLayerTreeAgent(nullptr);
</del><ins>+ m_instrumentingAgents.setInspectorLayerTreeAgent(nullptr);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorLayerTreeAgent::layerTreeDidChange()
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx"> {
</span><span class="cx"> layers = Inspector::Protocol::Array<Inspector::Protocol::LayerTree::Layer>::create();
</span><span class="cx">
</span><del>- Node* node = m_instrumentingAgents->inspectorDOMAgent()->nodeForId(nodeId);
</del><ins>+ Node* node = m_instrumentingAgents.inspectorDOMAgent()->nodeForId(nodeId);
</ins><span class="cx"> if (!node) {
</span><span class="cx"> errorString = ASCIILiteral("Provided node id doesn't match any known node");
</span><span class="cx"> return;
</span><span class="lines">@@ -207,7 +207,7 @@
</span><span class="cx"> if (!node)
</span><span class="cx"> return 0;
</span><span class="cx">
</span><del>- InspectorDOMAgent* domAgent = m_instrumentingAgents->inspectorDOMAgent();
</del><ins>+ InspectorDOMAgent* domAgent = m_instrumentingAgents.inspectorDOMAgent();
</ins><span class="cx">
</span><span class="cx"> int nodeId = domAgent->boundNodeId(node);
</span><span class="cx"> if (!nodeId)
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorLayerTreeAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorLayerTreeAgent.h (189217 => 189218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorLayerTreeAgent.h 2015-09-01 17:44:35 UTC (rev 189217)
+++ trunk/Source/WebCore/inspector/InspectorLayerTreeAgent.h 2015-09-01 17:52:15 UTC (rev 189218)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx"> class InspectorLayerTreeAgent final : public InspectorAgentBase, public Inspector::LayerTreeBackendDispatcherHandler {
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- explicit InspectorLayerTreeAgent(InstrumentingAgents*);
</del><ins>+ explicit InspectorLayerTreeAgent(InstrumentingAgents&);
</ins><span class="cx"> virtual ~InspectorLayerTreeAgent();
</span><span class="cx">
</span><span class="cx"> virtual void didCreateFrontendAndBackend(Inspector::FrontendChannel*, Inspector::BackendDispatcher*) override;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorPageAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorPageAgent.cpp (189217 => 189218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorPageAgent.cpp 2015-09-01 17:44:35 UTC (rev 189217)
+++ trunk/Source/WebCore/inspector/InspectorPageAgent.cpp 2015-09-01 17:52:15 UTC (rev 189218)
</span><span class="lines">@@ -325,17 +325,11 @@
</span><span class="cx"> return resourceTypeJson(cachedResourceType(cachedResource));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-InspectorPageAgent::InspectorPageAgent(InstrumentingAgents* instrumentingAgents, Page* page, InspectorClient* client, InspectorOverlay* overlay)
</del><ins>+InspectorPageAgent::InspectorPageAgent(InstrumentingAgents& instrumentingAgents, Page* page, InspectorClient* client, InspectorOverlay* overlay)
</ins><span class="cx"> : InspectorAgentBase(ASCIILiteral("Page"), instrumentingAgents)
</span><span class="cx"> , m_page(page)
</span><span class="cx"> , m_client(client)
</span><span class="cx"> , m_overlay(overlay)
</span><del>- , m_lastScriptIdentifier(0)
- , m_enabled(false)
- , m_isFirstLayoutAfterOnLoad(false)
- , m_originalScriptExecutionDisabled(false)
- , m_ignoreScriptsEnabledNotification(false)
- , m_showPaintRects(false)
</del><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -359,15 +353,15 @@
</span><span class="cx">
</span><span class="cx"> double InspectorPageAgent::timestamp()
</span><span class="cx"> {
</span><del>- return m_instrumentingAgents->inspectorEnvironment().executionStopwatch()->elapsedTime();
</del><ins>+ return m_instrumentingAgents.inspectorEnvironment().executionStopwatch()->elapsedTime();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorPageAgent::enable(ErrorString&)
</span><span class="cx"> {
</span><span class="cx"> m_enabled = true;
</span><del>- m_instrumentingAgents->setInspectorPageAgent(this);
</del><ins>+ m_instrumentingAgents.setInspectorPageAgent(this);
</ins><span class="cx">
</span><del>- auto stopwatch = m_instrumentingAgents->inspectorEnvironment().executionStopwatch();
</del><ins>+ auto stopwatch = m_instrumentingAgents.inspectorEnvironment().executionStopwatch();
</ins><span class="cx"> stopwatch->reset();
</span><span class="cx"> stopwatch->start();
</span><span class="cx">
</span><span class="lines">@@ -379,7 +373,7 @@
</span><span class="cx"> {
</span><span class="cx"> m_enabled = false;
</span><span class="cx"> m_scriptsToEvaluateOnLoad = nullptr;
</span><del>- m_instrumentingAgents->setInspectorPageAgent(nullptr);
</del><ins>+ m_instrumentingAgents.setInspectorPageAgent(nullptr);
</ins><span class="cx">
</span><span class="cx"> ErrorString unused;
</span><span class="cx"> setScriptExecutionDisabled(unused, m_originalScriptExecutionDisabled);
</span><span class="lines">@@ -824,7 +818,7 @@
</span><span class="cx"> void InspectorPageAgent::frameStartedLoading(Frame& frame)
</span><span class="cx"> {
</span><span class="cx"> if (frame.isMainFrame()) {
</span><del>- auto stopwatch = m_instrumentingAgents->inspectorEnvironment().executionStopwatch();
</del><ins>+ auto stopwatch = m_instrumentingAgents.inspectorEnvironment().executionStopwatch();
</ins><span class="cx"> stopwatch->reset();
</span><span class="cx"> stopwatch->start();
</span><span class="cx"> }
</span><span class="lines">@@ -1022,7 +1016,7 @@
</span><span class="cx"> Frame* frame = mainFrame();
</span><span class="cx"> ASSERT(frame);
</span><span class="cx">
</span><del>- InspectorDOMAgent* domAgent = m_instrumentingAgents->inspectorDOMAgent();
</del><ins>+ InspectorDOMAgent* domAgent = m_instrumentingAgents.inspectorDOMAgent();
</ins><span class="cx"> ASSERT(domAgent);
</span><span class="cx"> Node* node = domAgent->assertNode(errorString, nodeId);
</span><span class="cx"> if (!node)
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorPageAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorPageAgent.h (189217 => 189218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorPageAgent.h 2015-09-01 17:44:35 UTC (rev 189217)
+++ trunk/Source/WebCore/inspector/InspectorPageAgent.h 2015-09-01 17:52:15 UTC (rev 189218)
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(InspectorPageAgent);
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- InspectorPageAgent(InstrumentingAgents*, Page*, InspectorClient*, InspectorOverlay*);
</del><ins>+ InspectorPageAgent(InstrumentingAgents&, Page*, InspectorClient*, InspectorOverlay*);
</ins><span class="cx">
</span><span class="cx"> enum ResourceType {
</span><span class="cx"> DocumentResource,
</span><span class="lines">@@ -166,22 +166,25 @@
</span><span class="cx">
</span><span class="cx"> Ref<Inspector::Protocol::Page::Frame> buildObjectForFrame(Frame*);
</span><span class="cx"> Ref<Inspector::Protocol::Page::FrameResourceTree> buildObjectForFrameTree(Frame*);
</span><del>- Page* m_page;
- InspectorClient* m_client;
</del><ins>+
</ins><span class="cx"> std::unique_ptr<Inspector::PageFrontendDispatcher> m_frontendDispatcher;
</span><span class="cx"> RefPtr<Inspector::PageBackendDispatcher> m_backendDispatcher;
</span><del>- InspectorOverlay* m_overlay;
- long m_lastScriptIdentifier;
</del><ins>+
+ Page* m_page { nullptr };
+ InspectorClient* m_client { nullptr };
+ InspectorOverlay* m_overlay { nullptr };
+
+ long m_lastScriptIdentifier { 0 };
</ins><span class="cx"> String m_pendingScriptToEvaluateOnLoadOnce;
</span><span class="cx"> String m_scriptToEvaluateOnLoadOnce;
</span><span class="cx"> HashMap<Frame*, String> m_frameToIdentifier;
</span><span class="cx"> HashMap<String, Frame*> m_identifierToFrame;
</span><span class="cx"> HashMap<DocumentLoader*, String> m_loaderToIdentifier;
</span><del>- bool m_enabled;
- bool m_isFirstLayoutAfterOnLoad;
- bool m_originalScriptExecutionDisabled;
- bool m_ignoreScriptsEnabledNotification;
- bool m_showPaintRects;
</del><ins>+ bool m_enabled { false };
+ bool m_isFirstLayoutAfterOnLoad { false };
+ bool m_originalScriptExecutionDisabled { false };
+ bool m_ignoreScriptsEnabledNotification { false };
+ bool m_showPaintRects { false };
</ins><span class="cx"> String m_emulatedMedia;
</span><span class="cx"> RefPtr<Inspector::InspectorObject> m_scriptsToEvaluateOnLoad;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorReplayAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorReplayAgent.cpp (189217 => 189218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorReplayAgent.cpp 2015-09-01 17:44:35 UTC (rev 189217)
+++ trunk/Source/WebCore/inspector/InspectorReplayAgent.cpp 2015-09-01 17:52:15 UTC (rev 189218)
</span><span class="lines">@@ -156,7 +156,7 @@
</span><span class="cx"> .release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-InspectorReplayAgent::InspectorReplayAgent(InstrumentingAgents* instrumentingAgents, InspectorPageAgent* pageAgent)
</del><ins>+InspectorReplayAgent::InspectorReplayAgent(InstrumentingAgents& instrumentingAgents, InspectorPageAgent* pageAgent)
</ins><span class="cx"> : InspectorAgentBase(ASCIILiteral("Replay"), instrumentingAgents)
</span><span class="cx"> , m_page(*pageAgent->page())
</span><span class="cx"> {
</span><span class="lines">@@ -178,7 +178,7 @@
</span><span class="cx"> m_frontendDispatcher = std::make_unique<Inspector::ReplayFrontendDispatcher>(frontendChannel);
</span><span class="cx"> m_backendDispatcher = Inspector::ReplayBackendDispatcher::create(backendDispatcher, this);
</span><span class="cx">
</span><del>- m_instrumentingAgents->setInspectorReplayAgent(this);
</del><ins>+ m_instrumentingAgents.setInspectorReplayAgent(this);
</ins><span class="cx"> ASSERT(sessionState() == WebCore::SessionState::Inactive);
</span><span class="cx">
</span><span class="cx"> // Keep track of the (default) session currently loaded by ReplayController,
</span><span class="lines">@@ -195,7 +195,7 @@
</span><span class="cx"> m_frontendDispatcher = nullptr;
</span><span class="cx"> m_backendDispatcher = nullptr;
</span><span class="cx">
</span><del>- m_instrumentingAgents->setInspectorReplayAgent(nullptr);
</del><ins>+ m_instrumentingAgents.setInspectorReplayAgent(nullptr);
</ins><span class="cx">
</span><span class="cx"> // Drop references to all sessions and segments.
</span><span class="cx"> m_sessionsMap.clear();
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorReplayAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorReplayAgent.h (189217 => 189218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorReplayAgent.h 2015-09-01 17:44:35 UTC (rev 189217)
+++ trunk/Source/WebCore/inspector/InspectorReplayAgent.h 2015-09-01 17:52:15 UTC (rev 189218)
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(InspectorReplayAgent);
</span><span class="cx"> public:
</span><del>- InspectorReplayAgent(InstrumentingAgents*, InspectorPageAgent*);
</del><ins>+ InspectorReplayAgent(InstrumentingAgents&, InspectorPageAgent*);
</ins><span class="cx"> virtual ~InspectorReplayAgent();
</span><span class="cx">
</span><span class="cx"> virtual void didCreateFrontendAndBackend(Inspector::FrontendChannel*, Inspector::BackendDispatcher*) override;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorResourceAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp (189217 => 189218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp 2015-09-01 17:44:35 UTC (rev 189217)
+++ trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp 2015-09-01 17:52:15 UTC (rev 189218)
</span><span class="lines">@@ -160,15 +160,11 @@
</span><span class="cx">
</span><span class="cx"> } // namespace
</span><span class="cx">
</span><del>-InspectorResourceAgent::InspectorResourceAgent(InstrumentingAgents* instrumentingAgents, InspectorPageAgent* pageAgent, InspectorClient* client)
</del><ins>+InspectorResourceAgent::InspectorResourceAgent(InstrumentingAgents& instrumentingAgents, InspectorPageAgent* pageAgent, InspectorClient* client)
</ins><span class="cx"> : InspectorAgentBase(ASCIILiteral("Network"), instrumentingAgents)
</span><span class="cx"> , m_pageAgent(pageAgent)
</span><span class="cx"> , m_client(client)
</span><span class="cx"> , m_resourcesData(std::make_unique<NetworkResourcesData>())
</span><del>- , m_enabled(false)
- , m_cacheDisabled(false)
- , m_loadingXHRSynchronously(false)
- , m_isRecalculatingStyle(false)
</del><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -268,12 +264,12 @@
</span><span class="cx"> ErrorString unused;
</span><span class="cx"> disable(unused);
</span><span class="cx"> }
</span><del>- ASSERT(!m_instrumentingAgents->inspectorResourceAgent());
</del><ins>+ ASSERT(!m_instrumentingAgents.inspectorResourceAgent());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> double InspectorResourceAgent::timestamp()
</span><span class="cx"> {
</span><del>- return m_instrumentingAgents->inspectorEnvironment().executionStopwatch()->elapsedTime();
</del><ins>+ return m_instrumentingAgents.inspectorEnvironment().executionStopwatch()->elapsedTime();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorResourceAgent::willSendRequest(unsigned long identifier, DocumentLoader& loader, ResourceRequest& request, const ResourceResponse& redirectResponse)
</span><span class="lines">@@ -607,13 +603,13 @@
</span><span class="cx"> if (!m_frontendDispatcher)
</span><span class="cx"> return;
</span><span class="cx"> m_enabled = true;
</span><del>- m_instrumentingAgents->setInspectorResourceAgent(this);
</del><ins>+ m_instrumentingAgents.setInspectorResourceAgent(this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorResourceAgent::disable(ErrorString&)
</span><span class="cx"> {
</span><span class="cx"> m_enabled = false;
</span><del>- m_instrumentingAgents->setInspectorResourceAgent(nullptr);
</del><ins>+ m_instrumentingAgents.setInspectorResourceAgent(nullptr);
</ins><span class="cx"> m_resourcesData->clear();
</span><span class="cx"> m_extraRequestHeaders.clear();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorResourceAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorResourceAgent.h (189217 => 189218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorResourceAgent.h 2015-09-01 17:44:35 UTC (rev 189217)
+++ trunk/Source/WebCore/inspector/InspectorResourceAgent.h 2015-09-01 17:52:15 UTC (rev 189218)
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> class InspectorResourceAgent final : public InspectorAgentBase, public Inspector::NetworkBackendDispatcherHandler {
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- InspectorResourceAgent(InstrumentingAgents*, InspectorPageAgent*, InspectorClient*);
</del><ins>+ InspectorResourceAgent(InstrumentingAgents&, InspectorPageAgent*, InspectorClient*);
</ins><span class="cx"> virtual ~InspectorResourceAgent();
</span><span class="cx">
</span><span class="cx"> virtual void didCreateFrontendAndBackend(Inspector::FrontendChannel*, Inspector::BackendDispatcher*) override;
</span><span class="lines">@@ -131,21 +131,21 @@
</span><span class="cx">
</span><span class="cx"> double timestamp();
</span><span class="cx">
</span><del>- InspectorPageAgent* m_pageAgent;
- InspectorClient* m_client;
</del><span class="cx"> std::unique_ptr<Inspector::NetworkFrontendDispatcher> m_frontendDispatcher;
</span><span class="cx"> RefPtr<Inspector::NetworkBackendDispatcher> m_backendDispatcher;
</span><ins>+ InspectorPageAgent* m_pageAgent { nullptr };
+
+ InspectorClient* m_client { nullptr };
+
</ins><span class="cx"> std::unique_ptr<NetworkResourcesData> m_resourcesData;
</span><del>- bool m_enabled;
- bool m_cacheDisabled;
- bool m_loadingXHRSynchronously;
</del><ins>+ bool m_enabled { false };
+ bool m_cacheDisabled { false };
+ bool m_loadingXHRSynchronously { false };
</ins><span class="cx"> HashMap<String, String> m_extraRequestHeaders;
</span><del>-
</del><span class="cx"> HashSet<unsigned long> m_hiddenRequestIdentifiers;
</span><del>-
</del><span class="cx"> // FIXME: InspectorResourceAgent should now be aware of style recalculation.
</span><span class="cx"> RefPtr<Inspector::Protocol::Network::Initiator> m_styleRecalculationInitiator;
</span><del>- bool m_isRecalculatingStyle;
</del><ins>+ bool m_isRecalculatingStyle { false };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorTimelineAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp (189217 => 189218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp 2015-09-01 17:44:35 UTC (rev 189217)
+++ trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp 2015-09-01 17:52:15 UTC (rev 189218)
</span><span class="lines">@@ -94,7 +94,7 @@
</span><span class="cx"> m_frontendDispatcher = std::make_unique<Inspector::TimelineFrontendDispatcher>(frontendChannel);
</span><span class="cx"> m_backendDispatcher = Inspector::TimelineBackendDispatcher::create(backendDispatcher, this);
</span><span class="cx">
</span><del>- m_instrumentingAgents->setPersistentInspectorTimelineAgent(this);
</del><ins>+ m_instrumentingAgents.setPersistentInspectorTimelineAgent(this);
</ins><span class="cx">
</span><span class="cx"> if (m_scriptDebugServer)
</span><span class="cx"> m_scriptDebugServer->recompileAllJSFunctions();
</span><span class="lines">@@ -105,7 +105,7 @@
</span><span class="cx"> m_frontendDispatcher = nullptr;
</span><span class="cx"> m_backendDispatcher = nullptr;
</span><span class="cx">
</span><del>- m_instrumentingAgents->setPersistentInspectorTimelineAgent(nullptr);
</del><ins>+ m_instrumentingAgents.setPersistentInspectorTimelineAgent(nullptr);
</ins><span class="cx">
</span><span class="cx"> if (reason != Inspector::DisconnectReason::InspectedTargetDestroyed) {
</span><span class="cx"> if (m_scriptDebugServer)
</span><span class="lines">@@ -140,7 +140,7 @@
</span><span class="cx"> else
</span><span class="cx"> m_maxCallStackDepth = 5;
</span><span class="cx">
</span><del>- m_instrumentingAgents->setInspectorTimelineAgent(this);
</del><ins>+ m_instrumentingAgents.setInspectorTimelineAgent(this);
</ins><span class="cx">
</span><span class="cx"> if (m_scriptDebugServer)
</span><span class="cx"> m_scriptDebugServer->addListener(this);
</span><span class="lines">@@ -193,7 +193,7 @@
</span><span class="cx"> if (!m_enabled)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_instrumentingAgents->setInspectorTimelineAgent(nullptr);
</del><ins>+ m_instrumentingAgents.setInspectorTimelineAgent(nullptr);
</ins><span class="cx">
</span><span class="cx"> if (m_scriptDebugServer)
</span><span class="cx"> m_scriptDebugServer->removeListener(this, true);
</span><span class="lines">@@ -219,7 +219,7 @@
</span><span class="cx">
</span><span class="cx"> double InspectorTimelineAgent::timestamp()
</span><span class="cx"> {
</span><del>- return m_instrumentingAgents->inspectorEnvironment().executionStopwatch()->elapsedTime();
</del><ins>+ return m_instrumentingAgents.inspectorEnvironment().executionStopwatch()->elapsedTime();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorTimelineAgent::setPageScriptDebugServer(PageScriptDebugServer* scriptDebugServer)
</span><span class="lines">@@ -266,7 +266,7 @@
</span><span class="cx"> if (!m_enabled && m_pendingConsoleProfileRecords.isEmpty())
</span><span class="cx"> internalStart();
</span><span class="cx">
</span><del>- startProfiling(exec, title, m_instrumentingAgents->inspectorEnvironment().executionStopwatch());
</del><ins>+ startProfiling(exec, title, m_instrumentingAgents.inspectorEnvironment().executionStopwatch());
</ins><span class="cx">
</span><span class="cx"> m_pendingConsoleProfileRecords.append(createRecordEntry(TimelineRecordFactory::createConsoleProfileData(title), TimelineRecordType::ConsoleProfile, true, frameFromExecState(exec)));
</span><span class="cx"> }
</span><span class="lines">@@ -305,7 +305,7 @@
</span><span class="cx"> pushCurrentRecord(TimelineRecordFactory::createFunctionCallData(scriptName, scriptLine), TimelineRecordType::FunctionCall, true, frame);
</span><span class="cx">
</span><span class="cx"> if (frame && !m_callStackDepth)
</span><del>- startProfiling(frame, ASCIILiteral("Timeline FunctionCall"), m_instrumentingAgents->inspectorEnvironment().executionStopwatch());
</del><ins>+ startProfiling(frame, ASCIILiteral("Timeline FunctionCall"), m_instrumentingAgents.inspectorEnvironment().executionStopwatch());
</ins><span class="cx">
</span><span class="cx"> ++m_callStackDepth;
</span><span class="cx"> }
</span><span class="lines">@@ -494,7 +494,7 @@
</span><span class="cx">
</span><span class="cx"> if (!m_callStackDepth) {
</span><span class="cx"> ++m_callStackDepth;
</span><del>- startProfiling(&frame, ASCIILiteral("Timeline EvaluateScript"), m_instrumentingAgents->inspectorEnvironment().executionStopwatch());
</del><ins>+ startProfiling(&frame, ASCIILiteral("Timeline EvaluateScript"), m_instrumentingAgents.inspectorEnvironment().executionStopwatch());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -729,11 +729,11 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-InspectorTimelineAgent::InspectorTimelineAgent(InstrumentingAgents* instrumentingAgents, InspectorPageAgent* pageAgent, InspectorType type, InspectorClient* client)
</del><ins>+InspectorTimelineAgent::InspectorTimelineAgent(InstrumentingAgents& instrumentingAgents, InspectorPageAgent* pageAgent, InspectorType type, InspectorClient* client)
</ins><span class="cx"> : InspectorAgentBase(ASCIILiteral("Timeline"), instrumentingAgents)
</span><span class="cx"> , m_pageAgent(pageAgent)
</span><ins>+ , m_client(client)
</ins><span class="cx"> , m_inspectorType(type)
</span><del>- , m_client(client)
</del><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorTimelineAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorTimelineAgent.h (189217 => 189218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorTimelineAgent.h 2015-09-01 17:44:35 UTC (rev 189217)
+++ trunk/Source/WebCore/inspector/InspectorTimelineAgent.h 2015-09-01 17:52:15 UTC (rev 189218)
</span><span class="lines">@@ -117,7 +117,7 @@
</span><span class="cx"> public:
</span><span class="cx"> enum InspectorType { PageInspector, WorkerInspector };
</span><span class="cx">
</span><del>- InspectorTimelineAgent(InstrumentingAgents*, InspectorPageAgent*, InspectorType, InspectorClient*);
</del><ins>+ InspectorTimelineAgent(InstrumentingAgents&, InspectorPageAgent*, InspectorType, InspectorClient*);
</ins><span class="cx"> virtual ~InspectorTimelineAgent();
</span><span class="cx">
</span><span class="cx"> virtual void didCreateFrontendAndBackend(Inspector::FrontendChannel*, Inspector::BackendDispatcher*) override;
</span><span class="lines">@@ -231,19 +231,18 @@
</span><span class="cx"> void localToPageQuad(const RenderObject&, const LayoutRect&, FloatQuad*);
</span><span class="cx"> Page* page();
</span><span class="cx">
</span><del>- InspectorPageAgent* m_pageAgent;
- PageScriptDebugServer* m_scriptDebugServer { nullptr };
-
</del><span class="cx"> std::unique_ptr<Inspector::TimelineFrontendDispatcher> m_frontendDispatcher;
</span><span class="cx"> RefPtr<Inspector::TimelineBackendDispatcher> m_backendDispatcher;
</span><ins>+ InspectorPageAgent* m_pageAgent;
</ins><span class="cx">
</span><del>- Vector<TimelineRecordEntry> m_recordStack;
</del><ins>+ PageScriptDebugServer* m_scriptDebugServer { nullptr };
+ InspectorClient* m_client { nullptr };
</ins><span class="cx">
</span><ins>+ Vector<TimelineRecordEntry> m_recordStack;
</ins><span class="cx"> int m_id { 1 };
</span><span class="cx"> int m_callStackDepth { 0 };
</span><span class="cx"> int m_maxCallStackDepth { 5 };
</span><span class="cx"> InspectorType m_inspectorType;
</span><del>- InspectorClient* m_client;
</del><span class="cx">
</span><span class="cx"> Vector<TimelineRecordEntry> m_pendingConsoleProfileRecords;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorWebAgentBaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorWebAgentBase.h (189217 => 189218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorWebAgentBase.h 2015-09-01 17:44:35 UTC (rev 189217)
+++ trunk/Source/WebCore/inspector/InspectorWebAgentBase.h 2015-09-01 17:52:15 UTC (rev 189218)
</span><span class="lines">@@ -37,13 +37,13 @@
</span><span class="cx">
</span><span class="cx"> class InspectorAgentBase : public Inspector::InspectorAgentBase {
</span><span class="cx"> protected:
</span><del>- InspectorAgentBase(const String& name, InstrumentingAgents* instrumentingAgents)
</del><ins>+ InspectorAgentBase(const String& name, InstrumentingAgents& instrumentingAgents)
</ins><span class="cx"> : Inspector::InspectorAgentBase(name)
</span><span class="cx"> , m_instrumentingAgents(instrumentingAgents)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- InstrumentingAgents* m_instrumentingAgents;
</del><ins>+ InstrumentingAgents& m_instrumentingAgents;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorWorkerAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorWorkerAgent.cpp (189217 => 189218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorWorkerAgent.cpp 2015-09-01 17:44:35 UTC (rev 189217)
+++ trunk/Source/WebCore/inspector/InspectorWorkerAgent.cpp 2015-09-01 17:52:15 UTC (rev 189218)
</span><span class="lines">@@ -101,17 +101,15 @@
</span><span class="cx">
</span><span class="cx"> int InspectorWorkerAgent::WorkerFrontendChannel::s_nextId = 1;
</span><span class="cx">
</span><del>-InspectorWorkerAgent::InspectorWorkerAgent(InstrumentingAgents* instrumentingAgents)
</del><ins>+InspectorWorkerAgent::InspectorWorkerAgent(InstrumentingAgents& instrumentingAgents)
</ins><span class="cx"> : InspectorAgentBase(ASCIILiteral("Worker"), instrumentingAgents)
</span><del>- , m_enabled(false)
- , m_shouldPauseDedicatedWorkerOnStart(false)
</del><span class="cx"> {
</span><del>- m_instrumentingAgents->setInspectorWorkerAgent(this);
</del><ins>+ m_instrumentingAgents.setInspectorWorkerAgent(this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> InspectorWorkerAgent::~InspectorWorkerAgent()
</span><span class="cx"> {
</span><del>- m_instrumentingAgents->setInspectorWorkerAgent(nullptr);
</del><ins>+ m_instrumentingAgents.setInspectorWorkerAgent(nullptr);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorWorkerAgent::didCreateFrontendAndBackend(Inspector::FrontendChannel* frontendChannel, Inspector::BackendDispatcher* backendDispatcher)
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorWorkerAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorWorkerAgent.h (189217 => 189218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorWorkerAgent.h 2015-09-01 17:44:35 UTC (rev 189217)
+++ trunk/Source/WebCore/inspector/InspectorWorkerAgent.h 2015-09-01 17:52:15 UTC (rev 189218)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> class InspectorWorkerAgent final : public InspectorAgentBase, public Inspector::WorkerBackendDispatcherHandler {
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- explicit InspectorWorkerAgent(InstrumentingAgents*);
</del><ins>+ explicit InspectorWorkerAgent(InstrumentingAgents&);
</ins><span class="cx"> virtual ~InspectorWorkerAgent();
</span><span class="cx">
</span><span class="cx"> virtual void didCreateFrontendAndBackend(Inspector::FrontendChannel*, Inspector::BackendDispatcher*) override;
</span><span class="lines">@@ -76,12 +76,14 @@
</span><span class="cx"> void createWorkerFrontendChannel(WorkerGlobalScopeProxy*, const String& url);
</span><span class="cx"> void destroyWorkerFrontendChannels();
</span><span class="cx">
</span><ins>+ class WorkerFrontendChannel;
+
</ins><span class="cx"> std::unique_ptr<Inspector::WorkerFrontendDispatcher> m_frontendDispatcher;
</span><span class="cx"> RefPtr<Inspector::WorkerBackendDispatcher> m_backendDispatcher;
</span><del>- bool m_enabled;
- bool m_shouldPauseDedicatedWorkerOnStart;
</del><span class="cx">
</span><del>- class WorkerFrontendChannel;
</del><ins>+ bool m_enabled { false };
+ bool m_shouldPauseDedicatedWorkerOnStart { false };
+
</ins><span class="cx"> typedef HashMap<int, WorkerFrontendChannel*> WorkerChannels;
</span><span class="cx"> WorkerChannels m_idToChannel;
</span><span class="cx"> typedef HashMap<WorkerGlobalScopeProxy*, String> DedicatedWorkers;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInstrumentingAgentscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InstrumentingAgents.cpp (189217 => 189218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InstrumentingAgents.cpp 2015-09-01 17:44:35 UTC (rev 189217)
+++ trunk/Source/WebCore/inspector/InstrumentingAgents.cpp 2015-09-01 17:52:15 UTC (rev 189218)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2011 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2014, 2015 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 are
</span><span class="lines">@@ -44,27 +44,6 @@
</span><span class="cx">
</span><span class="cx"> InstrumentingAgents::InstrumentingAgents(InspectorEnvironment& environment)
</span><span class="cx"> : m_environment(environment)
</span><del>- , m_inspectorAgent(nullptr)
- , m_inspectorPageAgent(nullptr)
- , m_inspectorCSSAgent(nullptr)
- , m_inspectorLayerTreeAgent(nullptr)
- , m_webConsoleAgent(nullptr)
- , m_inspectorDOMAgent(nullptr)
- , m_inspectorResourceAgent(nullptr)
- , m_pageRuntimeAgent(nullptr)
- , m_workerRuntimeAgent(nullptr)
- , m_inspectorTimelineAgent(nullptr)
- , m_persistentInspectorTimelineAgent(nullptr)
- , m_inspectorDOMStorageAgent(nullptr)
-#if ENABLE(WEB_REPLAY)
- , m_inspectorReplayAgent(nullptr)
-#endif
- , m_inspectorDatabaseAgent(nullptr)
- , m_inspectorApplicationCacheAgent(nullptr)
- , m_inspectorDebuggerAgent(nullptr)
- , m_pageDebuggerAgent(nullptr)
- , m_inspectorDOMDebuggerAgent(nullptr)
- , m_inspectorWorkerAgent(nullptr)
</del><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInstrumentingAgentsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InstrumentingAgents.h (189217 => 189218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InstrumentingAgents.h 2015-09-01 17:44:35 UTC (rev 189217)
+++ trunk/Source/WebCore/inspector/InstrumentingAgents.h 2015-09-01 17:52:15 UTC (rev 189218)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2011 Google Inc. All rights reserved.
</span><del>- * Copyright (C) 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2014, 2015 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 are
</span><span class="lines">@@ -68,9 +68,11 @@
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(InstrumentingAgents);
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- static PassRefPtr<InstrumentingAgents> create(Inspector::InspectorEnvironment& environment)
</del><ins>+ // FIXME: InstrumentingAgents could be uniquely owned by InspectorController if instrumentation
+ // cookies kept only a weak reference to InstrumentingAgents. Then, reset() would be unnecessary.
+ static Ref<InstrumentingAgents> create(Inspector::InspectorEnvironment& environment)
</ins><span class="cx"> {
</span><del>- return adoptRef(new InstrumentingAgents(environment));
</del><ins>+ return adoptRef(*new InstrumentingAgents(environment));
</ins><span class="cx"> }
</span><span class="cx"> ~InstrumentingAgents() { }
</span><span class="cx"> void reset();
</span><span class="lines">@@ -141,29 +143,29 @@
</span><span class="cx">
</span><span class="cx"> Inspector::InspectorEnvironment& m_environment;
</span><span class="cx">
</span><del>- Inspector::InspectorAgent* m_inspectorAgent;
- InspectorPageAgent* m_inspectorPageAgent;
- InspectorCSSAgent* m_inspectorCSSAgent;
- InspectorLayerTreeAgent* m_inspectorLayerTreeAgent;
- WebConsoleAgent* m_webConsoleAgent;
- InspectorDOMAgent* m_inspectorDOMAgent;
- InspectorResourceAgent* m_inspectorResourceAgent;
- PageRuntimeAgent* m_pageRuntimeAgent;
- WorkerRuntimeAgent* m_workerRuntimeAgent;
- InspectorTimelineAgent* m_inspectorTimelineAgent;
- InspectorTimelineAgent* m_persistentInspectorTimelineAgent;
- InspectorDOMStorageAgent* m_inspectorDOMStorageAgent;
</del><ins>+ Inspector::InspectorAgent* m_inspectorAgent { nullptr };
+ InspectorPageAgent* m_inspectorPageAgent { nullptr };
+ InspectorCSSAgent* m_inspectorCSSAgent { nullptr };
+ InspectorLayerTreeAgent* m_inspectorLayerTreeAgent { nullptr };
+ WebConsoleAgent* m_webConsoleAgent { nullptr };
+ InspectorDOMAgent* m_inspectorDOMAgent { nullptr };
+ InspectorResourceAgent* m_inspectorResourceAgent { nullptr };
+ PageRuntimeAgent* m_pageRuntimeAgent { nullptr };
+ WorkerRuntimeAgent* m_workerRuntimeAgent { nullptr };
+ InspectorTimelineAgent* m_inspectorTimelineAgent { nullptr };
+ InspectorTimelineAgent* m_persistentInspectorTimelineAgent { nullptr };
+ InspectorDOMStorageAgent* m_inspectorDOMStorageAgent { nullptr };
</ins><span class="cx"> #if ENABLE(WEB_REPLAY)
</span><del>- InspectorReplayAgent* m_inspectorReplayAgent;
</del><ins>+ InspectorReplayAgent* m_inspectorReplayAgent { nullptr };
</ins><span class="cx"> #endif
</span><del>- InspectorDatabaseAgent* m_inspectorDatabaseAgent;
- InspectorApplicationCacheAgent* m_inspectorApplicationCacheAgent;
- Inspector::InspectorDebuggerAgent* m_inspectorDebuggerAgent;
- PageDebuggerAgent* m_pageDebuggerAgent;
- InspectorDOMDebuggerAgent* m_inspectorDOMDebuggerAgent;
- InspectorWorkerAgent* m_inspectorWorkerAgent;
</del><ins>+ InspectorDatabaseAgent* m_inspectorDatabaseAgent { nullptr };
+ InspectorApplicationCacheAgent* m_inspectorApplicationCacheAgent { nullptr };
+ Inspector::InspectorDebuggerAgent* m_inspectorDebuggerAgent { nullptr };
+ PageDebuggerAgent* m_pageDebuggerAgent { nullptr };
+ InspectorDOMDebuggerAgent* m_inspectorDOMDebuggerAgent { nullptr };
+ InspectorWorkerAgent* m_inspectorWorkerAgent { nullptr };
</ins><span class="cx"> };
</span><span class="cx">
</span><del>-}
</del><ins>+} // namespace WebCore
</ins><span class="cx">
</span><span class="cx"> #endif // !defined(InstrumentingAgents_h)
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorPageConsoleAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/PageConsoleAgent.cpp (189217 => 189218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/PageConsoleAgent.cpp 2015-09-01 17:44:35 UTC (rev 189217)
+++ trunk/Source/WebCore/inspector/PageConsoleAgent.cpp 2015-09-01 17:52:15 UTC (rev 189218)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2011 Google Inc. All rights reserved.
</span><ins>+ * Copyright (C) 2015 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 are
</span><span class="lines">@@ -40,7 +41,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-PageConsoleAgent::PageConsoleAgent(WebInjectedScriptManager* injectedScriptManager, InspectorDOMAgent* domAgent)
</del><ins>+PageConsoleAgent::PageConsoleAgent(WebInjectedScriptManager& injectedScriptManager, InspectorDOMAgent* domAgent)
</ins><span class="cx"> : WebConsoleAgent(injectedScriptManager)
</span><span class="cx"> , m_inspectorDOMAgent(domAgent)
</span><span class="cx"> {
</span><span class="lines">@@ -72,7 +73,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (CommandLineAPIHost* commandLineAPIHost = static_cast<WebInjectedScriptManager*>(m_injectedScriptManager)->commandLineAPIHost())
</del><ins>+ if (CommandLineAPIHost* commandLineAPIHost = static_cast<WebInjectedScriptManager&>(m_injectedScriptManager).commandLineAPIHost())
</ins><span class="cx"> commandLineAPIHost->addInspectedObject(std::make_unique<InspectableNode>(node));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorPageConsoleAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/PageConsoleAgent.h (189217 => 189218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/PageConsoleAgent.h 2015-09-01 17:44:35 UTC (rev 189217)
+++ trunk/Source/WebCore/inspector/PageConsoleAgent.h 2015-09-01 17:52:15 UTC (rev 189218)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2011 Google Inc. All rights reserved.
</span><ins>+ * Copyright (C) 2015 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 are
</span><span class="lines">@@ -41,7 +42,7 @@
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(PageConsoleAgent);
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- PageConsoleAgent(WebInjectedScriptManager*, InspectorDOMAgent*);
</del><ins>+ PageConsoleAgent(WebInjectedScriptManager&, InspectorDOMAgent*);
</ins><span class="cx"> virtual ~PageConsoleAgent() { }
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorPageDebuggerAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/PageDebuggerAgent.cpp (189217 => 189218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/PageDebuggerAgent.cpp 2015-09-01 17:44:35 UTC (rev 189217)
+++ trunk/Source/WebCore/inspector/PageDebuggerAgent.cpp 2015-09-01 17:52:15 UTC (rev 189218)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2011 Google Inc. All rights reserved.
</span><ins>+ * Copyright (C) 2015 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 are
</span><span class="lines">@@ -49,7 +50,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-PageDebuggerAgent::PageDebuggerAgent(InjectedScriptManager* injectedScriptManager, InstrumentingAgents* instrumentingAgents, InspectorPageAgent* pageAgent, InspectorOverlay* overlay)
</del><ins>+PageDebuggerAgent::PageDebuggerAgent(InjectedScriptManager& injectedScriptManager, InstrumentingAgents& instrumentingAgents, InspectorPageAgent* pageAgent, InspectorOverlay* overlay)
</ins><span class="cx"> : WebDebuggerAgent(injectedScriptManager, instrumentingAgents)
</span><span class="cx"> , m_pageAgent(pageAgent)
</span><span class="cx"> , m_overlay(overlay)
</span><span class="lines">@@ -60,13 +61,13 @@
</span><span class="cx"> void PageDebuggerAgent::enable()
</span><span class="cx"> {
</span><span class="cx"> WebDebuggerAgent::enable();
</span><del>- m_instrumentingAgents->setPageDebuggerAgent(this);
</del><ins>+ m_instrumentingAgents.setPageDebuggerAgent(this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PageDebuggerAgent::disable(bool isBeingDestroyed)
</span><span class="cx"> {
</span><span class="cx"> WebDebuggerAgent::disable(isBeingDestroyed);
</span><del>- m_instrumentingAgents->setPageDebuggerAgent(nullptr);
</del><ins>+ m_instrumentingAgents.setPageDebuggerAgent(nullptr);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String PageDebuggerAgent::sourceMapURLForScript(const Script& script)
</span><span class="lines">@@ -124,10 +125,10 @@
</span><span class="cx"> {
</span><span class="cx"> if (!executionContextId) {
</span><span class="cx"> JSC::ExecState* scriptState = mainWorldExecState(m_pageAgent->mainFrame());
</span><del>- return injectedScriptManager()->injectedScriptFor(scriptState);
</del><ins>+ return injectedScriptManager().injectedScriptFor(scriptState);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- InjectedScript injectedScript = injectedScriptManager()->injectedScriptForId(*executionContextId);
</del><ins>+ InjectedScript injectedScript = injectedScriptManager().injectedScriptForId(*executionContextId);
</ins><span class="cx"> if (injectedScript.hasNoValue())
</span><span class="cx"> errorString = ASCIILiteral("Execution context with given id not found.");
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorPageDebuggerAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/PageDebuggerAgent.h (189217 => 189218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/PageDebuggerAgent.h 2015-09-01 17:44:35 UTC (rev 189217)
+++ trunk/Source/WebCore/inspector/PageDebuggerAgent.h 2015-09-01 17:52:15 UTC (rev 189218)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2011 Google Inc. All rights reserved.
</span><ins>+ * Copyright (C) 2015 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 are
</span><span class="lines">@@ -46,7 +47,7 @@
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(PageDebuggerAgent);
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- PageDebuggerAgent(Inspector::InjectedScriptManager*, InstrumentingAgents*, InspectorPageAgent*, InspectorOverlay*);
</del><ins>+ PageDebuggerAgent(Inspector::InjectedScriptManager&, InstrumentingAgents&, InspectorPageAgent*, InspectorOverlay*);
</ins><span class="cx"> virtual ~PageDebuggerAgent() { }
</span><span class="cx">
</span><span class="cx"> void didClearMainFrameWindowObject();
</span><span class="lines">@@ -70,8 +71,9 @@
</span><span class="cx"> virtual Inspector::InjectedScript injectedScriptForEval(ErrorString&, const int* executionContextId) override;
</span><span class="cx"> virtual void setOverlayMessage(ErrorString&, const String*) override;
</span><span class="cx">
</span><del>- InspectorPageAgent* m_pageAgent;
- InspectorOverlay* m_overlay;
</del><ins>+ InspectorPageAgent* m_pageAgent { nullptr };
+
+ InspectorOverlay* m_overlay { nullptr };
</ins><span class="cx"> PageScriptDebugServer m_scriptDebugServer;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorPageRuntimeAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/PageRuntimeAgent.cpp (189217 => 189218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/PageRuntimeAgent.cpp 2015-09-01 17:44:35 UTC (rev 189217)
+++ trunk/Source/WebCore/inspector/PageRuntimeAgent.cpp 2015-09-01 17:52:15 UTC (rev 189218)
</span><span class="lines">@@ -52,11 +52,10 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-PageRuntimeAgent::PageRuntimeAgent(InjectedScriptManager* injectedScriptManager, Page* page, InspectorPageAgent* pageAgent)
</del><ins>+PageRuntimeAgent::PageRuntimeAgent(InjectedScriptManager& injectedScriptManager, Page* page, InspectorPageAgent* pageAgent)
</ins><span class="cx"> : InspectorRuntimeAgent(injectedScriptManager)
</span><del>- , m_inspectedPage(page)
</del><span class="cx"> , m_pageAgent(pageAgent)
</span><del>- , m_mainWorldContextCreated(false)
</del><ins>+ , m_inspectedPage(page)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -121,13 +120,13 @@
</span><span class="cx"> {
</span><span class="cx"> if (!executionContextId) {
</span><span class="cx"> JSC::ExecState* scriptState = mainWorldExecState(&m_inspectedPage->mainFrame());
</span><del>- InjectedScript result = injectedScriptManager()->injectedScriptFor(scriptState);
</del><ins>+ InjectedScript result = injectedScriptManager().injectedScriptFor(scriptState);
</ins><span class="cx"> if (result.hasNoValue())
</span><span class="cx"> errorString = ASCIILiteral("Internal error: main world execution context not found.");
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- InjectedScript injectedScript = injectedScriptManager()->injectedScriptForId(*executionContextId);
</del><ins>+ InjectedScript injectedScript = injectedScriptManager().injectedScriptForId(*executionContextId);
</ins><span class="cx"> if (injectedScript.hasNoValue())
</span><span class="cx"> errorString = ASCIILiteral("Execution context with given id not found.");
</span><span class="cx"> return injectedScript;
</span><span class="lines">@@ -166,11 +165,11 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(securityOrigin || isPageContext);
</span><span class="cx">
</span><del>- InjectedScript result = injectedScriptManager()->injectedScriptFor(scriptState);
</del><ins>+ InjectedScript result = injectedScriptManager().injectedScriptFor(scriptState);
</ins><span class="cx"> if (result.hasNoValue())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- int executionContextId = injectedScriptManager()->injectedScriptIdFor(scriptState);
</del><ins>+ int executionContextId = injectedScriptManager().injectedScriptIdFor(scriptState);
</ins><span class="cx"> String name = securityOrigin ? securityOrigin->toRawString() : String();
</span><span class="cx"> m_frontendDispatcher->executionContextCreated(ExecutionContextDescription::create()
</span><span class="cx"> .setId(executionContextId)
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorPageRuntimeAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/PageRuntimeAgent.h (189217 => 189218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/PageRuntimeAgent.h 2015-09-01 17:44:35 UTC (rev 189217)
+++ trunk/Source/WebCore/inspector/PageRuntimeAgent.h 2015-09-01 17:52:15 UTC (rev 189218)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> class PageRuntimeAgent final : public Inspector::InspectorRuntimeAgent {
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- PageRuntimeAgent(Inspector::InjectedScriptManager*, Page*, InspectorPageAgent*);
</del><ins>+ PageRuntimeAgent(Inspector::InjectedScriptManager&, Page*, InspectorPageAgent*);
</ins><span class="cx"> virtual ~PageRuntimeAgent() { }
</span><span class="cx">
</span><span class="cx"> virtual void didCreateFrontendAndBackend(Inspector::FrontendChannel*, Inspector::BackendDispatcher*) override;
</span><span class="lines">@@ -72,11 +72,13 @@
</span><span class="cx"> void reportExecutionContextCreation();
</span><span class="cx"> void notifyContextCreated(const String& frameId, JSC::ExecState*, SecurityOrigin*, bool isPageContext);
</span><span class="cx">
</span><del>- Page* m_inspectedPage;
- InspectorPageAgent* m_pageAgent;
</del><span class="cx"> std::unique_ptr<Inspector::RuntimeFrontendDispatcher> m_frontendDispatcher;
</span><span class="cx"> RefPtr<Inspector::RuntimeBackendDispatcher> m_backendDispatcher;
</span><del>- bool m_mainWorldContextCreated;
</del><ins>+ InspectorPageAgent* m_pageAgent;
+
+ Page* m_inspectedPage;
+
+ bool m_mainWorldContextCreated { false };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorWebConsoleAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/WebConsoleAgent.cpp (189217 => 189218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/WebConsoleAgent.cpp 2015-09-01 17:44:35 UTC (rev 189217)
+++ trunk/Source/WebCore/inspector/WebConsoleAgent.cpp 2015-09-01 17:52:15 UTC (rev 189218)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2014, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2011 Google Inc. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -41,9 +41,8 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-WebConsoleAgent::WebConsoleAgent(WebInjectedScriptManager* injectedScriptManager)
</del><ins>+WebConsoleAgent::WebConsoleAgent(WebInjectedScriptManager& injectedScriptManager)
</ins><span class="cx"> : InspectorConsoleAgent(injectedScriptManager)
</span><del>- , m_monitoringXHREnabled(false)
</del><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -64,12 +63,12 @@
</span><span class="cx"> m_consoleMessages[i]->clear();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- static_cast<WebInjectedScriptManager*>(m_injectedScriptManager)->discardInjectedScriptsFor(window);
</del><ins>+ static_cast<WebInjectedScriptManager&>(m_injectedScriptManager).discardInjectedScriptsFor(window);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebConsoleAgent::didFinishXHRLoading(unsigned long requestIdentifier, const String& url, const String& sendURL, unsigned sendLineNumber, unsigned sendColumnNumber)
</span><span class="cx"> {
</span><del>- if (!m_injectedScriptManager->inspectorEnvironment().developerExtrasEnabled())
</del><ins>+ if (!m_injectedScriptManager.inspectorEnvironment().developerExtrasEnabled())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (m_frontendDispatcher && m_monitoringXHREnabled) {
</span><span class="lines">@@ -80,7 +79,7 @@
</span><span class="cx">
</span><span class="cx"> void WebConsoleAgent::didReceiveResponse(unsigned long requestIdentifier, const ResourceResponse& response)
</span><span class="cx"> {
</span><del>- if (!m_injectedScriptManager->inspectorEnvironment().developerExtrasEnabled())
</del><ins>+ if (!m_injectedScriptManager.inspectorEnvironment().developerExtrasEnabled())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (response.httpStatusCode() >= 400) {
</span><span class="lines">@@ -91,7 +90,7 @@
</span><span class="cx">
</span><span class="cx"> void WebConsoleAgent::didFailLoading(unsigned long requestIdentifier, const ResourceError& error)
</span><span class="cx"> {
</span><del>- if (!m_injectedScriptManager->inspectorEnvironment().developerExtrasEnabled())
</del><ins>+ if (!m_injectedScriptManager.inspectorEnvironment().developerExtrasEnabled())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // Report failures only.
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorWebConsoleAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/WebConsoleAgent.h (189217 => 189218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/WebConsoleAgent.h 2015-09-01 17:44:35 UTC (rev 189217)
+++ trunk/Source/WebCore/inspector/WebConsoleAgent.h 2015-09-01 17:52:15 UTC (rev 189218)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2014, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2011 Google Inc. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(WebConsoleAgent);
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- WebConsoleAgent(WebInjectedScriptManager*);
</del><ins>+ WebConsoleAgent(WebInjectedScriptManager&);
</ins><span class="cx"> virtual ~WebConsoleAgent() { }
</span><span class="cx">
</span><span class="cx"> virtual void setMonitoringXHREnabled(ErrorString&, bool enabled) override final;
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> void didFailLoading(unsigned long requestIdentifier, const ResourceError&);
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- bool m_monitoringXHREnabled;
</del><ins>+ bool m_monitoringXHREnabled { false };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorWebDebuggerAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/WebDebuggerAgent.cpp (189217 => 189218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/WebDebuggerAgent.cpp 2015-09-01 17:44:35 UTC (rev 189217)
+++ trunk/Source/WebCore/inspector/WebDebuggerAgent.cpp 2015-09-01 17:52:15 UTC (rev 189218)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2014, 2015 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,7 +32,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-WebDebuggerAgent::WebDebuggerAgent(InjectedScriptManager* injectedScriptManager, InstrumentingAgents* instrumentingAgents)
</del><ins>+WebDebuggerAgent::WebDebuggerAgent(InjectedScriptManager& injectedScriptManager, InstrumentingAgents& instrumentingAgents)
</ins><span class="cx"> : InspectorDebuggerAgent(injectedScriptManager)
</span><span class="cx"> , m_instrumentingAgents(instrumentingAgents)
</span><span class="cx"> {
</span><span class="lines">@@ -41,13 +41,13 @@
</span><span class="cx"> void WebDebuggerAgent::enable()
</span><span class="cx"> {
</span><span class="cx"> InspectorDebuggerAgent::enable();
</span><del>- m_instrumentingAgents->setInspectorDebuggerAgent(this);
</del><ins>+ m_instrumentingAgents.setInspectorDebuggerAgent(this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebDebuggerAgent::disable(bool isBeingDestroyed)
</span><span class="cx"> {
</span><span class="cx"> InspectorDebuggerAgent::disable(isBeingDestroyed);
</span><del>- m_instrumentingAgents->setInspectorDebuggerAgent(nullptr);
</del><ins>+ m_instrumentingAgents.setInspectorDebuggerAgent(nullptr);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorWebDebuggerAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/WebDebuggerAgent.h (189217 => 189218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/WebDebuggerAgent.h 2015-09-01 17:44:35 UTC (rev 189217)
+++ trunk/Source/WebCore/inspector/WebDebuggerAgent.h 2015-09-01 17:52:15 UTC (rev 189218)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2014, 2015 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">@@ -37,14 +37,14 @@
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(WebDebuggerAgent);
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- WebDebuggerAgent(Inspector::InjectedScriptManager*, InstrumentingAgents*);
</del><ins>+ WebDebuggerAgent(Inspector::InjectedScriptManager&, InstrumentingAgents&);
</ins><span class="cx"> virtual ~WebDebuggerAgent() { }
</span><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> virtual void enable() override;
</span><span class="cx"> virtual void disable(bool isBeingDestroyed) override;
</span><span class="cx">
</span><del>- InstrumentingAgents* m_instrumentingAgents;
</del><ins>+ InstrumentingAgents& m_instrumentingAgents;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorWorkerConsoleAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/WorkerConsoleAgent.cpp (189217 => 189218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/WorkerConsoleAgent.cpp 2015-09-01 17:44:35 UTC (rev 189217)
+++ trunk/Source/WebCore/inspector/WorkerConsoleAgent.cpp 2015-09-01 17:52:15 UTC (rev 189218)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2011 Google Inc. All rights reserved.
</span><ins>+ * Copyright (C) 2015 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 are
</span><span class="lines">@@ -35,7 +36,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-WorkerConsoleAgent::WorkerConsoleAgent(WebInjectedScriptManager* injectedScriptManager)
</del><ins>+WorkerConsoleAgent::WorkerConsoleAgent(WebInjectedScriptManager& injectedScriptManager)
</ins><span class="cx"> : WebConsoleAgent(injectedScriptManager)
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorWorkerConsoleAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/WorkerConsoleAgent.h (189217 => 189218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/WorkerConsoleAgent.h 2015-09-01 17:44:35 UTC (rev 189217)
+++ trunk/Source/WebCore/inspector/WorkerConsoleAgent.h 2015-09-01 17:52:15 UTC (rev 189218)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2011 Google Inc. All rights reserved.
</span><ins>+ * Copyright (C) 2015 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 are
</span><span class="lines">@@ -39,7 +40,7 @@
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(WorkerConsoleAgent);
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- WorkerConsoleAgent(WebInjectedScriptManager*);
</del><ins>+ WorkerConsoleAgent(WebInjectedScriptManager&);
</ins><span class="cx"> virtual ~WorkerConsoleAgent() { }
</span><span class="cx">
</span><span class="cx"> virtual bool isWorkerAgent() const override { return true; }
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorWorkerDebuggerAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/WorkerDebuggerAgent.cpp (189217 => 189218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/WorkerDebuggerAgent.cpp 2015-09-01 17:44:35 UTC (rev 189217)
+++ trunk/Source/WebCore/inspector/WorkerDebuggerAgent.cpp 2015-09-01 17:52:15 UTC (rev 189218)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2011 Google Inc. All rights reserved.
</span><ins>+ * Copyright (C) 2015 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 are
</span><span class="lines">@@ -80,7 +81,7 @@
</span><span class="cx">
</span><span class="cx"> const char* WorkerDebuggerAgent::debuggerTaskMode = "debugger";
</span><span class="cx">
</span><del>-WorkerDebuggerAgent::WorkerDebuggerAgent(InjectedScriptManager* injectedScriptManager, InstrumentingAgents* instrumentingAgents, WorkerGlobalScope* inspectedWorkerGlobalScope)
</del><ins>+WorkerDebuggerAgent::WorkerDebuggerAgent(InjectedScriptManager& injectedScriptManager, InstrumentingAgents& instrumentingAgents, WorkerGlobalScope* inspectedWorkerGlobalScope)
</ins><span class="cx"> : WebDebuggerAgent(injectedScriptManager, instrumentingAgents)
</span><span class="cx"> , m_scriptDebugServer(inspectedWorkerGlobalScope, WorkerDebuggerAgent::debuggerTaskMode)
</span><span class="cx"> , m_inspectedWorkerGlobalScope(inspectedWorkerGlobalScope)
</span><span class="lines">@@ -133,7 +134,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSC::ExecState* scriptState = execStateFromWorkerGlobalScope(m_inspectedWorkerGlobalScope);
</span><del>- return injectedScriptManager()->injectedScriptFor(scriptState);
</del><ins>+ return injectedScriptManager().injectedScriptFor(scriptState);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WorkerDebuggerAgent::muteConsole()
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorWorkerDebuggerAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/WorkerDebuggerAgent.h (189217 => 189218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/WorkerDebuggerAgent.h 2015-09-01 17:44:35 UTC (rev 189217)
+++ trunk/Source/WebCore/inspector/WorkerDebuggerAgent.h 2015-09-01 17:52:15 UTC (rev 189218)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2011 Google Inc. All rights reserved.
</span><ins>+ * Copyright (C) 2015 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 are
</span><span class="lines">@@ -43,7 +44,7 @@
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(WorkerDebuggerAgent);
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- WorkerDebuggerAgent(Inspector::InjectedScriptManager*, InstrumentingAgents*, WorkerGlobalScope*);
</del><ins>+ WorkerDebuggerAgent(Inspector::InjectedScriptManager&, InstrumentingAgents&, WorkerGlobalScope*);
</ins><span class="cx"> virtual ~WorkerDebuggerAgent();
</span><span class="cx">
</span><span class="cx"> static const char* debuggerTaskMode;
</span><span class="lines">@@ -60,7 +61,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> WorkerScriptDebugServer m_scriptDebugServer;
</span><del>- WorkerGlobalScope* m_inspectedWorkerGlobalScope;
</del><ins>+ WorkerGlobalScope* m_inspectedWorkerGlobalScope { nullptr };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorWorkerInspectorControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/WorkerInspectorController.cpp (189217 => 189218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/WorkerInspectorController.cpp 2015-09-01 17:44:35 UTC (rev 189217)
+++ trunk/Source/WebCore/inspector/WorkerInspectorController.cpp 2015-09-01 17:52:15 UTC (rev 189218)
</span><span class="lines">@@ -79,18 +79,17 @@
</span><span class="cx"> : m_workerGlobalScope(workerGlobalScope)
</span><span class="cx"> , m_instrumentingAgents(InstrumentingAgents::create(*this))
</span><span class="cx"> , m_injectedScriptManager(std::make_unique<WebInjectedScriptManager>(*this, WebInjectedScriptHost::create()))
</span><del>- , m_runtimeAgent(nullptr)
</del><span class="cx"> , m_executionStopwatch(Stopwatch::create())
</span><span class="cx"> {
</span><del>- auto runtimeAgent = std::make_unique<WorkerRuntimeAgent>(m_injectedScriptManager.get(), &workerGlobalScope);
</del><ins>+ auto runtimeAgent = std::make_unique<WorkerRuntimeAgent>(*m_injectedScriptManager, &workerGlobalScope);
</ins><span class="cx"> m_runtimeAgent = runtimeAgent.get();
</span><span class="cx"> m_instrumentingAgents->setWorkerRuntimeAgent(m_runtimeAgent);
</span><span class="cx"> m_agents.append(WTF::move(runtimeAgent));
</span><span class="cx">
</span><del>- auto consoleAgent = std::make_unique<WorkerConsoleAgent>(m_injectedScriptManager.get());
</del><ins>+ auto consoleAgent = std::make_unique<WorkerConsoleAgent>(*m_injectedScriptManager);
</ins><span class="cx"> m_instrumentingAgents->setWebConsoleAgent(consoleAgent.get());
</span><span class="cx">
</span><del>- auto debuggerAgent = std::make_unique<WorkerDebuggerAgent>(m_injectedScriptManager.get(), m_instrumentingAgents.get(), &workerGlobalScope);
</del><ins>+ auto debuggerAgent = std::make_unique<WorkerDebuggerAgent>(*m_injectedScriptManager, m_instrumentingAgents.get(), &workerGlobalScope);
</ins><span class="cx"> m_runtimeAgent->setScriptDebugServer(&debuggerAgent->scriptDebugServer());
</span><span class="cx"> m_agents.append(WTF::move(debuggerAgent));
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorWorkerInspectorControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/WorkerInspectorController.h (189217 => 189218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/WorkerInspectorController.h 2015-09-01 17:44:35 UTC (rev 189217)
+++ trunk/Source/WebCore/inspector/WorkerInspectorController.h 2015-09-01 17:52:15 UTC (rev 189218)
</span><span class="lines">@@ -74,9 +74,9 @@
</span><span class="cx"> friend class InspectorInstrumentation;
</span><span class="cx">
</span><span class="cx"> WorkerGlobalScope& m_workerGlobalScope;
</span><del>- RefPtr<InstrumentingAgents> m_instrumentingAgents;
</del><ins>+ Ref<InstrumentingAgents> m_instrumentingAgents;
</ins><span class="cx"> std::unique_ptr<WebInjectedScriptManager> m_injectedScriptManager;
</span><del>- WorkerRuntimeAgent* m_runtimeAgent;
</del><ins>+ WorkerRuntimeAgent* m_runtimeAgent { nullptr };
</ins><span class="cx"> Inspector::AgentRegistry m_agents;
</span><span class="cx"> std::unique_ptr<Inspector::FrontendChannel> m_frontendChannel;
</span><span class="cx"> Ref<WTF::Stopwatch> m_executionStopwatch;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorWorkerRuntimeAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/WorkerRuntimeAgent.cpp (189217 => 189218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/WorkerRuntimeAgent.cpp 2015-09-01 17:44:35 UTC (rev 189217)
+++ trunk/Source/WebCore/inspector/WorkerRuntimeAgent.cpp 2015-09-01 17:52:15 UTC (rev 189218)
</span><span class="lines">@@ -46,10 +46,9 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-WorkerRuntimeAgent::WorkerRuntimeAgent(InjectedScriptManager* injectedScriptManager, WorkerGlobalScope* workerGlobalScope)
</del><ins>+WorkerRuntimeAgent::WorkerRuntimeAgent(InjectedScriptManager& injectedScriptManager, WorkerGlobalScope* workerGlobalScope)
</ins><span class="cx"> : InspectorRuntimeAgent(injectedScriptManager)
</span><span class="cx"> , m_workerGlobalScope(workerGlobalScope)
</span><del>- , m_paused(false)
</del><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -73,7 +72,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSC::ExecState* scriptState = execStateFromWorkerGlobalScope(m_workerGlobalScope);
</span><del>- return injectedScriptManager()->injectedScriptFor(scriptState);
</del><ins>+ return injectedScriptManager().injectedScriptFor(scriptState);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WorkerRuntimeAgent::muteConsole()
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorWorkerRuntimeAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/WorkerRuntimeAgent.h (189217 => 189218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/WorkerRuntimeAgent.h 2015-09-01 17:44:35 UTC (rev 189217)
+++ trunk/Source/WebCore/inspector/WorkerRuntimeAgent.h 2015-09-01 17:52:15 UTC (rev 189218)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx">
</span><span class="cx"> class WorkerRuntimeAgent final : public Inspector::InspectorRuntimeAgent {
</span><span class="cx"> public:
</span><del>- WorkerRuntimeAgent(Inspector::InjectedScriptManager*, WorkerGlobalScope*);
</del><ins>+ WorkerRuntimeAgent(Inspector::InjectedScriptManager&, WorkerGlobalScope*);
</ins><span class="cx"> virtual ~WorkerRuntimeAgent() { }
</span><span class="cx">
</span><span class="cx"> virtual void didCreateFrontendAndBackend(Inspector::FrontendChannel*, Inspector::BackendDispatcher*) override;
</span><span class="lines">@@ -55,9 +55,10 @@
</span><span class="cx"> virtual Inspector::InjectedScript injectedScriptForEval(ErrorString&, const int* executionContextId) override;
</span><span class="cx"> virtual void muteConsole() override;
</span><span class="cx"> virtual void unmuteConsole() override;
</span><del>- WorkerGlobalScope* m_workerGlobalScope;
</del><span class="cx"> RefPtr<Inspector::RuntimeBackendDispatcher> m_backendDispatcher;
</span><del>- bool m_paused;
</del><ins>+
+ WorkerGlobalScope* m_workerGlobalScope { nullptr };
+ bool m_paused { false };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre>
</div>
</div>
</body>
</html>