Diff
Modified: trunk/Source/WebCore/ChangeLog (161587 => 161588)
--- 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)
@@ -1,5 +1,48 @@
2014-01-09 Joseph Pecoraro <[email protected]>
+ 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 <[email protected]>
+
Web Inspector: Remove Unnecessary InspectorAgent parameters
https://bugs.webkit.org/show_bug.cgi?id=126712
Modified: trunk/Source/WebCore/inspector/InspectorAgent.cpp (161587 => 161588)
--- 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)
@@ -35,8 +35,6 @@
#include "InspectorAgent.h"
#include "InstrumentingAgents.h"
-#include "Page.h"
-#include "Settings.h"
#include <bindings/ScriptValue.h>
#include <inspector/InspectorJSFrontendDispatchers.h>
#include <inspector/InspectorValues.h>
@@ -47,12 +45,10 @@
namespace WebCore {
-InspectorAgent::InspectorAgent(Page* page, InstrumentingAgents* instrumentingAgents)
+InspectorAgent::InspectorAgent(InstrumentingAgents* instrumentingAgents)
: InspectorAgentBase(ASCIILiteral("Inspector"), instrumentingAgents)
- , m_inspectedPage(page)
, m_enabled(false)
{
- ASSERT_ARG(page, page);
m_instrumentingAgents->setInspectorAgent(this);
}
@@ -115,13 +111,6 @@
m_pendingInspectData.second = hints;
}
-bool InspectorAgent::developerExtrasEnabled() const
-{
- if (!m_inspectedPage)
- return false;
- return m_inspectedPage->settings().developerExtrasEnabled();
-}
-
} // namespace WebCore
#endif // ENABLE(INSPECTOR)
Modified: trunk/Source/WebCore/inspector/InspectorAgent.h (161587 => 161588)
--- 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)
@@ -44,26 +44,20 @@
namespace WebCore {
-class DOMWrapperWorld;
-class DocumentLoader;
-class Frame;
class InstrumentingAgents;
-class Page;
typedef String ErrorString;
class InspectorAgent : public InspectorAgentBase, public Inspector::InspectorInspectorBackendDispatcherHandler {
WTF_MAKE_NONCOPYABLE(InspectorAgent);
public:
- static PassOwnPtr<InspectorAgent> create(Page* page, InstrumentingAgents* instrumentingAgents)
+ static PassOwnPtr<InspectorAgent> create(InstrumentingAgents* instrumentingAgents)
{
- return adoptPtr(new InspectorAgent(page, instrumentingAgents));
+ return adoptPtr(new InspectorAgent(instrumentingAgents));
}
virtual ~InspectorAgent();
- bool developerExtrasEnabled() const;
-
// Inspector front-end API.
void enable(ErrorString*);
void disable(ErrorString*);
@@ -77,15 +71,12 @@
void inspect(PassRefPtr<Inspector::TypeBuilder::Runtime::RemoteObject> objectToInspect, PassRefPtr<Inspector::InspectorObject> hints);
private:
- InspectorAgent(Page*, InstrumentingAgents*);
+ InspectorAgent(InstrumentingAgents*);
- Page* m_inspectedPage;
std::unique_ptr<Inspector::InspectorInspectorFrontendDispatcher> m_frontendDispatcher;
RefPtr<Inspector::InspectorInspectorBackendDispatcher> m_backendDispatcher;
-
Vector<std::pair<long, String>> m_pendingEvaluateTestCommands;
std::pair<RefPtr<Inspector::TypeBuilder::Runtime::RemoteObject>, RefPtr<Inspector::InspectorObject>> m_pendingInspectData;
-
bool m_enabled;
};
Modified: trunk/Source/WebCore/inspector/InspectorConsoleAgent.cpp (161587 => 161588)
--- 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)
@@ -141,7 +141,7 @@
void InspectorConsoleAgent::addMessageToConsole(MessageSource source, MessageType type, MessageLevel level, const String& message, PassRefPtr<ScriptCallStack> callStack, unsigned long requestIdentifier)
{
- if (!developerExtrasEnabled())
+ if (!m_instrumentingAgents->inspectorEnvironment().developerExtrasEnabled())
return;
if (type == ClearMessageType) {
@@ -154,7 +154,7 @@
void InspectorConsoleAgent::addMessageToConsole(MessageSource source, MessageType type, MessageLevel level, const String& message, JSC::ExecState* state, PassRefPtr<ScriptArguments> arguments, unsigned long requestIdentifier)
{
- if (!developerExtrasEnabled())
+ if (!m_instrumentingAgents->inspectorEnvironment().developerExtrasEnabled())
return;
if (type == ClearMessageType) {
@@ -167,7 +167,7 @@
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)
{
- if (!developerExtrasEnabled())
+ if (!m_instrumentingAgents->inspectorEnvironment().developerExtrasEnabled())
return;
if (type == ClearMessageType) {
@@ -251,7 +251,7 @@
void InspectorConsoleAgent::didFinishXHRLoading(unsigned long requestIdentifier, const String& url, const String& sendURL, unsigned sendLineNumber, unsigned sendColumnNumber)
{
- if (!developerExtrasEnabled())
+ if (!m_instrumentingAgents->inspectorEnvironment().developerExtrasEnabled())
return;
if (m_frontendDispatcher && m_monitoringXHREnabled) {
String message = "XHR finished loading: \"" + url + "\".";
@@ -261,7 +261,7 @@
void InspectorConsoleAgent::didReceiveResponse(unsigned long requestIdentifier, const ResourceResponse& response)
{
- if (!developerExtrasEnabled())
+ if (!m_instrumentingAgents->inspectorEnvironment().developerExtrasEnabled())
return;
if (response.httpStatusCode() >= 400) {
@@ -272,7 +272,7 @@
void InspectorConsoleAgent::didFailLoading(unsigned long requestIdentifier, const ResourceError& error)
{
- if (!developerExtrasEnabled())
+ if (!m_instrumentingAgents->inspectorEnvironment().developerExtrasEnabled())
return;
if (error.isCancellation()) // Report failures only.
return;
@@ -299,7 +299,7 @@
void InspectorConsoleAgent::addConsoleMessage(PassOwnPtr<ConsoleMessage> consoleMessage)
{
- ASSERT(developerExtrasEnabled());
+ ASSERT(m_instrumentingAgents->inspectorEnvironment().developerExtrasEnabled());
ASSERT_ARG(consoleMessage, consoleMessage);
if (m_previousMessage && !isGroupMessage(m_previousMessage->type()) && m_previousMessage->isEqual(consoleMessage.get())) {
Modified: trunk/Source/WebCore/inspector/InspectorConsoleAgent.h (161587 => 161588)
--- 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)
@@ -98,8 +98,6 @@
protected:
void addConsoleMessage(PassOwnPtr<ConsoleMessage>);
- virtual bool developerExtrasEnabled() = 0;
-
PageInjectedScriptManager* m_injectedScriptManager;
std::unique_ptr<Inspector::InspectorConsoleFrontendDispatcher> m_frontendDispatcher;
RefPtr<Inspector::InspectorConsoleBackendDispatcher> m_backendDispatcher;
Modified: trunk/Source/WebCore/inspector/InspectorController.cpp (161587 => 161588)
--- 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)
@@ -83,7 +83,7 @@
namespace WebCore {
InspectorController::InspectorController(Page* page, InspectorClient* inspectorClient)
- : m_instrumentingAgents(InstrumentingAgents::create())
+ : m_instrumentingAgents(InstrumentingAgents::create(*this))
, m_injectedScriptManager(std::make_unique<PageInjectedScriptManager>(*this, PageInjectedScriptHost::create()))
, m_overlay(InspectorOverlay::create(page, inspectorClient))
, m_inspectorFrontendChannel(nullptr)
@@ -96,7 +96,7 @@
{
ASSERT_ARG(inspectorClient, inspectorClient);
- OwnPtr<InspectorAgent> inspectorAgentPtr(InspectorAgent::create(page, m_instrumentingAgents.get()));
+ OwnPtr<InspectorAgent> inspectorAgentPtr(InspectorAgent::create(m_instrumentingAgents.get()));
m_inspectorAgent = inspectorAgentPtr.get();
m_agents.append(inspectorAgentPtr.release());
@@ -362,7 +362,7 @@
bool InspectorController::enabled() const
{
- return m_inspectorAgent->developerExtrasEnabled();
+ return developerExtrasEnabled();
}
Page* InspectorController::inspectedPage() const
Modified: trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp (161587 => 161588)
--- 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)
@@ -614,8 +614,7 @@
void InspectorInstrumentation::didLoadResourceFromMemoryCacheImpl(InstrumentingAgents* instrumentingAgents, DocumentLoader* loader, CachedResource* cachedResource)
{
- InspectorAgent* inspectorAgent = instrumentingAgents->inspectorAgent();
- if (!inspectorAgent || !inspectorAgent->developerExtrasEnabled())
+ if (!instrumentingAgents->inspectorEnvironment().developerExtrasEnabled())
return;
if (InspectorResourceAgent* resourceAgent = instrumentingAgents->inspectorResourceAgent())
resourceAgent->didLoadResourceFromMemoryCache(loader, cachedResource);
@@ -817,8 +816,7 @@
void InspectorInstrumentation::didCommitLoadImpl(InstrumentingAgents* instrumentingAgents, Page* page, DocumentLoader* loader)
{
- InspectorAgent* inspectorAgent = instrumentingAgents->inspectorAgent();
- if (!inspectorAgent || !inspectorAgent->developerExtrasEnabled())
+ if (!instrumentingAgents->inspectorEnvironment().developerExtrasEnabled())
return;
if (loader->frame()->isMainFrame()) {
@@ -856,10 +854,8 @@
void InspectorInstrumentation::frameDocumentUpdatedImpl(InstrumentingAgents* instrumentingAgents, Frame* frame)
{
- InspectorAgent* inspectorAgent = instrumentingAgents->inspectorAgent();
- if (!inspectorAgent || !inspectorAgent->developerExtrasEnabled())
+ if (!instrumentingAgents->inspectorEnvironment().developerExtrasEnabled())
return;
-
if (InspectorDOMAgent* domAgent = instrumentingAgents->inspectorDOMAgent())
domAgent->frameDocumentUpdated(frame);
}
@@ -1026,8 +1022,7 @@
#if ENABLE(SQL_DATABASE)
void InspectorInstrumentation::didOpenDatabaseImpl(InstrumentingAgents* instrumentingAgents, PassRefPtr<Database> database, const String& domain, const String& name, const String& version)
{
- InspectorAgent* inspectorAgent = instrumentingAgents->inspectorAgent();
- if (!inspectorAgent || !inspectorAgent->developerExtrasEnabled())
+ if (!instrumentingAgents->inspectorEnvironment().developerExtrasEnabled())
return;
if (InspectorDatabaseAgent* dbAgent = instrumentingAgents->inspectorDatabaseAgent())
dbAgent->didOpenDatabase(database, domain, name, version);
@@ -1075,8 +1070,7 @@
#if ENABLE(WEB_SOCKETS)
void InspectorInstrumentation::didCreateWebSocketImpl(InstrumentingAgents* instrumentingAgents, unsigned long identifier, const URL& requestURL, const URL&, const String& protocol, Document* document)
{
- InspectorAgent* inspectorAgent = instrumentingAgents->inspectorAgent();
- if (!inspectorAgent || !inspectorAgent->developerExtrasEnabled())
+ if (!instrumentingAgents->inspectorEnvironment().developerExtrasEnabled())
return;
if (InspectorResourceAgent* resourceAgent = instrumentingAgents->inspectorResourceAgent())
resourceAgent->didCreateWebSocket(identifier, requestURL);
Modified: trunk/Source/WebCore/inspector/InstrumentingAgents.cpp (161587 => 161588)
--- 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)
@@ -29,11 +29,10 @@
*/
#include "config.h"
+#include "InstrumentingAgents.h"
#if ENABLE(INSPECTOR)
-#include "InstrumentingAgents.h"
-
#include "InspectorController.h"
#include "Page.h"
#include "WorkerGlobalScope.h"
@@ -44,8 +43,9 @@
namespace WebCore {
-InstrumentingAgents::InstrumentingAgents()
- : m_inspectorAgent(0)
+InstrumentingAgents::InstrumentingAgents(InspectorEnvironment& environment)
+ : m_environment(environment)
+ , m_inspectorAgent(0)
, m_inspectorPageAgent(0)
, m_inspectorCSSAgent(0)
#if USE(ACCELERATED_COMPOSITING)
Modified: trunk/Source/WebCore/inspector/InstrumentingAgents.h (161587 => 161588)
--- 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)
@@ -31,6 +31,7 @@
#ifndef InstrumentingAgents_h
#define InstrumentingAgents_h
+#include <inspector/InspectorEnvironment.h>
#include <wtf/FastMalloc.h>
#include <wtf/Noncopyable.h>
#include <wtf/PassRefPtr.h>
@@ -65,13 +66,15 @@
WTF_MAKE_NONCOPYABLE(InstrumentingAgents);
WTF_MAKE_FAST_ALLOCATED;
public:
- static PassRefPtr<InstrumentingAgents> create()
+ static PassRefPtr<InstrumentingAgents> create(Inspector::InspectorEnvironment& environment)
{
- return adoptRef(new InstrumentingAgents());
+ return adoptRef(new InstrumentingAgents(environment));
}
~InstrumentingAgents() { }
void reset();
+ Inspector::InspectorEnvironment& inspectorEnvironment() const { return m_environment; }
+
InspectorAgent* inspectorAgent() const { return m_inspectorAgent; }
void setInspectorAgent(InspectorAgent* agent) { m_inspectorAgent = agent; }
@@ -139,8 +142,10 @@
#endif
private:
- InstrumentingAgents();
+ InstrumentingAgents(Inspector::InspectorEnvironment&);
+ Inspector::InspectorEnvironment& m_environment;
+
InspectorAgent* m_inspectorAgent;
InspectorPageAgent* m_inspectorPageAgent;
InspectorCSSAgent* m_inspectorCSSAgent;
Modified: trunk/Source/WebCore/inspector/PageConsoleAgent.cpp (161587 => 161588)
--- 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)
@@ -86,11 +86,6 @@
commandLineAPIHost->addInspectedObject(adoptPtr(new InspectableNode(node)));
}
-bool PageConsoleAgent::developerExtrasEnabled()
-{
- return m_inspectorAgent->developerExtrasEnabled();
-}
-
} // namespace WebCore
#endif // ENABLE(INSPECTOR)
Modified: trunk/Source/WebCore/inspector/PageConsoleAgent.h (161587 => 161588)
--- 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)
@@ -56,7 +56,6 @@
PageConsoleAgent(InstrumentingAgents*, InspectorAgent*, PageInjectedScriptManager*, InspectorDOMAgent*);
virtual void clearMessages(ErrorString*);
virtual void addInspectedNode(ErrorString*, int nodeId);
- virtual bool developerExtrasEnabled();
InspectorAgent* m_inspectorAgent;
InspectorDOMAgent* m_inspectorDOMAgent;
Modified: trunk/Source/WebCore/inspector/WorkerConsoleAgent.cpp (161587 => 161588)
--- 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)
@@ -52,11 +52,6 @@
*error = "addInspectedNode is not supported for workers";
}
-bool WorkerConsoleAgent::developerExtrasEnabled()
-{
- return true;
-}
-
} // namespace WebCore
#endif // ENABLE(INSPECTOR)
Modified: trunk/Source/WebCore/inspector/WorkerConsoleAgent.h (161587 => 161588)
--- 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)
@@ -52,7 +52,6 @@
private:
WorkerConsoleAgent(InstrumentingAgents*, PageInjectedScriptManager*);
virtual void addInspectedNode(ErrorString*, int nodeId);
- virtual bool developerExtrasEnabled();
};
} // namespace WebCore
Modified: trunk/Source/WebCore/inspector/WorkerInspectorController.cpp (161587 => 161588)
--- 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)
@@ -81,7 +81,7 @@
WorkerInspectorController::WorkerInspectorController(WorkerGlobalScope* workerGlobalScope)
: m_workerGlobalScope(workerGlobalScope)
- , m_instrumentingAgents(InstrumentingAgents::create())
+ , m_instrumentingAgents(InstrumentingAgents::create(*this))
, m_injectedScriptManager(std::make_unique<PageInjectedScriptManager>(*this, PageInjectedScriptHost::create()))
, m_runtimeAgent(0)
{
