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

WebCore/bindings/v8/ScriptController.cpp

 /*
  * Copyright (C) 2008, 2009 Google Inc. All rights reserved.
  * Copyright (C) 2009 Apple 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.
@@ skipping 69 matching lines @@
 Frame* ScriptController::retrieveFrameForEnteredContext()
 {
     return V8Proxy::retrieveFrameForEnteredContext();
 }
 
 Frame* ScriptController::retrieveFrameForCurrentContext()
 {
     return V8Proxy::retrieveFrameForCurrentContext();
 }
 
+bool ScriptController::canAccessFromCurrentOrigin(Frame *frame)
+{
+    return !v8::Context::InContext() || V8BindingSecurity::canAccessFrame(V8BindingState::Only(), frame, true);
+}
+
 bool ScriptController::isSafeScript(Frame* target)
 {
     return V8BindingSecurity::canAccessFrame(V8BindingState::Only(), target, true);
 }
 
 void ScriptController::gcProtectJSWrapper(void* domObject)
 {
     V8GCController::gcProtect(domObject);
 }
 
@@ skipping 337 matching lines @@
 {
     notImplemented();
 }
 
 void ScriptController::updateDocument()
 {
     m_proxy->windowShell()->updateDocument();
 }
 
 } // namespace WebCore