Revert of Revert of Reland factor out window proxy management portions of ScriptController.

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 14 matching lines @@
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (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 "bindings/core/v8/WindowProxyManager.h"
 #include "core/fetch/CrossOriginAccessControl.h"
+#include "core/frame/LocalFrame.h"
 #include "platform/heap/Handle.h"
 #include "wtf/HashMap.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,
@@ skipping 80 matching lines @@
     NPObject* windowScriptNPObject();
 
     // Registers a v8 extension to be available on webpages. Will only
     // 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; }
+    v8::Isolate* isolate() const { return m_windowProxyManager->isolate(); }
 
 private:
     explicit ScriptController(LocalFrame*);
 
-    typedef WillBeHeapHashMap<int, OwnPtrWillBeMember<WindowProxy> > IsolatedWorldMap;
+    LocalFrame* frame() const { return toLocalFrame(m_windowProxyManager->frame()); }
+
     typedef HashMap<Widget*, NPObject*> PluginObjectMap;
 
     v8::Local<v8::Value> evaluateScriptInMainWorld(const ScriptSourceCode&, AccessControlStatus, ExecuteScriptPolicy, double* compilationFinishTime = 0);
 
-    RawPtrWillBeMember<LocalFrame> m_frame;
+    OwnPtrWillBeMember<WindowProxyManager> m_windowProxyManager;
     const String* m_sourceURL;
-    v8::Isolate* m_isolate;
-
-    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