Oilpan: avoid InjectedScriptManager::CallbackData-induced leaks.

Source/bindings/core/v8/custom/V8InjectedScriptManager.cpp

 /*
  * 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 31 matching lines @@
 #include "bindings/core/v8/V8Window.h"
 #include "core/frame/LocalDOMWindow.h"
 #include "core/inspector/InjectedScriptHost.h"
 #include "core/inspector/InjectedScriptNative.h"
 #include "wtf/RefPtr.h"
 
 namespace blink {
 
 InjectedScriptManager::CallbackData* InjectedScriptManager::createCallbackData(InjectedScriptManager* injectedScriptManager)
 {
-    OwnPtr<InjectedScriptManager::CallbackData> callbackData = adoptPtr(new InjectedScriptManager::CallbackData());
+    OwnPtrWillBeRawPtr<InjectedScriptManager::CallbackData> callbackData = InjectedScriptManager::CallbackData::create(injectedScriptManager);
     InjectedScriptManager::CallbackData* callbackDataPtr = callbackData.get();
-    callbackData->injectedScriptManager = injectedScriptManager;
     m_callbackDataSet.add(callbackData.release());
     return callbackDataPtr;
 }
 
 void InjectedScriptManager::removeCallbackData(InjectedScriptManager::CallbackData* callbackData)
 {
     ASSERT(m_callbackDataSet.contains(callbackData));
+    callbackData->dispose();
     m_callbackDataSet.remove(callbackData);
 }
 
 static v8::Local<v8::Object> createInjectedScriptHostV8Wrapper(PassRefPtrWillBeRawPtr<InjectedScriptHost> host, InjectedScriptManager* injectedScriptManager, v8::Local<v8::Object> creationContext, v8::Isolate* isolate)
 {
     ASSERT(host);
 
     v8::Local<v8::Object> wrapper = V8DOMWrapper::createWrapper(isolate, creationContext, &V8InjectedScriptHost::wrapperTypeInfo, host.get());
     if (UNLIKELY(wrapper.IsEmpty()))
         return wrapper;
@@ skipping 55 matching lines @@
     return BindingSecurity::shouldAllowAccessToFrame(scriptState->isolate(), frame, DoNotReportSecurityError);
 }
 
 void InjectedScriptManager::setWeakCallback(const v8::WeakCallbackData<v8::Object, InjectedScriptManager::CallbackData>& data)
 {
     InjectedScriptManager::CallbackData* callbackData = data.GetParameter();
     callbackData->injectedScriptManager->removeCallbackData(callbackData);
 }
 
 } // namespace blink