Oilpan: move ScriptController+WindowProxy to the heap.

Source/bindings/core/v8/ScriptController.h

 /*
  * Copyright (C) 2008, 2009 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 16 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef ScriptController_h
 #define ScriptController_h
 
 #include "bindings/core/v8/SharedPersistent.h"
 
 #include "core/fetch/CrossOriginAccessControl.h"
+#include "platform/heap/Handle.h"
 #include "wtf/HashMap.h"
-#include "wtf/RefCounted.h"
 #include "wtf/Vector.h"
 #include "wtf/text/TextPosition.h"
 #include <v8.h>
 
 struct NPObject;
 
 namespace blink {
 
 class DOMWrapperWorld;
 class ExecutionContext;
 class HTMLDocument;
 class HTMLPlugInElement;
 class KURL;
 class LocalFrame;
 class ScriptState;
 class ScriptSourceCode;
 class SecurityOrigin;
 class WindowProxy;
 class Widget;
 
 typedef WTF::Vector<v8::Extension*> V8Extensions;
 
 enum ReasonForCallingCanExecuteScripts {
     AboutToExecuteScript,
     NotAboutToExecuteScript
 };
 
-class ScriptController {
+class ScriptController final : public NoBaseWillBeGarbageCollectedFinalized<ScriptController> {
 public:
     enum ExecuteScriptPolicy {
         ExecuteScriptWhenScriptsDisabled,
         DoNotExecuteScriptWhenScriptsDisabled
     };
 
-    ScriptController(LocalFrame*);
+    static PassOwnPtrWillBeRawPtr<ScriptController> create(LocalFrame* frame)
+    {
+        return adoptPtrWillBeNoop(new ScriptController(frame));
+    }
+
     ~ScriptController();
+    void trace(Visitor*);
 
     bool initializeMainWorld();
     WindowProxy* windowProxy(DOMWrapperWorld&);
     WindowProxy* existingWindowProxy(DOMWrapperWorld&);
 
     // Evaluate JavaScript in the main world.
     void executeScriptInMainWorld(const String&, ExecuteScriptPolicy = DoNotExecuteScriptWhenScriptsDisabled);
     void executeScriptInMainWorld(const ScriptSourceCode&, AccessControlStatus = NotSharableCrossOrigin, double* compilationFinishTime = 0);
     v8::Local<v8::Value> executeScriptInMainWorldAndReturnValue(const ScriptSourceCode&);
     v8::Local<v8::Value> executeScriptAndReturnValue(v8::Handle<v8::Context>, const ScriptSourceCode&, AccessControlStatus = NotSharableCrossOrigin, double* compilationFinishTime = 0);
@@ skipping 55 matching lines @@
     // affect v8 contexts initialized after this call. Takes ownership of
     // the v8::Extension object passed.
     static void registerExtensionIfNeeded(v8::Extension*);
     static V8Extensions& registeredExtensions();
 
     void setWorldDebugId(int worldId, int debuggerId);
 
     v8::Isolate* isolate() const { return m_isolate; }
 
 private:
-    typedef HashMap<int, OwnPtr<WindowProxy> > IsolatedWorldMap;
+    explicit ScriptController(LocalFrame*);
+
+    typedef WillBeHeapHashMap<int, OwnPtrWillBeMember<WindowProxy> > IsolatedWorldMap;
     typedef HashMap<Widget*, NPObject*> PluginObjectMap;

[haraken, 2014/10/05 23:37:26]

Just to confirm: Are you sure that these raw pointers don't become stale
pointers when the ScriptController (on-heap) outlives Widgets or NPObjects
(off-heap)?

[sof, 2014/10/06 07:34:40]

Nothing changes wrt that; we do rely on plugins to clear out and unregister
their scripts (via the plugin container.) And that will still happen _and_
happen before this ScriptController (and its LocalFrame) is finalized.

I think this will remain workable once Widget (=> the plugin container) is moved
to the heap. If not, there's (even) more work to attend to there!

 
     v8::Local<v8::Value> evaluateScriptInMainWorld(const ScriptSourceCode&, AccessControlStatus, ExecuteScriptPolicy, double* compilationFinishTime = 0);
 
-    LocalFrame* m_frame;
+    RawPtrWillBeMember<LocalFrame> m_frame;
     const String* m_sourceURL;
     v8::Isolate* m_isolate;
 
-    OwnPtr<WindowProxy> m_windowProxy;
+    OwnPtrWillBeMember<WindowProxy> m_windowProxy;
     IsolatedWorldMap m_isolatedWorlds;
 
     // A mapping between Widgets and their corresponding script object.
     // This list is used so that when the plugin dies, we can immediately
     // invalidate all sub-objects which are associated with that plugin.
     // The frame keeps a NPObject reference for each item on the list.
     PluginObjectMap m_pluginObjects;
 
     NPObject* m_windowScriptNPObject;
 };
 
 } // namespace blink
 
 #endif // ScriptController_h