Merge 112184

Source/WebCore/bindings/generic/BindingSecurity.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 14 matching lines @@
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef BindingSecurity_h
 #define BindingSecurity_h
 
 #include "BindingSecurityBase.h"
+#include "DOMWindow.h"
+#include "Document.h"
 #include "Element.h"
 #include "Frame.h"
 #include "GenericBinding.h"
 #include "HTMLFrameElementBase.h"
 #include "HTMLNames.h"
 #include "HTMLParserIdioms.h"
 #include "ScriptController.h"
 #include "Settings.h"
 
 namespace WebCore {
 
 class DOMWindow;
 class Node;
 
 // Security functions shared by various language bindings.
 template <class Binding>
 class BindingSecurity : public BindingSecurityBase {
 public:
     // Check if the active execution context can access the target frame.
     static bool canAccessFrame(State<Binding>*, Frame*, bool reportError);
 
     // Check if it is safe to access the given node from the
     // current security context.
     static bool allowAccessToNode(State<Binding>*, Node* target);
 
     static bool allowPopUp(State<Binding>*);
     static bool allowSettingFrameSrcToJavascriptUrl(State<Binding>*, HTMLFrameElementBase*, const String& value);
     static bool allowSettingSrcToJavascriptURL(State<Binding>*, Element*, const String& name, const String& value);
 
-    static bool shouldAllowNavigation(State<Binding>*, Frame*);
-
 private:
     explicit BindingSecurity() {}
     ~BindingSecurity();
 
     // Check if the current DOMWindow's security context can access the target
     // DOMWindow.  This function does not report errors, so most callers should
     // use canAccessFrame instead.
     static bool canAccessWindow(State<Binding>*, DOMWindow* target);
 };
 
@@ skipping 62 matching lines @@
 }
 
 template <class Binding>
 bool BindingSecurity<Binding>::allowSettingSrcToJavascriptURL(State<Binding>* state, Element* element, const String& name, const String& value)
 {
     if ((element->hasTagName(HTMLNames::iframeTag) || element->hasTagName(HTMLNames::frameTag)) && equalIgnoringCase(name, "src"))
         return allowSettingFrameSrcToJavascriptUrl(state, static_cast<HTMLFrameElementBase*>(element), value);
     return true;
 }
 
-template <class Binding>
-bool BindingSecurity<Binding>::shouldAllowNavigation(State<Binding>* state, Frame* frame)
-{
-    Frame* activeFrame = state->activeFrame();
-    return activeFrame && activeFrame->loader()->shouldAllowNavigation(frame);
-}
-
 }
 
 #endif // BindingSecurity_h