Clean up the proxy code for handling frame navigation....

webkit/port/bindings/v8/v8_proxy.h

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef V8_PROXY_H__
 #define V8_PROXY_H__
 
 #include <v8.h>
 #include "v8_index.h"
 #include "v8_custom.h"
@@ skipping 146 matching lines @@
       : m_frame(frame), m_inlineCode(false),
         m_timerCallback(false), m_recursion(0) { }
 
   ~V8Proxy();
 
   Frame* frame() { return m_frame; }
 
   // Clear page-specific data, but keep the global object identify.
   void clearForNavigation();
 
-  // Clear data before closing the frame.
+  // Clear page-specific data before shutting down the proxy object.
   void clearForClose();
 
-  // Notify that a new DOMWindow object is ready.
-  void domWindowReady();
+  // Update document object of the frame.
+  void updateDocument();
 
   // Destroy the global object.
   void DestroyGlobal();
 
   // TODO(mpcomplete): Need comment.  User Gesture related.
   bool inlineCode() const { return m_inlineCode; }
   void setInlineCode(bool value) { m_inlineCode = value; }
 
   bool timerCallback() const { return m_timerCallback; }
   void setTimerCallback(bool value) { m_timerCallback = value; }
 
   // Has the context for this proxy been initialized?
   bool ContextInitialized();
 
   // Disconnects the proxy from its owner frame,
   // and clears all timeouts on the DOM window.
   void disconnectFrame();
 
   bool isEnabled();
 
-  // Remove 'document' property from the global object.
-  void clearDocumentWrapper();
-
   // Find/Create/Remove event listener wrappers.
   PassRefPtr<V8EventListener> FindV8EventListener(v8::Local<v8::Value> listener,
                                        bool html);
   PassRefPtr<V8EventListener> FindOrCreateV8EventListener(v8::Local<v8::Value> listener,
                                                bool html);
 
   PassRefPtr<V8EventListener> FindObjectEventListener(v8::Local<v8::Value> listener,
                                         bool html);
   PassRefPtr<V8EventListener> FindOrCreateObjectEventListener(v8::Local<v8::Value> listener,
                                                 bool html);
@@ skipping 209 matching lines @@
                                      v8::Persistent<v8::Value> handle);
 #endif
 
   // Check whether a V8 value is a wrapper of type |classType|.
   static bool IsWrapperOfType(v8::Handle<v8::Value> obj,
                               V8ClassIndex::V8WrapperType classType);
 
  private:
   void initContextIfNeeded();
   void DisconnectEventListeners();
+  void SetSecurityToken();
 
   static bool CanAccessPrivate(DOMWindow* target);
 
   // Check whether a V8 value is a DOM Event wrapper
   static bool IsDOMEventWrapper(v8::Handle<v8::Value> obj);
 
   static void* ToNativeObjectImpl(V8ClassIndex::V8WrapperType type,
                                   v8::Handle<v8::Value> object);
 
   // Take C pointer out of a v8 wrapper
@@ skipping 43 matching lines @@
 
 #if ENABLE(XPATH)
   static const char* GetXPathExceptionName(int exception_code);
 #endif
 
 #if ENABLE(SVG)
   static V8ClassIndex::V8WrapperType GetSVGElementType(SVGElement* elm);
   static const char* GetSVGExceptionName(int exception_code);
 #endif
 
-  // Update m_document field, dispose old one and create a string reference
-  // to the new one.
-  void UpdateDocumentHandle(v8::Local<v8::Object> handle);
-
   // Returns a local handle of the context.
   v8::Local<v8::Context> GetContext() {
     return v8::Local<v8::Context>::New(m_context);
   }
 
   Frame* m_frame;
   v8::Persistent<v8::Context> m_context;
   v8::Persistent<v8::Object> m_global;
 
-  // Special handling of document wrapper;
-  v8::Persistent<v8::Object> m_document;
-
   int m_handlerLineno;
 
   // A list of event listeners created for this frame,
   // the list gets cleared when removing all timeouts.
   V8EventListenerList m_event_listeners;
 
   // A list of event listeners create for XMLHttpRequest object for this frame,
   // the list gets cleared when removing all timeouts.
   V8EventListenerList m_xhr_listeners;
 
@@ skipping 26 matching lines @@
   V8Proxy::SetDOMWrapper(args.Holder(), tag, obj.get());
   V8Proxy::SetJSWrapperForDOMObject(
       obj.get(), v8::Persistent<v8::Object>::New(args.Holder()));
   return args.Holder();
 }
 
 }  // namespace WebCore
 
 #endif  // V8_PROXY_H__