<!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>[161588] trunk/Source/WebCore</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/161588">161588</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-01-09 14:53:22 -0800 (Thu, 09 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Consolidate developerExtrasEnabled to just InspectorEnvironment
https://bugs.webkit.org/show_bug.cgi?id=126717
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2014-01-09
Reviewed by Timothy Hatcher.
They all route to InspectorEnvironment::developerExtrasEnabled, so make
InspectorEnvironment available to all agents through InstrumentingAgents
and use that where needed.
* inspector/InspectorAgent.cpp:
(WebCore::InspectorAgent::InspectorAgent):
* inspector/InspectorAgent.h:
(WebCore::InspectorAgent::create):
* inspector/InspectorConsoleAgent.cpp:
(WebCore::InspectorConsoleAgent::addMessageToConsole):
(WebCore::InspectorConsoleAgent::didFinishXHRLoading):
(WebCore::InspectorConsoleAgent::didReceiveResponse):
(WebCore::InspectorConsoleAgent::didFailLoading):
(WebCore::InspectorConsoleAgent::addConsoleMessage):
* inspector/InspectorConsoleAgent.h:
* inspector/InspectorController.cpp:
(WebCore::InspectorController::InspectorController):
(WebCore::InspectorController::enabled):
* inspector/InspectorInstrumentation.cpp:
(WebCore::InspectorInstrumentation::didLoadResourceFromMemoryCacheImpl):
(WebCore::InspectorInstrumentation::didCommitLoadImpl):
(WebCore::InspectorInstrumentation::frameDocumentUpdatedImpl):
(WebCore::InspectorInstrumentation::didOpenDatabaseImpl):
(WebCore::InspectorInstrumentation::didCreateWebSocketImpl):
* inspector/InstrumentingAgents.cpp:
(WebCore::InstrumentingAgents::InstrumentingAgents):
* inspector/InstrumentingAgents.h:
(WebCore::InstrumentingAgents::create):
(WebCore::InstrumentingAgents::inspectorEnvironment):
* inspector/PageConsoleAgent.cpp:
* inspector/PageConsoleAgent.h:
* inspector/WorkerConsoleAgent.cpp:
* inspector/WorkerConsoleAgent.h:
* inspector/WorkerInspectorController.cpp:
(WebCore::WorkerInspectorController::WorkerInspectorController):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorAgentcpp">trunk/Source/WebCore/inspector/InspectorAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorAgenth">trunk/Source/WebCore/inspector/InspectorAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorConsoleAgentcpp">trunk/Source/WebCore/inspector/InspectorConsoleAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorConsoleAgenth">trunk/Source/WebCore/inspector/InspectorConsoleAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorControllercpp">trunk/Source/WebCore/inspector/InspectorController.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorInstrumentationcpp">trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp</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="#trunkSourceWebCoreinspectorWorkerConsoleAgentcpp">trunk/Source/WebCore/inspector/WorkerConsoleAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorWorkerConsoleAgenth">trunk/Source/WebCore/inspector/WorkerConsoleAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorWorkerInspectorControllercpp">trunk/Source/WebCore/inspector/WorkerInspectorController.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161587 => 161588)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-09 22:51:49 UTC (rev 161587)
+++ trunk/Source/WebCore/ChangeLog 2014-01-09 22:53:22 UTC (rev 161588)
</span><span class="lines">@@ -1,5 +1,48 @@
</span><span class="cx"> 2014-01-09 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><ins>+ Web Inspector: Consolidate developerExtrasEnabled to just InspectorEnvironment
+ https://bugs.webkit.org/show_bug.cgi?id=126717
+
+ Reviewed by Timothy Hatcher.
+
+ They all route to InspectorEnvironment::developerExtrasEnabled, so make
+ InspectorEnvironment available to all agents through InstrumentingAgents
+ and use that where needed.
+
+ * inspector/InspectorAgent.cpp:
+ (WebCore::InspectorAgent::InspectorAgent):
+ * inspector/InspectorAgent.h:
+ (WebCore::InspectorAgent::create):
+ * inspector/InspectorConsoleAgent.cpp:
+ (WebCore::InspectorConsoleAgent::addMessageToConsole):
+ (WebCore::InspectorConsoleAgent::didFinishXHRLoading):
+ (WebCore::InspectorConsoleAgent::didReceiveResponse):
+ (WebCore::InspectorConsoleAgent::didFailLoading):
+ (WebCore::InspectorConsoleAgent::addConsoleMessage):
+ * inspector/InspectorConsoleAgent.h:
+ * inspector/InspectorController.cpp:
+ (WebCore::InspectorController::InspectorController):
+ (WebCore::InspectorController::enabled):
+ * inspector/InspectorInstrumentation.cpp:
+ (WebCore::InspectorInstrumentation::didLoadResourceFromMemoryCacheImpl):
+ (WebCore::InspectorInstrumentation::didCommitLoadImpl):
+ (WebCore::InspectorInstrumentation::frameDocumentUpdatedImpl):
+ (WebCore::InspectorInstrumentation::didOpenDatabaseImpl):
+ (WebCore::InspectorInstrumentation::didCreateWebSocketImpl):
+ * inspector/InstrumentingAgents.cpp:
+ (WebCore::InstrumentingAgents::InstrumentingAgents):
+ * inspector/InstrumentingAgents.h:
+ (WebCore::InstrumentingAgents::create):
+ (WebCore::InstrumentingAgents::inspectorEnvironment):
+ * inspector/PageConsoleAgent.cpp:
+ * inspector/PageConsoleAgent.h:
+ * inspector/WorkerConsoleAgent.cpp:
+ * inspector/WorkerConsoleAgent.h:
+ * inspector/WorkerInspectorController.cpp:
+ (WebCore::WorkerInspectorController::WorkerInspectorController):
+
+2014-01-09 Joseph Pecoraro <pecoraro@apple.com>
+
</ins><span class="cx"> Web Inspector: Remove Unnecessary InspectorAgent parameters
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=126712
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorAgent.cpp (161587 => 161588)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorAgent.cpp 2014-01-09 22:51:49 UTC (rev 161587)
+++ trunk/Source/WebCore/inspector/InspectorAgent.cpp 2014-01-09 22:53:22 UTC (rev 161588)
</span><span class="lines">@@ -35,8 +35,6 @@
</span><span class="cx"> #include "InspectorAgent.h"
</span><span class="cx">
</span><span class="cx"> #include "InstrumentingAgents.h"
</span><del>-#include "Page.h"
-#include "Settings.h"
</del><span class="cx"> #include <bindings/ScriptValue.h>
</span><span class="cx"> #include <inspector/InspectorJSFrontendDispatchers.h>
</span><span class="cx"> #include <inspector/InspectorValues.h>
</span><span class="lines">@@ -47,12 +45,10 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-InspectorAgent::InspectorAgent(Page* page, InstrumentingAgents* instrumentingAgents)
</del><ins>+InspectorAgent::InspectorAgent(InstrumentingAgents* instrumentingAgents)
</ins><span class="cx"> : InspectorAgentBase(ASCIILiteral("Inspector"), instrumentingAgents)
</span><del>- , m_inspectedPage(page)
</del><span class="cx"> , m_enabled(false)
</span><span class="cx"> {
</span><del>- ASSERT_ARG(page, page);
</del><span class="cx"> m_instrumentingAgents->setInspectorAgent(this);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -115,13 +111,6 @@
</span><span class="cx"> m_pendingInspectData.second = hints;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool InspectorAgent::developerExtrasEnabled() const
-{
- if (!m_inspectedPage)
- return false;
- return m_inspectedPage->settings().developerExtrasEnabled();
-}
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(INSPECTOR)
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorAgent.h (161587 => 161588)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorAgent.h 2014-01-09 22:51:49 UTC (rev 161587)
+++ trunk/Source/WebCore/inspector/InspectorAgent.h 2014-01-09 22:53:22 UTC (rev 161588)
</span><span class="lines">@@ -44,26 +44,20 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class DOMWrapperWorld;
-class DocumentLoader;
-class Frame;
</del><span class="cx"> class InstrumentingAgents;
</span><del>-class Page;
</del><span class="cx">
</span><span class="cx"> typedef String ErrorString;
</span><span class="cx">
</span><span class="cx"> class InspectorAgent : public InspectorAgentBase, public Inspector::InspectorInspectorBackendDispatcherHandler {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(InspectorAgent);
</span><span class="cx"> public:
</span><del>- static PassOwnPtr<InspectorAgent> create(Page* page, InstrumentingAgents* instrumentingAgents)
</del><ins>+ static PassOwnPtr<InspectorAgent> create(InstrumentingAgents* instrumentingAgents)
</ins><span class="cx"> {
</span><del>- return adoptPtr(new InspectorAgent(page, instrumentingAgents));
</del><ins>+ return adoptPtr(new InspectorAgent(instrumentingAgents));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> virtual ~InspectorAgent();
</span><span class="cx">
</span><del>- bool developerExtrasEnabled() const;
-
</del><span class="cx"> // Inspector front-end API.
</span><span class="cx"> void enable(ErrorString*);
</span><span class="cx"> void disable(ErrorString*);
</span><span class="lines">@@ -77,15 +71,12 @@
</span><span class="cx"> void inspect(PassRefPtr<Inspector::TypeBuilder::Runtime::RemoteObject> objectToInspect, PassRefPtr<Inspector::InspectorObject> hints);
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- InspectorAgent(Page*, InstrumentingAgents*);
</del><ins>+ InspectorAgent(InstrumentingAgents*);
</ins><span class="cx">
</span><del>- Page* m_inspectedPage;
</del><span class="cx"> std::unique_ptr<Inspector::InspectorInspectorFrontendDispatcher> m_frontendDispatcher;
</span><span class="cx"> RefPtr<Inspector::InspectorInspectorBackendDispatcher> m_backendDispatcher;
</span><del>-
</del><span class="cx"> Vector<std::pair<long, String>> m_pendingEvaluateTestCommands;
</span><span class="cx"> std::pair<RefPtr<Inspector::TypeBuilder::Runtime::RemoteObject>, RefPtr<Inspector::InspectorObject>> m_pendingInspectData;
</span><del>-
</del><span class="cx"> bool m_enabled;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorConsoleAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorConsoleAgent.cpp (161587 => 161588)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorConsoleAgent.cpp 2014-01-09 22:51:49 UTC (rev 161587)
+++ trunk/Source/WebCore/inspector/InspectorConsoleAgent.cpp 2014-01-09 22:53:22 UTC (rev 161588)
</span><span class="lines">@@ -141,7 +141,7 @@
</span><span class="cx">
</span><span class="cx"> void InspectorConsoleAgent::addMessageToConsole(MessageSource source, MessageType type, MessageLevel level, const String& message, PassRefPtr<ScriptCallStack> callStack, unsigned long requestIdentifier)
</span><span class="cx"> {
</span><del>- if (!developerExtrasEnabled())
</del><ins>+ if (!m_instrumentingAgents->inspectorEnvironment().developerExtrasEnabled())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (type == ClearMessageType) {
</span><span class="lines">@@ -154,7 +154,7 @@
</span><span class="cx">
</span><span class="cx"> void InspectorConsoleAgent::addMessageToConsole(MessageSource source, MessageType type, MessageLevel level, const String& message, JSC::ExecState* state, PassRefPtr<ScriptArguments> arguments, unsigned long requestIdentifier)
</span><span class="cx"> {
</span><del>- if (!developerExtrasEnabled())
</del><ins>+ if (!m_instrumentingAgents->inspectorEnvironment().developerExtrasEnabled())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (type == ClearMessageType) {
</span><span class="lines">@@ -167,7 +167,7 @@
</span><span class="cx">
</span><span class="cx"> void InspectorConsoleAgent::addMessageToConsole(MessageSource source, MessageType type, MessageLevel level, const String& message, const String& scriptID, unsigned lineNumber, unsigned columnNumber, JSC::ExecState* state, unsigned long requestIdentifier)
</span><span class="cx"> {
</span><del>- if (!developerExtrasEnabled())
</del><ins>+ if (!m_instrumentingAgents->inspectorEnvironment().developerExtrasEnabled())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (type == ClearMessageType) {
</span><span class="lines">@@ -251,7 +251,7 @@
</span><span class="cx">
</span><span class="cx"> void InspectorConsoleAgent::didFinishXHRLoading(unsigned long requestIdentifier, const String& url, const String& sendURL, unsigned sendLineNumber, unsigned sendColumnNumber)
</span><span class="cx"> {
</span><del>- if (!developerExtrasEnabled())
</del><ins>+ if (!m_instrumentingAgents->inspectorEnvironment().developerExtrasEnabled())
</ins><span class="cx"> return;
</span><span class="cx"> if (m_frontendDispatcher && m_monitoringXHREnabled) {
</span><span class="cx"> String message = "XHR finished loading: \"" + url + "\".";
</span><span class="lines">@@ -261,7 +261,7 @@
</span><span class="cx">
</span><span class="cx"> void InspectorConsoleAgent::didReceiveResponse(unsigned long requestIdentifier, const ResourceResponse& response)
</span><span class="cx"> {
</span><del>- if (!developerExtrasEnabled())
</del><ins>+ if (!m_instrumentingAgents->inspectorEnvironment().developerExtrasEnabled())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (response.httpStatusCode() >= 400) {
</span><span class="lines">@@ -272,7 +272,7 @@
</span><span class="cx">
</span><span class="cx"> void InspectorConsoleAgent::didFailLoading(unsigned long requestIdentifier, const ResourceError& error)
</span><span class="cx"> {
</span><del>- if (!developerExtrasEnabled())
</del><ins>+ if (!m_instrumentingAgents->inspectorEnvironment().developerExtrasEnabled())
</ins><span class="cx"> return;
</span><span class="cx"> if (error.isCancellation()) // Report failures only.
</span><span class="cx"> return;
</span><span class="lines">@@ -299,7 +299,7 @@
</span><span class="cx">
</span><span class="cx"> void InspectorConsoleAgent::addConsoleMessage(PassOwnPtr<ConsoleMessage> consoleMessage)
</span><span class="cx"> {
</span><del>- ASSERT(developerExtrasEnabled());
</del><ins>+ ASSERT(m_instrumentingAgents->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></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorConsoleAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorConsoleAgent.h (161587 => 161588)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorConsoleAgent.h 2014-01-09 22:51:49 UTC (rev 161587)
+++ trunk/Source/WebCore/inspector/InspectorConsoleAgent.h 2014-01-09 22:53:22 UTC (rev 161588)
</span><span class="lines">@@ -98,8 +98,6 @@
</span><span class="cx"> protected:
</span><span class="cx"> void addConsoleMessage(PassOwnPtr<ConsoleMessage>);
</span><span class="cx">
</span><del>- virtual bool developerExtrasEnabled() = 0;
-
</del><span class="cx"> PageInjectedScriptManager* m_injectedScriptManager;
</span><span class="cx"> std::unique_ptr<Inspector::InspectorConsoleFrontendDispatcher> m_frontendDispatcher;
</span><span class="cx"> RefPtr<Inspector::InspectorConsoleBackendDispatcher> m_backendDispatcher;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorController.cpp (161587 => 161588)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorController.cpp 2014-01-09 22:51:49 UTC (rev 161587)
+++ trunk/Source/WebCore/inspector/InspectorController.cpp 2014-01-09 22:53:22 UTC (rev 161588)
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> InspectorController::InspectorController(Page* page, InspectorClient* inspectorClient)
</span><del>- : m_instrumentingAgents(InstrumentingAgents::create())
</del><ins>+ : m_instrumentingAgents(InstrumentingAgents::create(*this))
</ins><span class="cx"> , m_injectedScriptManager(std::make_unique<PageInjectedScriptManager>(*this, PageInjectedScriptHost::create()))
</span><span class="cx"> , m_overlay(InspectorOverlay::create(page, inspectorClient))
</span><span class="cx"> , m_inspectorFrontendChannel(nullptr)
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT_ARG(inspectorClient, inspectorClient);
</span><span class="cx">
</span><del>- OwnPtr<InspectorAgent> inspectorAgentPtr(InspectorAgent::create(page, m_instrumentingAgents.get()));
</del><ins>+ OwnPtr<InspectorAgent> inspectorAgentPtr(InspectorAgent::create(m_instrumentingAgents.get()));
</ins><span class="cx"> m_inspectorAgent = inspectorAgentPtr.get();
</span><span class="cx"> m_agents.append(inspectorAgentPtr.release());
</span><span class="cx">
</span><span class="lines">@@ -362,7 +362,7 @@
</span><span class="cx">
</span><span class="cx"> bool InspectorController::enabled() const
</span><span class="cx"> {
</span><del>- return m_inspectorAgent->developerExtrasEnabled();
</del><ins>+ return developerExtrasEnabled();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Page* InspectorController::inspectedPage() const
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorInstrumentationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp (161587 => 161588)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp 2014-01-09 22:51:49 UTC (rev 161587)
+++ trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp 2014-01-09 22:53:22 UTC (rev 161588)
</span><span class="lines">@@ -614,8 +614,7 @@
</span><span class="cx">
</span><span class="cx"> void InspectorInstrumentation::didLoadResourceFromMemoryCacheImpl(InstrumentingAgents* instrumentingAgents, DocumentLoader* loader, CachedResource* cachedResource)
</span><span class="cx"> {
</span><del>- InspectorAgent* inspectorAgent = instrumentingAgents->inspectorAgent();
- if (!inspectorAgent || !inspectorAgent->developerExtrasEnabled())
</del><ins>+ if (!instrumentingAgents->inspectorEnvironment().developerExtrasEnabled())
</ins><span class="cx"> return;
</span><span class="cx"> if (InspectorResourceAgent* resourceAgent = instrumentingAgents->inspectorResourceAgent())
</span><span class="cx"> resourceAgent->didLoadResourceFromMemoryCache(loader, cachedResource);
</span><span class="lines">@@ -817,8 +816,7 @@
</span><span class="cx">
</span><span class="cx"> void InspectorInstrumentation::didCommitLoadImpl(InstrumentingAgents* instrumentingAgents, Page* page, DocumentLoader* loader)
</span><span class="cx"> {
</span><del>- InspectorAgent* inspectorAgent = instrumentingAgents->inspectorAgent();
- if (!inspectorAgent || !inspectorAgent->developerExtrasEnabled())
</del><ins>+ if (!instrumentingAgents->inspectorEnvironment().developerExtrasEnabled())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (loader->frame()->isMainFrame()) {
</span><span class="lines">@@ -856,10 +854,8 @@
</span><span class="cx">
</span><span class="cx"> void InspectorInstrumentation::frameDocumentUpdatedImpl(InstrumentingAgents* instrumentingAgents, Frame* frame)
</span><span class="cx"> {
</span><del>- InspectorAgent* inspectorAgent = instrumentingAgents->inspectorAgent();
- if (!inspectorAgent || !inspectorAgent->developerExtrasEnabled())
</del><ins>+ if (!instrumentingAgents->inspectorEnvironment().developerExtrasEnabled())
</ins><span class="cx"> return;
</span><del>-
</del><span class="cx"> if (InspectorDOMAgent* domAgent = instrumentingAgents->inspectorDOMAgent())
</span><span class="cx"> domAgent->frameDocumentUpdated(frame);
</span><span class="cx"> }
</span><span class="lines">@@ -1026,8 +1022,7 @@
</span><span class="cx"> #if ENABLE(SQL_DATABASE)
</span><span class="cx"> void InspectorInstrumentation::didOpenDatabaseImpl(InstrumentingAgents* instrumentingAgents, PassRefPtr<Database> database, const String& domain, const String& name, const String& version)
</span><span class="cx"> {
</span><del>- InspectorAgent* inspectorAgent = instrumentingAgents->inspectorAgent();
- if (!inspectorAgent || !inspectorAgent->developerExtrasEnabled())
</del><ins>+ if (!instrumentingAgents->inspectorEnvironment().developerExtrasEnabled())
</ins><span class="cx"> return;
</span><span class="cx"> if (InspectorDatabaseAgent* dbAgent = instrumentingAgents->inspectorDatabaseAgent())
</span><span class="cx"> dbAgent->didOpenDatabase(database, domain, name, version);
</span><span class="lines">@@ -1075,8 +1070,7 @@
</span><span class="cx"> #if ENABLE(WEB_SOCKETS)
</span><span class="cx"> void InspectorInstrumentation::didCreateWebSocketImpl(InstrumentingAgents* instrumentingAgents, unsigned long identifier, const URL& requestURL, const URL&, const String& protocol, Document* document)
</span><span class="cx"> {
</span><del>- InspectorAgent* inspectorAgent = instrumentingAgents->inspectorAgent();
- if (!inspectorAgent || !inspectorAgent->developerExtrasEnabled())
</del><ins>+ if (!instrumentingAgents->inspectorEnvironment().developerExtrasEnabled())
</ins><span class="cx"> return;
</span><span class="cx"> if (InspectorResourceAgent* resourceAgent = instrumentingAgents->inspectorResourceAgent())
</span><span class="cx"> resourceAgent->didCreateWebSocket(identifier, requestURL);
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInstrumentingAgentscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InstrumentingAgents.cpp (161587 => 161588)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InstrumentingAgents.cpp 2014-01-09 22:51:49 UTC (rev 161587)
+++ trunk/Source/WebCore/inspector/InstrumentingAgents.cpp 2014-01-09 22:53:22 UTC (rev 161588)
</span><span class="lines">@@ -29,11 +29,10 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><ins>+#include "InstrumentingAgents.h"
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx">
</span><del>-#include "InstrumentingAgents.h"
-
</del><span class="cx"> #include "InspectorController.h"
</span><span class="cx"> #include "Page.h"
</span><span class="cx"> #include "WorkerGlobalScope.h"
</span><span class="lines">@@ -44,8 +43,9 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-InstrumentingAgents::InstrumentingAgents()
- : m_inspectorAgent(0)
</del><ins>+InstrumentingAgents::InstrumentingAgents(InspectorEnvironment& environment)
+ : m_environment(environment)
+ , m_inspectorAgent(0)
</ins><span class="cx"> , m_inspectorPageAgent(0)
</span><span class="cx"> , m_inspectorCSSAgent(0)
</span><span class="cx"> #if USE(ACCELERATED_COMPOSITING)
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInstrumentingAgentsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InstrumentingAgents.h (161587 => 161588)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InstrumentingAgents.h 2014-01-09 22:51:49 UTC (rev 161587)
+++ trunk/Source/WebCore/inspector/InstrumentingAgents.h 2014-01-09 22:53:22 UTC (rev 161588)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #ifndef InstrumentingAgents_h
</span><span class="cx"> #define InstrumentingAgents_h
</span><span class="cx">
</span><ins>+#include <inspector/InspectorEnvironment.h>
</ins><span class="cx"> #include <wtf/FastMalloc.h>
</span><span class="cx"> #include <wtf/Noncopyable.h>
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="lines">@@ -65,13 +66,15 @@
</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()
</del><ins>+ static PassRefPtr<InstrumentingAgents> create(Inspector::InspectorEnvironment& environment)
</ins><span class="cx"> {
</span><del>- return adoptRef(new InstrumentingAgents());
</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="cx">
</span><ins>+ Inspector::InspectorEnvironment& inspectorEnvironment() const { return m_environment; }
+
</ins><span class="cx"> InspectorAgent* inspectorAgent() const { return m_inspectorAgent; }
</span><span class="cx"> void setInspectorAgent(InspectorAgent* agent) { m_inspectorAgent = agent; }
</span><span class="cx">
</span><span class="lines">@@ -139,8 +142,10 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- InstrumentingAgents();
</del><ins>+ InstrumentingAgents(Inspector::InspectorEnvironment&);
</ins><span class="cx">
</span><ins>+ Inspector::InspectorEnvironment& m_environment;
+
</ins><span class="cx"> InspectorAgent* m_inspectorAgent;
</span><span class="cx"> InspectorPageAgent* m_inspectorPageAgent;
</span><span class="cx"> InspectorCSSAgent* m_inspectorCSSAgent;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorPageConsoleAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/PageConsoleAgent.cpp (161587 => 161588)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/PageConsoleAgent.cpp 2014-01-09 22:51:49 UTC (rev 161587)
+++ trunk/Source/WebCore/inspector/PageConsoleAgent.cpp 2014-01-09 22:53:22 UTC (rev 161588)
</span><span class="lines">@@ -86,11 +86,6 @@
</span><span class="cx"> commandLineAPIHost->addInspectedObject(adoptPtr(new InspectableNode(node)));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool PageConsoleAgent::developerExtrasEnabled()
-{
- return m_inspectorAgent->developerExtrasEnabled();
-}
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(INSPECTOR)
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorPageConsoleAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/PageConsoleAgent.h (161587 => 161588)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/PageConsoleAgent.h 2014-01-09 22:51:49 UTC (rev 161587)
+++ trunk/Source/WebCore/inspector/PageConsoleAgent.h 2014-01-09 22:53:22 UTC (rev 161588)
</span><span class="lines">@@ -56,7 +56,6 @@
</span><span class="cx"> PageConsoleAgent(InstrumentingAgents*, InspectorAgent*, PageInjectedScriptManager*, InspectorDOMAgent*);
</span><span class="cx"> virtual void clearMessages(ErrorString*);
</span><span class="cx"> virtual void addInspectedNode(ErrorString*, int nodeId);
</span><del>- virtual bool developerExtrasEnabled();
</del><span class="cx">
</span><span class="cx"> InspectorAgent* m_inspectorAgent;
</span><span class="cx"> InspectorDOMAgent* m_inspectorDOMAgent;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorWorkerConsoleAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/WorkerConsoleAgent.cpp (161587 => 161588)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/WorkerConsoleAgent.cpp 2014-01-09 22:51:49 UTC (rev 161587)
+++ trunk/Source/WebCore/inspector/WorkerConsoleAgent.cpp 2014-01-09 22:53:22 UTC (rev 161588)
</span><span class="lines">@@ -52,11 +52,6 @@
</span><span class="cx"> *error = "addInspectedNode is not supported for workers";
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool WorkerConsoleAgent::developerExtrasEnabled()
-{
- return true;
-}
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(INSPECTOR)
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorWorkerConsoleAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/WorkerConsoleAgent.h (161587 => 161588)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/WorkerConsoleAgent.h 2014-01-09 22:51:49 UTC (rev 161587)
+++ trunk/Source/WebCore/inspector/WorkerConsoleAgent.h 2014-01-09 22:53:22 UTC (rev 161588)
</span><span class="lines">@@ -52,7 +52,6 @@
</span><span class="cx"> private:
</span><span class="cx"> WorkerConsoleAgent(InstrumentingAgents*, PageInjectedScriptManager*);
</span><span class="cx"> virtual void addInspectedNode(ErrorString*, int nodeId);
</span><del>- virtual bool developerExtrasEnabled();
</del><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 (161587 => 161588)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/WorkerInspectorController.cpp 2014-01-09 22:51:49 UTC (rev 161587)
+++ trunk/Source/WebCore/inspector/WorkerInspectorController.cpp 2014-01-09 22:53:22 UTC (rev 161588)
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx">
</span><span class="cx"> WorkerInspectorController::WorkerInspectorController(WorkerGlobalScope* workerGlobalScope)
</span><span class="cx"> : m_workerGlobalScope(workerGlobalScope)
</span><del>- , m_instrumentingAgents(InstrumentingAgents::create())
</del><ins>+ , m_instrumentingAgents(InstrumentingAgents::create(*this))
</ins><span class="cx"> , m_injectedScriptManager(std::make_unique<PageInjectedScriptManager>(*this, PageInjectedScriptHost::create()))
</span><span class="cx"> , m_runtimeAgent(0)
</span><span class="cx"> {
</span></span></pre>
</div>
</div>
</body>
</html>