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

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 24 matching lines @@
 #include "core/inspector/InjectedScript.h"
 #include "core/inspector/InjectedScriptHost.h"
 #include "core/inspector/JSONParser.h"
 #include "platform/JSONValues.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebData.h"
 #include "wtf/PassOwnPtr.h"
 
 namespace blink {
 
+#if ENABLE(OILPAN)
+InjectedScriptManager::CallbackData::~CallbackData()
+{
+    WrapperPersistent<InjectedScriptHost>::destroy(hostPtr);
+}
+#endif
+
 PassOwnPtrWillBeRawPtr<InjectedScriptManager> InjectedScriptManager::createForPage()
 {
     return adoptPtrWillBeNoop(new InjectedScriptManager(&InjectedScriptManager::canAccessInspectedWindow));
 }
 
 PassOwnPtrWillBeRawPtr<InjectedScriptManager> InjectedScriptManager::createForWorker()
 {
     return adoptPtrWillBeNoop(new InjectedScriptManager(&InjectedScriptManager::canAccessInspectedWorkerGlobalScope));
 }
 
@@ skipping 126 matching lines @@
 
     int id = injectedScriptIdFor(inspectedScriptState);
     ScriptValue injectedScriptValue = createInjectedScript(injectedScriptSource(), inspectedScriptState, id);
     InjectedScript result(injectedScriptValue, m_inspectedStateAccessCheck);
     m_idToInjectedScript.set(id, result);
     return result;
 }
 
 } // namespace blink