Diff
Modified: trunk/Source/WebCore/ChangeLog (161585 => 161586)
--- trunk/Source/WebCore/ChangeLog 2014-01-09 22:23:48 UTC (rev 161585)
+++ trunk/Source/WebCore/ChangeLog 2014-01-09 22:49:15 UTC (rev 161586)
@@ -1,3 +1,21 @@
+2014-01-09 Joseph Pecoraro <[email protected]>
+
+ Web Inspector: Remove Unnecessary InspectorAgent parameters
+ https://bugs.webkit.org/show_bug.cgi?id=126712
+
+ Reviewed by Timothy Hatcher.
+
+ * inspector/InspectorController.cpp:
+ (WebCore::InspectorController::InspectorController):
+ * inspector/InspectorDOMDebuggerAgent.cpp:
+ (WebCore::InspectorDOMDebuggerAgent::create):
+ (WebCore::InspectorDOMDebuggerAgent::InspectorDOMDebuggerAgent):
+ * inspector/InspectorDOMDebuggerAgent.h:
+ * inspector/InspectorPageAgent.cpp:
+ (WebCore::InspectorPageAgent::create):
+ (WebCore::InspectorPageAgent::InspectorPageAgent):
+ * inspector/InspectorPageAgent.h:
+
2014-01-09 Antti Koivisto <[email protected]>
Remove an accidentally left-behind static_cast.
Modified: trunk/Source/WebCore/inspector/InspectorController.cpp (161585 => 161586)
--- trunk/Source/WebCore/inspector/InspectorController.cpp 2014-01-09 22:23:48 UTC (rev 161585)
+++ trunk/Source/WebCore/inspector/InspectorController.cpp 2014-01-09 22:49:15 UTC (rev 161586)
@@ -100,7 +100,7 @@
m_inspectorAgent = inspectorAgentPtr.get();
m_agents.append(inspectorAgentPtr.release());
- OwnPtr<InspectorPageAgent> pageAgentPtr(InspectorPageAgent::create(m_instrumentingAgents.get(), page, m_inspectorAgent, inspectorClient, m_overlay.get()));
+ OwnPtr<InspectorPageAgent> pageAgentPtr(InspectorPageAgent::create(m_instrumentingAgents.get(), page, inspectorClient, m_overlay.get()));
InspectorPageAgent* pageAgent = pageAgentPtr.get();
m_pageAgent = pageAgentPtr.get();
m_agents.append(pageAgentPtr.release());
@@ -150,7 +150,7 @@
m_debuggerAgent = debuggerAgentPtr.get();
m_agents.append(debuggerAgentPtr.release());
- OwnPtr<InspectorDOMDebuggerAgent> domDebuggerAgentPtr(InspectorDOMDebuggerAgent::create(m_instrumentingAgents.get(), m_domAgent, m_debuggerAgent, m_inspectorAgent));
+ OwnPtr<InspectorDOMDebuggerAgent> domDebuggerAgentPtr(InspectorDOMDebuggerAgent::create(m_instrumentingAgents.get(), m_domAgent, m_debuggerAgent));
m_domDebuggerAgent = domDebuggerAgentPtr.get();
m_agents.append(domDebuggerAgentPtr.release());
Modified: trunk/Source/WebCore/inspector/InspectorDOMDebuggerAgent.cpp (161585 => 161586)
--- trunk/Source/WebCore/inspector/InspectorDOMDebuggerAgent.cpp 2014-01-09 22:23:48 UTC (rev 161585)
+++ trunk/Source/WebCore/inspector/InspectorDOMDebuggerAgent.cpp 2014-01-09 22:49:15 UTC (rev 161586)
@@ -35,7 +35,6 @@
#include "InspectorDOMDebuggerAgent.h"
#include "HTMLElement.h"
-#include "InspectorAgent.h"
#include "InspectorDOMAgent.h"
#include "InspectorDebuggerAgent.h"
#include "InspectorInstrumentation.h"
@@ -65,12 +64,12 @@
namespace WebCore {
-PassOwnPtr<InspectorDOMDebuggerAgent> InspectorDOMDebuggerAgent::create(InstrumentingAgents* instrumentingAgents, InspectorDOMAgent* domAgent, InspectorDebuggerAgent* debuggerAgent, InspectorAgent* inspectorAgent)
+PassOwnPtr<InspectorDOMDebuggerAgent> InspectorDOMDebuggerAgent::create(InstrumentingAgents* instrumentingAgents, InspectorDOMAgent* domAgent, InspectorDebuggerAgent* debuggerAgent)
{
- return adoptPtr(new InspectorDOMDebuggerAgent(instrumentingAgents, domAgent, debuggerAgent, inspectorAgent));
+ return adoptPtr(new InspectorDOMDebuggerAgent(instrumentingAgents, domAgent, debuggerAgent));
}
-InspectorDOMDebuggerAgent::InspectorDOMDebuggerAgent(InstrumentingAgents* instrumentingAgents, InspectorDOMAgent* domAgent, InspectorDebuggerAgent* debuggerAgent, InspectorAgent*)
+InspectorDOMDebuggerAgent::InspectorDOMDebuggerAgent(InstrumentingAgents* instrumentingAgents, InspectorDOMAgent* domAgent, InspectorDebuggerAgent* debuggerAgent)
: InspectorAgentBase(ASCIILiteral("DOMDebugger"), instrumentingAgents)
, m_domAgent(domAgent)
, m_debuggerAgent(debuggerAgent)
Modified: trunk/Source/WebCore/inspector/InspectorDOMDebuggerAgent.h (161585 => 161586)
--- trunk/Source/WebCore/inspector/InspectorDOMDebuggerAgent.h 2014-01-09 22:23:48 UTC (rev 161585)
+++ trunk/Source/WebCore/inspector/InspectorDOMDebuggerAgent.h 2014-01-09 22:49:15 UTC (rev 161586)
@@ -48,7 +48,6 @@
namespace WebCore {
class Element;
-class InspectorAgent;
class InspectorDOMAgent;
class InspectorDebuggerAgent;
class InstrumentingAgents;
@@ -59,7 +58,7 @@
class InspectorDOMDebuggerAgent : public InspectorAgentBase, public InspectorDebuggerAgent::Listener, public Inspector::InspectorDOMDebuggerBackendDispatcherHandler {
WTF_MAKE_NONCOPYABLE(InspectorDOMDebuggerAgent);
public:
- static PassOwnPtr<InspectorDOMDebuggerAgent> create(InstrumentingAgents*, InspectorDOMAgent*, InspectorDebuggerAgent*, InspectorAgent*);
+ static PassOwnPtr<InspectorDOMDebuggerAgent> create(InstrumentingAgents*, InspectorDOMAgent*, InspectorDebuggerAgent*);
virtual ~InspectorDOMDebuggerAgent();
@@ -88,7 +87,7 @@
virtual void discardAgent();
private:
- InspectorDOMDebuggerAgent(InstrumentingAgents*, InspectorDOMAgent*, InspectorDebuggerAgent*, InspectorAgent*);
+ InspectorDOMDebuggerAgent(InstrumentingAgents*, InspectorDOMAgent*, InspectorDebuggerAgent*);
// InspectorDebuggerAgent::Listener implementation.
virtual void debuggerWasEnabled();
Modified: trunk/Source/WebCore/inspector/InspectorPageAgent.cpp (161585 => 161586)
--- trunk/Source/WebCore/inspector/InspectorPageAgent.cpp 2014-01-09 22:23:48 UTC (rev 161585)
+++ trunk/Source/WebCore/inspector/InspectorPageAgent.cpp 2014-01-09 22:49:15 UTC (rev 161586)
@@ -56,7 +56,6 @@
#include "HTMLNames.h"
#include "IdentifiersFactory.h"
#include "ImageBuffer.h"
-#include "InspectorAgent.h"
#include "InspectorClient.h"
#include "InspectorDOMAgent.h"
#include "InspectorInstrumentation.h"
@@ -226,9 +225,9 @@
return decodeBuffer(data, size, textEncodingName, result);
}
-PassOwnPtr<InspectorPageAgent> InspectorPageAgent::create(InstrumentingAgents* instrumentingAgents, Page* page, InspectorAgent* inspectorAgent, InspectorClient* client, InspectorOverlay* overlay)
+PassOwnPtr<InspectorPageAgent> InspectorPageAgent::create(InstrumentingAgents* instrumentingAgents, Page* page, InspectorClient* client, InspectorOverlay* overlay)
{
- return adoptPtr(new InspectorPageAgent(instrumentingAgents, page, inspectorAgent, client, overlay));
+ return adoptPtr(new InspectorPageAgent(instrumentingAgents, page, client, overlay));
}
// static
@@ -348,10 +347,9 @@
return resourceTypeJson(cachedResourceType(cachedResource));
}
-InspectorPageAgent::InspectorPageAgent(InstrumentingAgents* instrumentingAgents, Page* page, InspectorAgent* inspectorAgent, InspectorClient* client, InspectorOverlay* overlay)
+InspectorPageAgent::InspectorPageAgent(InstrumentingAgents* instrumentingAgents, Page* page, InspectorClient* client, InspectorOverlay* overlay)
: InspectorAgentBase(ASCIILiteral("Page"), instrumentingAgents)
, m_page(page)
- , m_inspectorAgent(inspectorAgent)
, m_client(client)
, m_overlay(overlay)
, m_lastScriptIdentifier(0)
Modified: trunk/Source/WebCore/inspector/InspectorPageAgent.h (161585 => 161586)
--- trunk/Source/WebCore/inspector/InspectorPageAgent.h 2014-01-09 22:23:48 UTC (rev 161585)
+++ trunk/Source/WebCore/inspector/InspectorPageAgent.h 2014-01-09 22:49:15 UTC (rev 161586)
@@ -56,7 +56,6 @@
class Frame;
class Frontend;
class GraphicsContext;
-class InspectorAgent;
class InspectorClient;
class InspectorOverlay;
class InstrumentingAgents;
@@ -82,7 +81,7 @@
OtherResource
};
- static PassOwnPtr<InspectorPageAgent> create(InstrumentingAgents*, Page*, InspectorAgent*, InspectorClient*, InspectorOverlay*);
+ static PassOwnPtr<InspectorPageAgent> create(InstrumentingAgents*, Page*, InspectorClient*, InspectorOverlay*);
static bool cachedResourceContent(CachedResource*, String* result, bool* base64Encoded);
static bool sharedBufferContent(PassRefPtr<SharedBuffer>, const String& textEncodingName, bool withBase64Encode, String* result);
@@ -165,7 +164,7 @@
static DocumentLoader* assertDocumentLoader(ErrorString*, Frame*);
private:
- InspectorPageAgent(InstrumentingAgents*, Page*, InspectorAgent*, InspectorClient*, InspectorOverlay*);
+ InspectorPageAgent(InstrumentingAgents*, Page*, InspectorClient*, InspectorOverlay*);
#if ENABLE(TOUCH_EVENTS)
void updateTouchEventEmulationInPage(bool);
#endif
@@ -176,7 +175,6 @@
PassRefPtr<Inspector::TypeBuilder::Page::Frame> buildObjectForFrame(Frame*);
PassRefPtr<Inspector::TypeBuilder::Page::FrameResourceTree> buildObjectForFrameTree(Frame*);
Page* m_page;
- InspectorAgent* m_inspectorAgent;
InspectorClient* m_client;
std::unique_ptr<Inspector::InspectorPageFrontendDispatcher> m_frontendDispatcher;
RefPtr<Inspector::InspectorPageBackendDispatcher> m_backendDispatcher;
