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

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

Issue 476153002: DevTools: Make the way inspectorFrontend is referenced in agents consistent in all of them. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 4 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/InspectorWorkerAgent.h » ('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 b308ffa841da0428900852c5260d63bbf7ed0cfe..1c51a3b650ce2850c956abc635e0dc355d0fa324 100644
--- a/Source/core/inspector/InspectorInspectorAgent.cpp
+++ b/Source/core/inspector/InspectorInspectorAgent.cpp
@@ -100,7 +100,7 @@ void InspectorInspectorAgent::init()
void InspectorInspectorAgent::setFrontend(InspectorFrontend* inspectorFrontend)
{
- m_frontend = inspectorFrontend;
+ m_frontend = inspectorFrontend->inspector();
}
void InspectorInspectorAgent::clearFrontend()
@@ -120,7 +120,7 @@ void InspectorInspectorAgent::enable(ErrorString*)
inspect(m_pendingInspectData.first, m_pendingInspectData.second);
for (Vector<pair<long, String> >::iterator it = m_pendingEvaluateTestCommands.begin(); m_frontend && it != m_pendingEvaluateTestCommands.end(); ++it)
- m_frontend->inspector()->evaluateForTestInFrontend(static_cast<int>((*it).first), (*it).second);
+ m_frontend->evaluateForTestInFrontend(static_cast<int>((*it).first), (*it).second);
m_pendingEvaluateTestCommands.clear();
}
@@ -145,8 +145,8 @@ void InspectorInspectorAgent::domContentLoadedEventFired(LocalFrame* frame)
void InspectorInspectorAgent::evaluateForTestInFrontend(long callId, const String& script)
{
if (m_state->getBoolean(InspectorAgentState::inspectorAgentEnabled)) {
- m_frontend->inspector()->evaluateForTestInFrontend(static_cast<int>(callId), script);
- m_frontend->inspector()->flush();
+ m_frontend->evaluateForTestInFrontend(static_cast<int>(callId), script);
+ m_frontend->flush();
} else {
m_pendingEvaluateTestCommands.append(pair<long, String>(callId, script));
}
@@ -160,7 +160,7 @@ void InspectorInspectorAgent::setInjectedScriptForOrigin(const String& origin, c
void InspectorInspectorAgent::inspect(PassRefPtr<TypeBuilder::Runtime::RemoteObject> objectToInspect, PassRefPtr<JSONObject> hints)
{
if (m_state->getBoolean(InspectorAgentState::inspectorAgentEnabled) && m_frontend) {
- m_frontend->inspector()->inspect(objectToInspect, hints);
+ m_frontend->inspect(objectToInspect, hints);
m_pendingInspectData.first = nullptr;
m_pendingInspectData.second = nullptr;
return;
« no previous file with comments | « Source/core/inspector/InspectorInspectorAgent.h ('k') | Source/core/inspector/InspectorWorkerAgent.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698