Chromium Code Reviews| Index: Source/bindings/core/v8/custom/V8InjectedScriptManager.cpp |
| diff --git a/Source/bindings/core/v8/custom/V8InjectedScriptManager.cpp b/Source/bindings/core/v8/custom/V8InjectedScriptManager.cpp |
| index de005ed40850946fc9e65b1f77cc63d04b2309a0..ba3f76d48be9613743c06fe0bae8be33d8e11475 100644 |
| --- a/Source/bindings/core/v8/custom/V8InjectedScriptManager.cpp |
| +++ b/Source/bindings/core/v8/custom/V8InjectedScriptManager.cpp |
| @@ -49,9 +49,8 @@ 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; |
| } |
| @@ -59,6 +58,7 @@ InjectedScriptManager::CallbackData* InjectedScriptManager::createCallbackData(I |
| void InjectedScriptManager::removeCallbackData(InjectedScriptManager::CallbackData* callbackData) |
| { |
| ASSERT(m_callbackDataSet.contains(callbackData)); |
| + callbackData->handle.clear(); |
|
haraken
2015/03/27 13:35:48
Do we need this? (Can we rely on the GC to destruc
sof
2015/03/27 13:54:56
Having it linger until a GC caused v8 asserts on t
|
| m_callbackDataSet.remove(callbackData); |
| } |