Merge 59866 - 20100520 Justin Schuh <jschuh@chromium.org>...

WebCore/bindings/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 100 matching lines @@
     void lowMemoryNotification();
 
     // Creates a property of the global object of a frame.
     void bindToWindowObject(Frame*, const String& key, NPObject*);
 
     PassScriptInstance createScriptInstanceForWidget(Widget*);
 
     // Check if the javascript engine has been initialized.
     bool haveInterpreter() const;
 
+    static bool canAccessFromCurrentOrigin(Frame*);
+
     bool canExecuteScripts(ReasonForCallingCanExecuteScripts);
 
     // FIXME: void* is a compile hack.
     void attachDebugger(void*);
 
     // --- Static methods assume we are running VM in single thread, ---
     // --- and there is only one VM instance.                        ---
 
     // Returns the frame for the entered context. See comments in
     // V8Proxy::retrieveFrameForEnteredContext() for more information.
@@ skipping 64 matching lines @@
 #if ENABLE(NETSCAPE_PLUGIN_API)
     NPObject* m_windowScriptNPObject;
 #endif
     // The XSSAuditor associated with this ScriptController.
     OwnPtr<XSSAuditor> m_XSSAuditor;
 };
 
 } // namespace WebCore
 
 #endif // ScriptController_h