Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(155)

Unified Diff: Source/core/inspector/InspectorInspectorAgent.cpp

Issue 1004113004: [DevTools] Do not instrument with InspectorInspectorAgent. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: ASSERT(isMainThread) Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/inspector/InspectorInspectorAgent.h ('k') | Source/core/inspector/InspectorInstrumentation.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/inspector/InspectorInspectorAgent.cpp
diff --git a/Source/core/inspector/InspectorInspectorAgent.cpp b/Source/core/inspector/InspectorInspectorAgent.cpp
index 7eda7757545286eabc203fc7c427e4719ad98543..a04dff7480609456df6478a6043716166e1aed9b 100644
--- a/Source/core/inspector/InspectorInspectorAgent.cpp
+++ b/Source/core/inspector/InspectorInspectorAgent.cpp
@@ -39,7 +39,6 @@
#include "core/inspector/InjectedScriptHost.h"
#include "core/inspector/InjectedScriptManager.h"
#include "core/inspector/InspectorState.h"
-#include "core/inspector/InstrumentingAgents.h"
#include "core/loader/DocumentLoader.h"
#include "core/page/Page.h"
#include "platform/weborigin/SecurityOrigin.h"
@@ -59,9 +58,6 @@ InspectorInspectorAgent::InspectorInspectorAgent(InjectedScriptManager* injected
InspectorInspectorAgent::~InspectorInspectorAgent()
{
-#if !ENABLE(OILPAN)
- m_instrumentingAgents->setInspectorInspectorAgent(nullptr);
-#endif
}
DEFINE_TRACE(InspectorInspectorAgent)
@@ -70,15 +66,9 @@ DEFINE_TRACE(InspectorInspectorAgent)
InspectorBaseAgent::trace(visitor);
}
-void InspectorInspectorAgent::init()
-{
- m_instrumentingAgents->setInspectorInspectorAgent(this);
-}
-
void InspectorInspectorAgent::enable(ErrorString*)
{
m_state->setBoolean(InspectorAgentState::inspectorAgentEnabled, true);
-
for (Vector<pair<long, String>>::iterator it = m_pendingEvaluateTestCommands.begin(); frontend() && it != m_pendingEvaluateTestCommands.end(); ++it)
frontend()->evaluateForTestInFrontend(static_cast<int>((*it).first), (*it).second);
m_pendingEvaluateTestCommands.clear();
@@ -92,7 +82,7 @@ void InspectorInspectorAgent::disable(ErrorString*)
m_injectedScriptManager->discardInjectedScripts();
}
-void InspectorInspectorAgent::domContentLoadedEventFired(LocalFrame* frame)
+void InspectorInspectorAgent::didCommitLoadForLocalFrame(LocalFrame* frame)
{
if (frame != frame->localFrameRoot())
return;
@@ -100,6 +90,14 @@ void InspectorInspectorAgent::domContentLoadedEventFired(LocalFrame* frame)
m_injectedScriptManager->injectedScriptHost()->clearInspectedObjects();
}
+void InspectorInspectorAgent::restore()
+{
+ if (m_state->getBoolean(InspectorAgentState::inspectorAgentEnabled)) {
+ ErrorString error;
+ enable(&error);
+ }
+}
+
void InspectorInspectorAgent::evaluateForTestInFrontend(long callId, const String& script)
{
if (m_state->getBoolean(InspectorAgentState::inspectorAgentEnabled)) {
« no previous file with comments | « Source/core/inspector/InspectorInspectorAgent.h ('k') | Source/core/inspector/InspectorInstrumentation.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698