Index: third_party/WebKit/Source/platform/v8_inspector/InjectedScriptManager.cpp |
diff --git a/third_party/WebKit/Source/platform/v8_inspector/InjectedScriptManager.cpp b/third_party/WebKit/Source/platform/v8_inspector/InjectedScriptManager.cpp |
index 7d74a17d6a282b02bd04ed048efc32b974b6f7f7..f7ae8395986571e73b4d6e1aa6f87828e1ea717e 100644 |
--- a/third_party/WebKit/Source/platform/v8_inspector/InjectedScriptManager.cpp |
+++ b/third_party/WebKit/Source/platform/v8_inspector/InjectedScriptManager.cpp |
@@ -65,23 +65,18 @@ InjectedScriptHost* InjectedScriptManager::injectedScriptHost() |
return m_injectedScriptHost.get(); |
} |
-InjectedScript* InjectedScriptManager::findInjectedScript(int id) const |
+InjectedScript* InjectedScriptManager::findInjectedScript(ErrorString* errorString, int id) const |
{ |
IdToInjectedScriptMap::const_iterator it = m_idToInjectedScript.find(id); |
if (it != m_idToInjectedScript.end()) |
return it->second; |
+ *errorString = "Inspected frame has gone"; |
return nullptr; |
} |
InjectedScript* InjectedScriptManager::findInjectedScript(ErrorString* errorString, RemoteObjectIdBase* objectId) const |
{ |
- InjectedScript* injectedScript = nullptr; |
- if (objectId) { |
- injectedScript = findInjectedScript(objectId->contextId()); |
- if (!injectedScript) |
- *errorString = "Inspected frame has gone"; |
- } |
- return injectedScript; |
+ return objectId ? findInjectedScript(errorString, objectId->contextId()) : nullptr; |
} |
void InjectedScriptManager::discardInjectedScripts() |