Revert "Revert of [oilpan]: optimize the way we allocate persistent handles in wrappers. (patchset …

Source/core/inspector/InjectedScriptManager.h

 /*
  * Copyright (C) 2007 Apple Inc. All rights reserved.
  * 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
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 31 matching lines @@
 class InjectedScript;
 class InjectedScriptHost;
 class ScriptValue;
 
 class InjectedScriptManager : public NoBaseWillBeGarbageCollectedFinalized<InjectedScriptManager> {
     WTF_MAKE_NONCOPYABLE(InjectedScriptManager);
     WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED;
 public:
     struct CallbackData {
         ScopedPersistent<v8::Object> handle;
-        RefPtrWillBePersistent<InjectedScriptHost> host;
+#if ENABLE(OILPAN)
+        WrapperPersistent<InjectedScriptHost>* hostPtr;
+#else
+        RefPtr<InjectedScriptHost> host;
+#endif
         InjectedScriptManager* injectedScriptManager;
+
+#if ENABLE(OILPAN)
+        CallbackData() : hostPtr(0) { }
+        ~CallbackData();
+#endif
     };
 
     static PassOwnPtrWillBeRawPtr<InjectedScriptManager> createForPage();
     static PassOwnPtrWillBeRawPtr<InjectedScriptManager> createForWorker();
     ~InjectedScriptManager();
     void trace(Visitor*);
 
     void disconnect();
 
     InjectedScriptHost* injectedScriptHost();
@@ skipping 28 matching lines @@
     RefPtrWillBeMember<InjectedScriptHost> m_injectedScriptHost;
     InspectedStateAccessCheck m_inspectedStateAccessCheck;
     typedef HashMap<RefPtr<ScriptState>, int> ScriptStateToId;
     ScriptStateToId m_scriptStateToId;
     HashSet<OwnPtr<CallbackData> > m_callbackDataSet;
 };
 
 } // namespace blink
 
 #endif // !defined(InjectedScriptManager_h)