<!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>[161586] 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/161586">161586</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-01-09 14:49:15 -0800 (Thu, 09 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Remove Unnecessary InspectorAgent parameters
https://bugs.webkit.org/show_bug.cgi?id=126712
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2014-01-09
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:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorControllercpp">trunk/Source/WebCore/inspector/InspectorController.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorDOMDebuggerAgentcpp">trunk/Source/WebCore/inspector/InspectorDOMDebuggerAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorDOMDebuggerAgenth">trunk/Source/WebCore/inspector/InspectorDOMDebuggerAgent.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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161585 => 161586)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-01-09 Joseph Pecoraro <pecoraro@apple.com>
+
+ 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:
+
</ins><span class="cx"> 2014-01-09 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove an accidentally left-behind static_cast.
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorController.cpp (161585 => 161586)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -100,7 +100,7 @@
</span><span class="cx"> m_inspectorAgent = inspectorAgentPtr.get();
</span><span class="cx"> m_agents.append(inspectorAgentPtr.release());
</span><span class="cx">
</span><del>- OwnPtr<InspectorPageAgent> pageAgentPtr(InspectorPageAgent::create(m_instrumentingAgents.get(), page, m_inspectorAgent, inspectorClient, m_overlay.get()));
</del><ins>+ OwnPtr<InspectorPageAgent> pageAgentPtr(InspectorPageAgent::create(m_instrumentingAgents.get(), page, inspectorClient, m_overlay.get()));
</ins><span class="cx"> InspectorPageAgent* pageAgent = pageAgentPtr.get();
</span><span class="cx"> m_pageAgent = pageAgentPtr.get();
</span><span class="cx"> m_agents.append(pageAgentPtr.release());
</span><span class="lines">@@ -150,7 +150,7 @@
</span><span class="cx"> m_debuggerAgent = debuggerAgentPtr.get();
</span><span class="cx"> m_agents.append(debuggerAgentPtr.release());
</span><span class="cx">
</span><del>- OwnPtr<InspectorDOMDebuggerAgent> domDebuggerAgentPtr(InspectorDOMDebuggerAgent::create(m_instrumentingAgents.get(), m_domAgent, m_debuggerAgent, m_inspectorAgent));
</del><ins>+ OwnPtr<InspectorDOMDebuggerAgent> domDebuggerAgentPtr(InspectorDOMDebuggerAgent::create(m_instrumentingAgents.get(), m_domAgent, m_debuggerAgent));
</ins><span class="cx"> m_domDebuggerAgent = domDebuggerAgentPtr.get();
</span><span class="cx"> m_agents.append(domDebuggerAgentPtr.release());
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDOMDebuggerAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDOMDebuggerAgent.cpp (161585 => 161586)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -35,7 +35,6 @@
</span><span class="cx"> #include "InspectorDOMDebuggerAgent.h"
</span><span class="cx">
</span><span class="cx"> #include "HTMLElement.h"
</span><del>-#include "InspectorAgent.h"
</del><span class="cx"> #include "InspectorDOMAgent.h"
</span><span class="cx"> #include "InspectorDebuggerAgent.h"
</span><span class="cx"> #include "InspectorInstrumentation.h"
</span><span class="lines">@@ -65,12 +64,12 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-PassOwnPtr<InspectorDOMDebuggerAgent> InspectorDOMDebuggerAgent::create(InstrumentingAgents* instrumentingAgents, InspectorDOMAgent* domAgent, InspectorDebuggerAgent* debuggerAgent, InspectorAgent* inspectorAgent)
</del><ins>+PassOwnPtr<InspectorDOMDebuggerAgent> InspectorDOMDebuggerAgent::create(InstrumentingAgents* instrumentingAgents, InspectorDOMAgent* domAgent, InspectorDebuggerAgent* debuggerAgent)
</ins><span class="cx"> {
</span><del>- return adoptPtr(new InspectorDOMDebuggerAgent(instrumentingAgents, domAgent, debuggerAgent, inspectorAgent));
</del><ins>+ return adoptPtr(new InspectorDOMDebuggerAgent(instrumentingAgents, domAgent, debuggerAgent));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-InspectorDOMDebuggerAgent::InspectorDOMDebuggerAgent(InstrumentingAgents* instrumentingAgents, InspectorDOMAgent* domAgent, InspectorDebuggerAgent* debuggerAgent, InspectorAgent*)
</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></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDOMDebuggerAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDOMDebuggerAgent.h (161585 => 161586)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -48,7 +48,6 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class Element;
</span><del>-class InspectorAgent;
</del><span class="cx"> class InspectorDOMAgent;
</span><span class="cx"> class InspectorDebuggerAgent;
</span><span class="cx"> class InstrumentingAgents;
</span><span class="lines">@@ -59,7 +58,7 @@
</span><span class="cx"> class InspectorDOMDebuggerAgent : public InspectorAgentBase, public InspectorDebuggerAgent::Listener, public Inspector::InspectorDOMDebuggerBackendDispatcherHandler {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(InspectorDOMDebuggerAgent);
</span><span class="cx"> public:
</span><del>- static PassOwnPtr<InspectorDOMDebuggerAgent> create(InstrumentingAgents*, InspectorDOMAgent*, InspectorDebuggerAgent*, InspectorAgent*);
</del><ins>+ static PassOwnPtr<InspectorDOMDebuggerAgent> create(InstrumentingAgents*, InspectorDOMAgent*, InspectorDebuggerAgent*);
</ins><span class="cx">
</span><span class="cx"> virtual ~InspectorDOMDebuggerAgent();
</span><span class="cx">
</span><span class="lines">@@ -88,7 +87,7 @@
</span><span class="cx"> virtual void discardAgent();
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- InspectorDOMDebuggerAgent(InstrumentingAgents*, InspectorDOMAgent*, InspectorDebuggerAgent*, InspectorAgent*);
</del><ins>+ InspectorDOMDebuggerAgent(InstrumentingAgents*, InspectorDOMAgent*, InspectorDebuggerAgent*);
</ins><span class="cx">
</span><span class="cx"> // InspectorDebuggerAgent::Listener implementation.
</span><span class="cx"> virtual void debuggerWasEnabled();
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorPageAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorPageAgent.cpp (161585 => 161586)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -56,7 +56,6 @@
</span><span class="cx"> #include "HTMLNames.h"
</span><span class="cx"> #include "IdentifiersFactory.h"
</span><span class="cx"> #include "ImageBuffer.h"
</span><del>-#include "InspectorAgent.h"
</del><span class="cx"> #include "InspectorClient.h"
</span><span class="cx"> #include "InspectorDOMAgent.h"
</span><span class="cx"> #include "InspectorInstrumentation.h"
</span><span class="lines">@@ -226,9 +225,9 @@
</span><span class="cx"> return decodeBuffer(data, size, textEncodingName, result);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassOwnPtr<InspectorPageAgent> InspectorPageAgent::create(InstrumentingAgents* instrumentingAgents, Page* page, InspectorAgent* inspectorAgent, InspectorClient* client, InspectorOverlay* overlay)
</del><ins>+PassOwnPtr<InspectorPageAgent> InspectorPageAgent::create(InstrumentingAgents* instrumentingAgents, Page* page, InspectorClient* client, InspectorOverlay* overlay)
</ins><span class="cx"> {
</span><del>- return adoptPtr(new InspectorPageAgent(instrumentingAgents, page, inspectorAgent, client, overlay));
</del><ins>+ return adoptPtr(new InspectorPageAgent(instrumentingAgents, page, client, overlay));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // static
</span><span class="lines">@@ -348,10 +347,9 @@
</span><span class="cx"> return resourceTypeJson(cachedResourceType(cachedResource));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-InspectorPageAgent::InspectorPageAgent(InstrumentingAgents* instrumentingAgents, Page* page, InspectorAgent* inspectorAgent, 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><del>- , m_inspectorAgent(inspectorAgent)
</del><span class="cx"> , m_client(client)
</span><span class="cx"> , m_overlay(overlay)
</span><span class="cx"> , m_lastScriptIdentifier(0)
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorPageAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorPageAgent.h (161585 => 161586)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -56,7 +56,6 @@
</span><span class="cx"> class Frame;
</span><span class="cx"> class Frontend;
</span><span class="cx"> class GraphicsContext;
</span><del>-class InspectorAgent;
</del><span class="cx"> class InspectorClient;
</span><span class="cx"> class InspectorOverlay;
</span><span class="cx"> class InstrumentingAgents;
</span><span class="lines">@@ -82,7 +81,7 @@
</span><span class="cx"> OtherResource
</span><span class="cx"> };
</span><span class="cx">
</span><del>- static PassOwnPtr<InspectorPageAgent> create(InstrumentingAgents*, Page*, InspectorAgent*, InspectorClient*, InspectorOverlay*);
</del><ins>+ static PassOwnPtr<InspectorPageAgent> create(InstrumentingAgents*, Page*, InspectorClient*, InspectorOverlay*);
</ins><span class="cx">
</span><span class="cx"> static bool cachedResourceContent(CachedResource*, String* result, bool* base64Encoded);
</span><span class="cx"> static bool sharedBufferContent(PassRefPtr<SharedBuffer>, const String& textEncodingName, bool withBase64Encode, String* result);
</span><span class="lines">@@ -165,7 +164,7 @@
</span><span class="cx"> static DocumentLoader* assertDocumentLoader(ErrorString*, Frame*);
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- InspectorPageAgent(InstrumentingAgents*, Page*, InspectorAgent*, InspectorClient*, InspectorOverlay*);
</del><ins>+ InspectorPageAgent(InstrumentingAgents*, Page*, InspectorClient*, InspectorOverlay*);
</ins><span class="cx"> #if ENABLE(TOUCH_EVENTS)
</span><span class="cx"> void updateTouchEventEmulationInPage(bool);
</span><span class="cx"> #endif
</span><span class="lines">@@ -176,7 +175,6 @@
</span><span class="cx"> PassRefPtr<Inspector::TypeBuilder::Page::Frame> buildObjectForFrame(Frame*);
</span><span class="cx"> PassRefPtr<Inspector::TypeBuilder::Page::FrameResourceTree> buildObjectForFrameTree(Frame*);
</span><span class="cx"> Page* m_page;
</span><del>- InspectorAgent* m_inspectorAgent;
</del><span class="cx"> InspectorClient* m_client;
</span><span class="cx"> std::unique_ptr<Inspector::InspectorPageFrontendDispatcher> m_frontendDispatcher;
</span><span class="cx"> RefPtr<Inspector::InspectorPageBackendDispatcher> m_backendDispatcher;
</span></span></pre>
</div>
</div>
</body>
</html>