Oilpan: avoid InjectedScriptManager::CallbackData-induced leaks.

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 50 matching lines @@
 {
 }
 
 InjectedScriptManager::~InjectedScriptManager()
 {
 }
 
 DEFINE_TRACE(InjectedScriptManager)
 {
     visitor->trace(m_injectedScriptHost);
+#if ENABLE(OILPAN)
+    visitor->trace(m_callbackDataSet);
+#endif
 }
 
 void InjectedScriptManager::disconnect()
 {
     m_injectedScriptHost->disconnect();
     m_injectedScriptHost.clear();
 }
 
 InjectedScriptHost* InjectedScriptManager::injectedScriptHost()
 {
@@ skipping 97 matching lines @@
     int id = injectedScriptIdFor(inspectedScriptState);
     RefPtr<InjectedScriptNative> injectedScriptNative = adoptRef(new InjectedScriptNative(inspectedScriptState->isolate()));
     ScriptValue injectedScriptValue = createInjectedScript(injectedScriptSource(), inspectedScriptState, id, injectedScriptNative.get());
     InjectedScript result(injectedScriptValue, m_inspectedStateAccessCheck, injectedScriptNative.release());
     if (m_customObjectFormatterEnabled)
         result.setCustomObjectFormatterEnabled(m_customObjectFormatterEnabled);
     m_idToInjectedScript.set(id, result);
     return result;
 }
 
+PassOwnPtrWillBeRawPtr<InjectedScriptManager::CallbackData> InjectedScriptManager::CallbackData::create(InjectedScriptManager* manager)
+{
+    return adoptPtrWillBeNoop(new CallbackData(manager));
+}
+
+InjectedScriptManager::CallbackData::CallbackData(InjectedScriptManager* manager)
+    : injectedScriptManager(manager)
+{
+}
+
+void InjectedScriptManager::CallbackData::dispose()
+{
+    // Promptly release the ScopedPersistent<>.
+    handle.clear();
+}
+
+DEFINE_TRACE(InjectedScriptManager::CallbackData)
+{
+    visitor->trace(host);
+    visitor->trace(injectedScriptManager);
+}
+
 } // namespace blink
-