DevTools: make InjectedScript heap-allocated.

third_party/WebKit/Source/core/inspector/InjectedScriptManager.cpp

 /*
  * Copyright (C) 2007, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Matt Lilek <webkit@mattlilek.com>
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
@@ skipping 56 matching lines @@
 {
     m_injectedScriptHost->disconnect();
     m_injectedScriptHost.clear();
 }
 
 InjectedScriptHost* InjectedScriptManager::injectedScriptHost()
 {
     return m_injectedScriptHost.get();
 }
 
-InjectedScript InjectedScriptManager::findInjectedScript(int id) const
+InjectedScript* InjectedScriptManager::findInjectedScript(int id) const
 {
     IdToInjectedScriptMap::const_iterator it = m_idToInjectedScript.find(id);
     if (it != m_idToInjectedScript.end())
-        return it->value;
-    return InjectedScript();
+        return it->value.get();
+    return nullptr;
 }
 
-InjectedScript InjectedScriptManager::findInjectedScript(RemoteObjectIdBase* objectId) const
+InjectedScript* InjectedScriptManager::findInjectedScript(RemoteObjectIdBase* objectId) const
 {
-    if (!objectId)
-        return InjectedScript();
-    return m_idToInjectedScript.get(objectId->contextId());
+    return objectId ? findInjectedScript(objectId->contextId()) : nullptr;
 }
 
 void InjectedScriptManager::discardInjectedScripts()
 {
     m_idToInjectedScript.clear();
 }
 
 int InjectedScriptManager::discardInjectedScriptFor(ScriptState* scriptState)
 {
     ScriptState::Scope scope(scriptState);
     int contextId = V8Debugger::contextId(scriptState->context());
     m_idToInjectedScript.remove(contextId);
     return contextId;
 }
 
 bool InjectedScriptManager::canAccessInspectedWorkerGlobalScope(ScriptState*)
 {
     return true;
 }
 
 void InjectedScriptManager::releaseObjectGroup(const String& objectGroup)
 {
     Vector<int> keys;
     keys.appendRange(m_idToInjectedScript.keys().begin(), m_idToInjectedScript.keys().end());
     for (auto& key : keys) {
         IdToInjectedScriptMap::iterator s = m_idToInjectedScript.find(key);
         if (s != m_idToInjectedScript.end())
-            s->value.releaseObjectGroup(objectGroup); // m_idToInjectedScript may change here.
+            s->value->releaseObjectGroup(objectGroup); // m_idToInjectedScript may change here.
     }
 }
 
 void InjectedScriptManager::setCustomObjectFormatterEnabled(bool enabled)
 {
     m_customObjectFormatterEnabled = enabled;
     IdToInjectedScriptMap::iterator end = m_idToInjectedScript.end();
     for (IdToInjectedScriptMap::iterator it = m_idToInjectedScript.begin(); it != end; ++it) {
-        if (!it->value.isEmpty())
-            it->value.setCustomObjectFormatterEnabled(enabled);
+        it->value->setCustomObjectFormatterEnabled(enabled);
     }
 }
 
 String InjectedScriptManager::injectedScriptSource()
 {
     const WebData& injectedScriptSourceResource = Platform::current()->loadResource("InjectedScriptSource.js");
     return String(injectedScriptSourceResource.data(), injectedScriptSourceResource.size());
 }
 
-InjectedScript InjectedScriptManager::injectedScriptFor(ScriptState* scriptState)
+InjectedScript* InjectedScriptManager::injectedScriptFor(ScriptState* scriptState)
 {
     ScriptState::Scope scope(scriptState);
     int contextId = V8Debugger::contextId(scriptState->context());
 
     IdToInjectedScriptMap::iterator it = m_idToInjectedScript.find(contextId);
     if (it != m_idToInjectedScript.end())
-        return it->value;
+        return it->value.get();
 
     if (!m_inspectedStateAccessCheck(scriptState))
-        return InjectedScript();
+        return nullptr;
 
     RefPtr<InjectedScriptNative> injectedScriptNative = adoptRef(new InjectedScriptNative(scriptState->isolate()));
     ScriptValue injectedScriptValue = createInjectedScript(injectedScriptSource(), scriptState, contextId, injectedScriptNative.get());
-    InjectedScript result(injectedScriptValue, m_inspectedStateAccessCheck, injectedScriptNative.release(), contextId);
+    OwnPtr<InjectedScript> result = adoptPtr(new InjectedScript(injectedScriptValue, m_inspectedStateAccessCheck, injectedScriptNative.release(), contextId));
+    InjectedScript* resultPtr = result.get();
     if (m_customObjectFormatterEnabled)
-        result.setCustomObjectFormatterEnabled(m_customObjectFormatterEnabled);
-    m_idToInjectedScript.set(contextId, result);
-    return result;
+        result->setCustomObjectFormatterEnabled(m_customObjectFormatterEnabled);
+    m_idToInjectedScript.set(contextId, result.release());
+    return resultPtr;
 }
 
 } // namespace blink