| Index: webkit/port/bindings/v8/v8_proxy.h
|
| ===================================================================
|
| --- webkit/port/bindings/v8/v8_proxy.h (revision 5350)
|
| +++ webkit/port/bindings/v8/v8_proxy.h (working copy)
|
| @@ -164,11 +164,11 @@
|
| // 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();
|
| @@ -189,9 +189,6 @@
|
|
|
| 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);
|
| @@ -421,6 +418,7 @@
|
| private:
|
| void initContextIfNeeded();
|
| void DisconnectEventListeners();
|
| + void SetSecurityToken();
|
|
|
| static bool CanAccessPrivate(DOMWindow* target);
|
|
|
| @@ -484,10 +482,6 @@
|
| 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);
|
| @@ -497,9 +491,6 @@
|
| 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,
|
|
|