[webkit-changes] [148933] trunk/Source/WebCore

[jberlin]

Title: [148933] trunk/Source/WebCore

Revision

148933

Author

jber...@webkit.org

Date

2013-04-22 16:50:41 -0700 (Mon, 22 Apr 2013)

Log Message

Debug build fix.

Rubber-stamped by Ryosuke Niwa.

* inspector/InspectorController.cpp:
(WebCore::InspectorController::InspectorController):
* inspector/InspectorMemoryAgent.cpp:
(WebCore::InspectorMemoryAgent::InspectorMemoryAgent):
* inspector/InspectorMemoryAgent.h:
(WebCore):
(WebCore::InspectorMemoryAgent::create):
(InspectorMemoryAgent):

Modified Paths

• trunk/Source/WebCore/ChangeLog
• trunk/Source/WebCore/inspector/InspectorController.cpp
• trunk/Source/WebCore/inspector/InspectorMemoryAgent.cpp
• trunk/Source/WebCore/inspector/InspectorMemoryAgent.h

Diff

Modified: trunk/Source/WebCore/ChangeLog (148932 => 148933)

--- trunk/Source/WebCore/ChangeLog	2013-04-22 23:42:25 UTC (rev 148932)
+++ trunk/Source/WebCore/ChangeLog	2013-04-22 23:50:41 UTC (rev 148933)
@@ -1,3 +1,18 @@
+2013-04-22  Jessie Berlin  <jber...@apple.com>
+
+        Debug build fix.
+
+        Rubber-stamped by Ryosuke Niwa.
+
+        * inspector/InspectorController.cpp:
+        (WebCore::InspectorController::InspectorController):
+        * inspector/InspectorMemoryAgent.cpp:
+        (WebCore::InspectorMemoryAgent::InspectorMemoryAgent):
+        * inspector/InspectorMemoryAgent.h:
+        (WebCore):
+        (WebCore::InspectorMemoryAgent::create):
+        (InspectorMemoryAgent):
+
 2013-04-22  Brady Eidson  <beid...@apple.com>
 
         Address review feedback I forgot to address in r148929

Modified: trunk/Source/WebCore/inspector/InspectorController.cpp (148932 => 148933)

--- trunk/Source/WebCore/inspector/InspectorController.cpp	2013-04-22 23:42:25 UTC (rev 148932)
+++ trunk/Source/WebCore/inspector/InspectorController.cpp	2013-04-22 23:50:41 UTC (rev 148933)
@@ -120,7 +120,7 @@
     InspectorDOMStorageAgent* domStorageAgent = domStorageAgentPtr.get();
     m_agents.append(domStorageAgentPtr.release());
 
-    OwnPtr<InspectorMemoryAgent> memoryAgentPtr(InspectorMemoryAgent::create(m_instrumentingAgents.get(), inspectorClient, m_state.get(), m_page));
+    OwnPtr<InspectorMemoryAgent> memoryAgentPtr(InspectorMemoryAgent::create(m_instrumentingAgents.get(), m_state.get()));
     m_memoryAgent = memoryAgentPtr.get();
     m_agents.append(memoryAgentPtr.release());
 

Modified: trunk/Source/WebCore/inspector/InspectorMemoryAgent.cpp (148932 => 148933)

--- trunk/Source/WebCore/inspector/InspectorMemoryAgent.cpp	2013-04-22 23:42:25 UTC (rev 148932)
+++ trunk/Source/WebCore/inspector/InspectorMemoryAgent.cpp	2013-04-22 23:50:41 UTC (rev 148933)
@@ -39,7 +39,6 @@
 #include "Document.h"
 #include "EventListenerMap.h"
 #include "Frame.h"
-#include "InspectorClient.h"
 #include "InspectorDOMStorageAgent.h"
 #include "InspectorFrontend.h"
 #include "InspectorState.h"
@@ -49,7 +48,6 @@
 #include "MemoryUsageSupport.h"
 #include "Node.h"
 #include "NodeTraversal.h"
-#include "Page.h"
 #include "ScriptGCEvent.h"
 #include "ScriptProfiler.h"
 #include "StyledElement.h"
@@ -80,9 +78,8 @@
     *jsEventListeners = ThreadLocalInspectorCounters::current().counterValue(ThreadLocalInspectorCounters::JSEventListenerCounter);
 }
 
-InspectorMemoryAgent::InspectorMemoryAgent(InstrumentingAgents* instrumentingAgents, InspectorClient* client, InspectorCompositeState* state, Page* page)
+InspectorMemoryAgent::InspectorMemoryAgent(InstrumentingAgents* instrumentingAgents, InspectorCompositeState* state)
     : InspectorBaseAgent<InspectorMemoryAgent>("Memory", instrumentingAgents, state)
-    , m_page(page)
     , m_frontend(0)
 {
 }

Modified: trunk/Source/WebCore/inspector/InspectorMemoryAgent.h (148932 => 148933)

--- trunk/Source/WebCore/inspector/InspectorMemoryAgent.h	2013-04-22 23:42:25 UTC (rev 148932)
+++ trunk/Source/WebCore/inspector/InspectorMemoryAgent.h	2013-04-22 23:50:41 UTC (rev 148933)
@@ -40,11 +40,9 @@
 
 namespace WebCore {
 
-class InspectorClient;
 class InspectorDOMStorageAgent;
 class InspectorState;
 class InstrumentingAgents;
-class Page;
 
 typedef String ErrorString;
 
@@ -53,9 +51,9 @@
 public:
     typedef Vector<OwnPtr<InspectorBaseAgentInterface> > InspectorAgents;
 
-    static PassOwnPtr<InspectorMemoryAgent> create(InstrumentingAgents* instrumentingAgents, InspectorClient* client, InspectorCompositeState* state, Page* page)
+    static PassOwnPtr<InspectorMemoryAgent> create(InstrumentingAgents* instrumentingAgents, InspectorCompositeState* state)
     {
-        return adoptPtr(new InspectorMemoryAgent(instrumentingAgents, client, state, page));
+        return adoptPtr(new InspectorMemoryAgent(instrumentingAgents, state));
     }
     virtual ~InspectorMemoryAgent();
 
@@ -65,9 +63,8 @@
     virtual void clearFrontend();
 
 private:
-    InspectorMemoryAgent(InstrumentingAgents*, InspectorClient*, InspectorCompositeState*, Page*);
+    InspectorMemoryAgent(InstrumentingAgents*, InspectorCompositeState*);
 
-    Page* m_page;
     InspectorFrontend::Memory* m_frontend;
 };
 

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes