Oilpan: Prepare moving InspectorController and InspectorAgents to oilpan.

Source/bindings/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 30 matching lines @@
 #include "bindings/v8/V8ObjectConstructor.h"
 #include "bindings/v8/V8ScriptRunner.h"
 #include "core/inspector/InjectedScriptHost.h"
 #include "core/frame/DOMWindow.h"
 #include "wtf/RefPtr.h"
 
 namespace WebCore {
 
 struct InjectedScriptManager::CallbackData {
     ScopedPersistent<v8::Object> handle;
-    RefPtr<InjectedScriptHost> host;
+    RefPtrWillBePersistent<InjectedScriptHost> host;
 };
 
 static v8::Local<v8::Object> createInjectedScriptHostV8Wrapper(InjectedScriptHost* host, v8::Isolate* isolate)
 {
     v8::Local<v8::Function> function = V8InjectedScriptHost::domTemplate(isolate)->GetFunction();
     if (function.IsEmpty()) {
         // Return if allocation failed.
         return v8::Local<v8::Object>();
     }
     v8::Local<v8::Object> instanceTemplate = V8ObjectConstructor::newInstance(isolate, function);
     if (instanceTemplate.IsEmpty()) {
         // Avoid setting the wrapper if allocation failed.
         return v8::Local<v8::Object>();
     }
-    V8DOMWrapper::setNativeInfo(instanceTemplate, &V8InjectedScriptHost::wrapperTypeInfo, host);
+    V8DOMWrapper::setNativeInfoWithPersistentHandle(instanceTemplate, &V8InjectedScriptHost::wrapperTypeInfo, host, new Persistent<InjectedScriptHost>(host));

[haraken, 2014/06/17 14:06:17]

I think this will leak memory in non-oilpan builds. You'll need to use
setNativeInfo in non-oilpan builds and setNativeInfoWithPersistentHandle in
oilpan builds.

[keishi, 2014/06/18 12:31:06]

Done.

     // Create a weak reference to the v8 wrapper of InspectorBackend to deref
     // InspectorBackend when the wrapper is garbage collected.
     InjectedScriptManager::CallbackData* data = new InjectedScriptManager::CallbackData;
     data->host = host;
     data->handle.set(isolate, instanceTemplate);
     data->handle.setWeak(data, &InjectedScriptManager::setWeakCallback);
     return instanceTemplate;
 }
 
 ScriptValue InjectedScriptManager::createInjectedScript(const String& scriptSource, ScriptState* inspectedScriptState, int id)
@@ skipping 39 matching lines @@
 }
 
 void InjectedScriptManager::setWeakCallback(const v8::WeakCallbackData<v8::Object, InjectedScriptManager::CallbackData>& data)
 {
     data.GetParameter()->handle.clear();
     data.GetParameter()->host.clear();
     delete data.GetParameter();
 }
 
 } // namespace WebCore