Modifies WindowProxy::setSecurityToken so that the frame's SecurityOrigin is taken into account whe…

Source/bindings/core/v8/WindowProxy.h

 /*
  * Copyright (C) 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 53 matching lines @@
     // Update document object of the frame.
     void updateDocument();
 
     void namedItemAdded(HTMLDocument*, const AtomicString&);
     void namedItemRemoved(HTMLDocument*, const AtomicString&);
 
     // Update the security origin of a document
     // (e.g., after setting docoument.domain).
     void updateSecurityOrigin(SecurityOrigin*);
 
+    void setSecurityToken(SecurityOrigin*);
+
     bool isContextInitialized() { return m_scriptState && !!m_scriptState->perContextData(); }
     bool isGlobalInitialized() { return !m_global.isEmpty(); }
 
     bool initializeIfNeeded();
     void updateDocumentWrapper(v8::Local<v8::Object> wrapper);
 
     void clearForNavigation();
     void clearForClose();
 
     void takeGlobalFrom(WindowProxy*);
 
     DOMWrapperWorld& world() { return *m_world; }
 
 private:
     WindowProxy(Frame*, PassRefPtr<DOMWrapperWorld>, v8::Isolate*);
     bool initialize();
 
     enum GlobalDetachmentBehavior {
         DoNotDetachGlobal,
         DetachGlobal
     };
     void disposeContext(GlobalDetachmentBehavior);
 
-    void setSecurityToken(SecurityOrigin*);
-
     // The JavaScript wrapper for the document object is cached on the global
     // object for fast access. UpdateDocumentProperty sets the wrapper
     // for the current document on the global object.
     void updateDocumentProperty();
 
     // Updates Activity Logger for the current context.
     void updateActivityLogger();
 
     void createContext();
     bool installDOMWindow();
 
     RawPtrWillBeMember<Frame> m_frame;
     v8::Isolate* m_isolate;
     RefPtr<ScriptState> m_scriptState;
     RefPtr<DOMWrapperWorld> m_world;
     ScopedPersistent<v8::Object> m_global;
     ScopedPersistent<v8::Object> m_document;
 };
 
 } // namespace blink
 
 #endif // WindowProxy_h