Merge DevTools Refactor CL to Blink36

Source/core/inspector/InjectedScriptManager.h

Index: Source/core/inspector/InjectedScriptManager.h
diff --git a/Source/core/inspector/InjectedScriptManager.h b/Source/core/inspector/InjectedScriptManager.h
index 8472b0ad4503d4960d49d0ee8cab547f92e8bcb5..8c49b621b6649e6f5c691fae0ca4819276bceb19 100644
--- a/Source/core/inspector/InjectedScriptManager.h
+++ b/Source/core/inspector/InjectedScriptManager.h
@@ -40,6 +40,7 @@ namespace WebCore {
 
 class DOMWindow;
 class InjectedScript;
+class V8InjectedScript;
 class InjectedScriptHost;
 class ScriptObject;
 
@@ -54,10 +55,10 @@ public:
 
     InjectedScriptHost* injectedScriptHost();
 
-    InjectedScript injectedScriptFor(ScriptState*);
-    InjectedScript injectedScriptForId(int);
+    InjectedScript& injectedScriptFor(ScriptState*);
+    InjectedScript& injectedScriptForId(int);
     int injectedScriptIdFor(ScriptState*);
-    InjectedScript injectedScriptForObjectId(const String& objectId);
+    InjectedScript& injectedScriptForObjectId(const String& objectId);
     void discardInjectedScripts();
     void discardInjectedScriptsFor(DOMWindow*);
     void releaseObjectGroup(const String& objectGroup);
@@ -67,6 +68,8 @@ public:
 
     struct CallbackData;
     static void setWeakCallback(const v8::WeakCallbackData<v8::Object, CallbackData>&);
+
+    InjectedScript& placeholderInjectedScript();
 private:
     explicit InjectedScriptManager(InspectedStateAccessCheck);
 
@@ -77,12 +80,14 @@ private:
     static bool canAccessInspectedWorkerGlobalScope(ScriptState*);
 
     int m_nextInjectedScriptId;
-    typedef HashMap<int, InjectedScript> IdToInjectedScriptMap;
+    // FIXMEDART: use RefPtr<InjectedScript> instead.
+    typedef HashMap<int, InjectedScript*> IdToInjectedScriptMap;
     IdToInjectedScriptMap m_idToInjectedScript;
     RefPtr<InjectedScriptHost> m_injectedScriptHost;
     InspectedStateAccessCheck m_inspectedStateAccessCheck;
     typedef HashMap<RefPtr<ScriptState>, int> ScriptStateToId;
     ScriptStateToId m_scriptStateToId;
+    V8InjectedScript* m_placeholderInjectedScript;
 };
 
 } // namespace WebCore