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

Unified Diff: third_party/WebKit/Source/core/inspector/InspectorDOMAgent.cpp

Issue 1622213002: DevTools: make InjectedScript heap-allocated. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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
Index: third_party/WebKit/Source/core/inspector/InspectorDOMAgent.cpp
diff --git a/third_party/WebKit/Source/core/inspector/InspectorDOMAgent.cpp b/third_party/WebKit/Source/core/inspector/InspectorDOMAgent.cpp
index a5a0c56983a72f15a092090d965ecdb7985f50bc..a125e92e22079d3217d83d7e1a8a4ce5a5191a9f 100644
--- a/third_party/WebKit/Source/core/inspector/InspectorDOMAgent.cpp
+++ b/third_party/WebKit/Source/core/inspector/InspectorDOMAgent.cpp
@@ -1217,18 +1217,18 @@ Node* InspectorDOMAgent::nodeForRemoteId(ErrorString* errorString, const String&
*errorString = "Invalid remote object id";
return nullptr;
}
- InjectedScript injectedScript = m_injectedScriptManager->findInjectedScript(remoteId.get());
- if (injectedScript.isEmpty()) {
+ InjectedScript* injectedScript = m_injectedScriptManager->findInjectedScript(remoteId.get());
+ if (!injectedScript) {
*errorString = "Cannot find context for specified object id";
return nullptr;
}
- ScriptState::Scope scope(injectedScript.scriptState());
- v8::Local<v8::Value> value = injectedScript.findObject(*remoteId);
+ ScriptState::Scope scope(injectedScript->scriptState());
+ v8::Local<v8::Value> value = injectedScript->findObject(*remoteId);
if (value.IsEmpty()) {
*errorString = "Node for given objectId not found";
return nullptr;
}
- v8::Isolate* isolate = injectedScript.scriptState()->isolate();
+ v8::Isolate* isolate = injectedScript->scriptState()->isolate();
if (!V8Node::hasInstance(value, isolate)) {
*errorString = "Object id doesn't reference a Node";
return nullptr;
@@ -2121,12 +2121,12 @@ PassRefPtr<TypeBuilder::Runtime::RemoteObject> InspectorDOMAgent::resolveNode(No
ScriptState* scriptState = ScriptState::forMainWorld(frame);
if (!scriptState)
return nullptr;
- InjectedScript injectedScript = m_injectedScriptManager->injectedScriptFor(scriptState);
- if (injectedScript.isEmpty())
+ InjectedScript* injectedScript = m_injectedScriptManager->injectedScriptFor(scriptState);
+ if (!injectedScript)
return nullptr;
ScriptValue scriptValue = nodeAsScriptValue(scriptState, node);
- return injectedScript.wrapObject(scriptValue, objectGroup);
+ return injectedScript->wrapObject(scriptValue, objectGroup);
}
bool InspectorDOMAgent::pushDocumentUponHandlelessOperation(ErrorString* errorString)

Powered by Google App Engine
This is Rietveld 408576698