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

Unified Diff: Source/core/inspector/InjectedScriptManager.h

Issue 323043002: Oilpan: Prepare moving InspectorAgent related classes to oilpan (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebased Created 6 years, 6 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: Source/core/inspector/InjectedScriptManager.h
diff --git a/Source/core/inspector/InjectedScriptManager.h b/Source/core/inspector/InjectedScriptManager.h
index 1d46c753d26e5433542d0f6ad73e86e1887ce19b..3e6264e0973237f9d38a3eea2f9f46350f68c4c1 100644
--- a/Source/core/inspector/InjectedScriptManager.h
+++ b/Source/core/inspector/InjectedScriptManager.h
@@ -43,12 +43,14 @@ class InjectedScript;
class InjectedScriptHost;
class ScriptValue;
-class InjectedScriptManager {
- WTF_MAKE_NONCOPYABLE(InjectedScriptManager); WTF_MAKE_FAST_ALLOCATED;
+class InjectedScriptManager : public NoBaseWillBeGarbageCollectedFinalized<InjectedScriptManager> {
+ WTF_MAKE_NONCOPYABLE(InjectedScriptManager);
+ WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED;
public:
- static PassOwnPtr<InjectedScriptManager> createForPage();
- static PassOwnPtr<InjectedScriptManager> createForWorker();
+ static PassOwnPtrWillBeRawPtr<InjectedScriptManager> createForPage();
+ static PassOwnPtrWillBeRawPtr<InjectedScriptManager> createForWorker();
~InjectedScriptManager();
+ void trace(Visitor*);
void disconnect();
@@ -79,7 +81,7 @@ private:
int m_nextInjectedScriptId;
typedef HashMap<int, InjectedScript> IdToInjectedScriptMap;
IdToInjectedScriptMap m_idToInjectedScript;
- RefPtrWillBePersistent<InjectedScriptHost> m_injectedScriptHost;
+ RefPtrWillBeMember<InjectedScriptHost> m_injectedScriptHost;
InspectedStateAccessCheck m_inspectedStateAccessCheck;
typedef HashMap<RefPtr<ScriptState>, int> ScriptStateToId;
ScriptStateToId m_scriptStateToId;
« no previous file with comments | « no previous file | Source/core/inspector/InjectedScriptManager.cpp » ('j') | Source/core/inspector/InspectorCSSAgent.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698