Merge 112184

Source/WebCore/bindings/generic/BindingSecurity.h

Index: Source/WebCore/bindings/generic/BindingSecurity.h
===================================================================
--- Source/WebCore/bindings/generic/BindingSecurity.h	(revision 112895)
+++ Source/WebCore/bindings/generic/BindingSecurity.h	(working copy)
@@ -32,6 +32,8 @@
 #define BindingSecurity_h
 
 #include "BindingSecurityBase.h"
+#include "DOMWindow.h"
+#include "Document.h"
 #include "Element.h"
 #include "Frame.h"
 #include "GenericBinding.h"
@@ -61,8 +63,6 @@
     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();
@@ -145,13 +145,6 @@
     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