Title: [160752] trunk/Source/WebCore
- Revision
- 160752
- Author
- [email protected]
- Date
- 2013-12-17 22:24:10 -0800 (Tue, 17 Dec 2013)
Log Message
Web Inspector: Some basic InjectedScriptHost cleanup
https://bugs.webkit.org/show_bug.cgi?id=125902
Patch by Joseph Pecoraro <[email protected]> on 2013-12-17
Reviewed by Timothy Hatcher.
Remove InjectedScriptHost::scriptDebugServer. Nobody accesses
the ScriptDebugServer through the injected script host. This
also lets us remove the reference to the DebuggerAgent.
* inspector/InjectedScriptHost.cpp:
* inspector/InjectedScriptHost.h:
(WebCore::InjectedScriptHost::init):
* inspector/InspectorController.cpp:
(WebCore::InspectorController::InspectorController):
* inspector/WorkerInspectorController.cpp:
(WebCore::WorkerInspectorController::WorkerInspectorController):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (160751 => 160752)
--- trunk/Source/WebCore/ChangeLog 2013-12-18 06:22:58 UTC (rev 160751)
+++ trunk/Source/WebCore/ChangeLog 2013-12-18 06:24:10 UTC (rev 160752)
@@ -1,5 +1,24 @@
2013-12-17 Joseph Pecoraro <[email protected]>
+ Web Inspector: Some basic InjectedScriptHost cleanup
+ https://bugs.webkit.org/show_bug.cgi?id=125902
+
+ Reviewed by Timothy Hatcher.
+
+ Remove InjectedScriptHost::scriptDebugServer. Nobody accesses
+ the ScriptDebugServer through the injected script host. This
+ also lets us remove the reference to the DebuggerAgent.
+
+ * inspector/InjectedScriptHost.cpp:
+ * inspector/InjectedScriptHost.h:
+ (WebCore::InjectedScriptHost::init):
+ * inspector/InspectorController.cpp:
+ (WebCore::InspectorController::InspectorController):
+ * inspector/WorkerInspectorController.cpp:
+ (WebCore::WorkerInspectorController::WorkerInspectorController):
+
+2013-12-17 Joseph Pecoraro <[email protected]>
+
Web Inspector: Remove InspectorFrontendHost.setInjectedScriptForOrigin
https://bugs.webkit.org/show_bug.cgi?id=125906
Modified: trunk/Source/WebCore/inspector/InjectedScriptHost.cpp (160751 => 160752)
--- trunk/Source/WebCore/inspector/InjectedScriptHost.cpp 2013-12-18 06:22:58 UTC (rev 160751)
+++ trunk/Source/WebCore/inspector/InjectedScriptHost.cpp 2013-12-18 06:24:10 UTC (rev 160752)
@@ -45,7 +45,6 @@
#include "InspectorDOMAgent.h"
#include "InspectorDOMStorageAgent.h"
#include "InspectorDatabaseAgent.h"
-#include "InspectorDebuggerAgent.h"
#include "InspectorWebFrontendDispatchers.h"
#include "Pasteboard.h"
#include "Storage.h"
@@ -162,13 +161,6 @@
return String();
}
-#if ENABLE(_javascript__DEBUGGER)
-ScriptDebugServer& InjectedScriptHost::scriptDebugServer()
-{
- return m_debuggerAgent->scriptDebugServer();
-}
-#endif
-
} // namespace WebCore
#endif // ENABLE(INSPECTOR)
Modified: trunk/Source/WebCore/inspector/InjectedScriptHost.h (160751 => 160752)
--- trunk/Source/WebCore/inspector/InjectedScriptHost.h 2013-12-18 06:22:58 UTC (rev 160751)
+++ trunk/Source/WebCore/inspector/InjectedScriptHost.h 2013-12-18 06:24:10 UTC (rev 160752)
@@ -54,9 +54,7 @@
class InspectorDOMAgent;
class InspectorDOMStorageAgent;
class InspectorDatabaseAgent;
-class InspectorDebuggerAgent;
class Node;
-class ScriptDebugServer;
class Storage;
struct EventListenerInfo;
@@ -73,9 +71,6 @@
#endif
, InspectorDOMStorageAgent* domStorageAgent
, InspectorDOMAgent* domAgent
-#if ENABLE(_javascript__DEBUGGER)
- , InspectorDebuggerAgent* debuggerAgent
-#endif
)
{
m_inspectorAgent = inspectorAgent;
@@ -85,9 +80,6 @@
#endif
m_domStorageAgent = domStorageAgent;
m_domAgent = domAgent;
-#if ENABLE(_javascript__DEBUGGER)
- m_debuggerAgent = debuggerAgent;
-#endif
}
static Node* scriptValueAsNode(Deprecated::ScriptValue);
@@ -115,10 +107,6 @@
#endif
String storageIdImpl(Storage*);
-#if ENABLE(_javascript__DEBUGGER)
- ScriptDebugServer& scriptDebugServer();
-#endif
-
private:
InjectedScriptHost();
@@ -129,9 +117,6 @@
#endif
InspectorDOMStorageAgent* m_domStorageAgent;
InspectorDOMAgent* m_domAgent;
-#if ENABLE(_javascript__DEBUGGER)
- InspectorDebuggerAgent* m_debuggerAgent;
-#endif
Vector<OwnPtr<InspectableObject>> m_inspectedObjects;
OwnPtr<InspectableObject> m_defaultInspectableObject;
};
Modified: trunk/Source/WebCore/inspector/InspectorController.cpp (160751 => 160752)
--- trunk/Source/WebCore/inspector/InspectorController.cpp 2013-12-18 06:22:58 UTC (rev 160751)
+++ trunk/Source/WebCore/inspector/InspectorController.cpp 2013-12-18 06:24:10 UTC (rev 160752)
@@ -172,7 +172,6 @@
#endif
, domStorageAgent
, m_domAgent
- , m_debuggerAgent
);
#if ENABLE(_javascript__DEBUGGER)
Modified: trunk/Source/WebCore/inspector/WorkerInspectorController.cpp (160751 => 160752)
--- trunk/Source/WebCore/inspector/WorkerInspectorController.cpp 2013-12-18 06:22:58 UTC (rev 160751)
+++ trunk/Source/WebCore/inspector/WorkerInspectorController.cpp 2013-12-18 06:24:10 UTC (rev 160752)
@@ -89,7 +89,6 @@
OwnPtr<InspectorConsoleAgent> consoleAgent = WorkerConsoleAgent::create(m_instrumentingAgents.get(), m_injectedScriptManager.get());
#if ENABLE(_javascript__DEBUGGER)
OwnPtr<InspectorDebuggerAgent> debuggerAgent = WorkerDebuggerAgent::create(m_instrumentingAgents.get(), workerGlobalScope, m_injectedScriptManager.get());
- InspectorDebuggerAgent* debuggerAgentPtr = debuggerAgent.get();
m_runtimeAgent->setScriptDebugServer(&debuggerAgent->scriptDebugServer());
m_agents.append(debuggerAgent.release());
@@ -106,9 +105,6 @@
#endif
, 0
, 0
-#if ENABLE(_javascript__DEBUGGER)
- , debuggerAgentPtr
-#endif
);
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
