WebCore:

2008-06-13 Darin Adler <darin@apple.com> Reviewed by John Sullivan. - added FormState argument to action policy functions * loader/FrameLoader.cpp: (WebCore::FrameLoader::checkNewWindowPolicy): (WebCore::FrameLoader::checkNavigationPolicy): * loader/FrameLoaderClient.h: * svg/graphics/SVGImageEmptyClients.h: (WebCore::SVGEmptyFrameLoaderClient::dispatchDecidePolicyForNewWindowAction): (WebCore::SVGEmptyFrameLoaderClient::dispatchDecidePolicyForNavigationAction): WebKit/gtk: 2008-06-13 Darin Adler <darin@apple.com> Reviewed by John Sullivan. - updated for addition of FormState argument to action policy functions * WebCoreSupport/FrameLoaderClientGtk.cpp: (WebKit::FrameLoaderClient::dispatchDecidePolicyForNewWindowAction): (WebKit::FrameLoaderClient::dispatchDecidePolicyForNavigationAction): WebKit/mac: 2008-06-13 Darin Adler <darin@apple.com> Reviewed by John Sullivan. - updated for addition of FormState argument to action policy functions - added WebActionFormKey * WebCoreSupport/WebFrameLoaderClient.h: * WebCoreSupport/WebFrameLoaderClient.mm: (WebFrameLoaderClient::dispatchDecidePolicyForNewWindowAction): (WebFrameLoaderClient::dispatchDecidePolicyForNavigationAction): (WebFrameLoaderClient::actionDictionary): * WebKit.exp: * WebView/WebPolicyDelegate.mm: * WebView/WebPolicyDelegatePrivate.h: WebKit/qt: 2008-06-13 Darin Adler <darin@apple.com> Reviewed by John Sullivan. - updated for addition of FormState argument to action policy functions * WebCoreSupport/FrameLoaderClientQt.cpp: (WebCore::FrameLoaderClientQt::dispatchDecidePolicyForNewWindowAction): (WebCore::FrameLoaderClientQt::dispatchDecidePolicyForNavigationAction): WebKit/win: 2008-06-13 Darin Adler <darin@apple.com> Reviewed by John Sullivan. - updated for addition of FormState argument to action policy functions - added WebActionFormKey * Interfaces/IWebPolicyDelegate.idl: * WebActionPropertyBag.cpp: (WebActionPropertyBag::WebActionPropertyBag): (WebActionPropertyBag::createInstance): (WebActionPropertyBag::AddRef): (WebActionPropertyBag::Release): (WebActionPropertyBag::Read): * WebActionPropertyBag.h: * WebFrame.cpp: (WebFrame::dispatchDecidePolicyForNewWindowAction): (WebFrame::dispatchDecidePolicyForNavigationAction): WebKit/wx: 2008-06-13 Darin Adler <darin@apple.com> Reviewed by John Sullivan. - updated for addition of FormState argument to action policy functions * WebKitSupport/FrameLoaderClientWx.cpp: (WebCore::FrameLoaderClientWx::dispatchDecidePolicyForNewWindowAction): (WebCore::FrameLoaderClientWx::dispatchDecidePolicyForNavigationAction): git-svn-id: http://svn.webkit.org/repository/webkit/trunk@34523 268f45cc-cd09-0410-ab3c-d52691b4dbfc
rjbailey · Jun 13, 2008 · f6b094c · f6b094c
1 parent 49d3096
commit f6b094c
Show file tree

Hide file tree

Showing 21 changed files with 168 additions and 76 deletions.
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2008-06-13  Darin Adler  <darin@apple.com>
+
+        Reviewed by John Sullivan.
+
+        - added FormState argument to action policy functions
+
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::checkNewWindowPolicy):
+        (WebCore::FrameLoader::checkNavigationPolicy):
+        * loader/FrameLoaderClient.h:
+        * svg/graphics/SVGImageEmptyClients.h:
+        (WebCore::SVGEmptyFrameLoaderClient::dispatchDecidePolicyForNewWindowAction):
+        (WebCore::SVGEmptyFrameLoaderClient::dispatchDecidePolicyForNavigationAction):
+
 2008-06-13  Justin Garcia  <justin.garcia@apple.com>
 
         Reviewed by Jess.

diff --git a/WebCore/loader/FrameLoader.cpp b/WebCore/loader/FrameLoader.cpp
@@ -3621,7 +3621,7 @@ void FrameLoader::checkNewWindowPolicy(const NavigationAction& action, const Res
     m_policyCheck.set(request, formState, frameName,
         callContinueLoadAfterNewWindowPolicy, this);
     m_client->dispatchDecidePolicyForNewWindowAction(&FrameLoader::continueAfterNewWindowPolicy,
-        action, request, frameName);
+        action, request, formState, frameName);
 }
 
 void FrameLoader::continueAfterNewWindowPolicy(PolicyAction policy)
@@ -3672,11 +3672,11 @@ void FrameLoader::checkNavigationPolicy(const ResourceRequest& request, Document
 
     loader->setLastCheckedRequest(request);
 
-    m_policyCheck.set(request, formState, function, argument);
+    m_policyCheck.set(request, formState.get(), function, argument);
 
     m_delegateIsDecidingNavigationPolicy = true;
     m_client->dispatchDecidePolicyForNavigationAction(&FrameLoader::continueAfterNavigationPolicy,
-        action, request);
+        action, request, formState);
     m_delegateIsDecidingNavigationPolicy = false;
 }
 

diff --git a/WebCore/loader/FrameLoaderClient.h b/WebCore/loader/FrameLoaderClient.h
@@ -119,8 +119,8 @@ namespace WebCore {
         virtual void dispatchShow() = 0;
 
         virtual void dispatchDecidePolicyForMIMEType(FramePolicyFunction, const String& MIMEType, const ResourceRequest&) = 0;
-        virtual void dispatchDecidePolicyForNewWindowAction(FramePolicyFunction, const NavigationAction&, const ResourceRequest&, const String& frameName) = 0;
-        virtual void dispatchDecidePolicyForNavigationAction(FramePolicyFunction, const NavigationAction&, const ResourceRequest&) = 0;
+        virtual void dispatchDecidePolicyForNewWindowAction(FramePolicyFunction, const NavigationAction&, const ResourceRequest&, PassRefPtr<FormState>, const String& frameName) = 0;
+        virtual void dispatchDecidePolicyForNavigationAction(FramePolicyFunction, const NavigationAction&, const ResourceRequest&, PassRefPtr<FormState>) = 0;
         virtual void cancelPolicyCheck() = 0;
 
         virtual void dispatchUnableToImplementPolicy(const ResourceError&) = 0;

diff --git a/WebCore/svg/graphics/SVGImageEmptyClients.h b/WebCore/svg/graphics/SVGImageEmptyClients.h
@@ -178,8 +178,8 @@ class SVGEmptyFrameLoaderClient : public FrameLoaderClient {
     virtual void dispatchShow() { }
 
     virtual void dispatchDecidePolicyForMIMEType(FramePolicyFunction, const String& MIMEType, const ResourceRequest&) { }
-    virtual void dispatchDecidePolicyForNewWindowAction(FramePolicyFunction, const NavigationAction&, const ResourceRequest&, const String& frameName) { }
-    virtual void dispatchDecidePolicyForNavigationAction(FramePolicyFunction, const NavigationAction&, const ResourceRequest&) { }
+    virtual void dispatchDecidePolicyForNewWindowAction(FramePolicyFunction, const NavigationAction&, const ResourceRequest&, PassRefPtr<FormState>, const String& frameName) { }
+    virtual void dispatchDecidePolicyForNavigationAction(FramePolicyFunction, const NavigationAction&, const ResourceRequest&, PassRefPtr<FormState>) { }
     virtual void cancelPolicyCheck() { }
 
     virtual void dispatchUnableToImplementPolicy(const ResourceError&) { }

diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
@@ -1,3 +1,13 @@
+2008-06-13  Darin Adler  <darin@apple.com>
+
+        Reviewed by John Sullivan.
+
+        - updated for addition of FormState argument to action policy functions
+
+        * WebCoreSupport/FrameLoaderClientGtk.cpp:
+        (WebKit::FrameLoaderClient::dispatchDecidePolicyForNewWindowAction):
+        (WebKit::FrameLoaderClient::dispatchDecidePolicyForNavigationAction):
+
 2008-06-10  Christian Dywan  <christian@twotoasts.de>
 
         Reviewed by Alp Toker and Darin Adler.

diff --git a/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp b/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp
@@ -153,7 +153,7 @@ WTF::PassRefPtr<WebCore::DocumentLoader> FrameLoaderClient::createDocumentLoader
     return loader.release();
 }
 
-void FrameLoaderClient::dispatchWillSubmitForm(FramePolicyFunction policyFunction,  PassRefPtr<FormState>)
+void FrameLoaderClient::dispatchWillSubmitForm(FramePolicyFunction policyFunction, PassRefPtr<FormState>)
 {
     // FIXME: This is surely too simple
     ASSERT(policyFunction);
@@ -252,7 +252,7 @@ void FrameLoaderClient::dispatchDecidePolicyForMIMEType(FramePolicyFunction poli
     (core(m_frame)->loader()->*policyFunction)(PolicyUse);
 }
 
-void FrameLoaderClient::dispatchDecidePolicyForNewWindowAction(FramePolicyFunction policyFunction, const NavigationAction&, const ResourceRequest&, const String&)
+void FrameLoaderClient::dispatchDecidePolicyForNewWindowAction(FramePolicyFunction policyFunction, const NavigationAction&, const ResourceRequest&, PassRefPtr<FormState>, const String&)
 {
     ASSERT(policyFunction);
     if (!policyFunction)
@@ -262,7 +262,7 @@ void FrameLoaderClient::dispatchDecidePolicyForNewWindowAction(FramePolicyFuncti
     (core(m_frame)->loader()->*policyFunction)(PolicyIgnore);
 }
 
-void FrameLoaderClient::dispatchDecidePolicyForNavigationAction(FramePolicyFunction policyFunction, const NavigationAction& action, const ResourceRequest& resourceRequest)
+void FrameLoaderClient::dispatchDecidePolicyForNavigationAction(FramePolicyFunction policyFunction, const NavigationAction& action, const ResourceRequest& resourceRequest, PassRefPtr<FormState>)
 {
     ASSERT(policyFunction);
     if (!policyFunction)

diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
@@ -1,3 +1,19 @@
+2008-06-13  Darin Adler  <darin@apple.com>
+
+        Reviewed by John Sullivan.
+
+        - updated for addition of FormState argument to action policy functions
+        - added WebActionFormKey
+
+        * WebCoreSupport/WebFrameLoaderClient.h:
+        * WebCoreSupport/WebFrameLoaderClient.mm:
+        (WebFrameLoaderClient::dispatchDecidePolicyForNewWindowAction):
+        (WebFrameLoaderClient::dispatchDecidePolicyForNavigationAction):
+        (WebFrameLoaderClient::actionDictionary):
+        * WebKit.exp:
+        * WebView/WebPolicyDelegate.mm:
+        * WebView/WebPolicyDelegatePrivate.h:
+
 2008-06-12  John Sullivan  <sullivan@apple.com>
 
         Reviewed by Dan and Darin

diff --git a/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h b/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h
@@ -109,9 +109,9 @@ class WebFrameLoaderClient : public WebCore::FrameLoaderClient {
     virtual void dispatchDecidePolicyForMIMEType(WebCore::FramePolicyFunction,
         const WebCore::String& MIMEType, const WebCore::ResourceRequest&);
     virtual void dispatchDecidePolicyForNewWindowAction(WebCore::FramePolicyFunction,
-        const WebCore::NavigationAction&, const WebCore::ResourceRequest&, const WebCore::String& frameName);
+        const WebCore::NavigationAction&, const WebCore::ResourceRequest&, PassRefPtr<WebCore::FormState>, const WebCore::String& frameName);
     virtual void dispatchDecidePolicyForNavigationAction(WebCore::FramePolicyFunction,
-        const WebCore::NavigationAction&, const WebCore::ResourceRequest&);
+        const WebCore::NavigationAction&, const WebCore::ResourceRequest&, PassRefPtr<WebCore::FormState>);
     virtual void cancelPolicyCheck();
 
     virtual void dispatchUnableToImplementPolicy(const WebCore::ResourceError&);
@@ -197,7 +197,7 @@ class WebFrameLoaderClient : public WebCore::FrameLoaderClient {
 
     RetainPtr<WebFramePolicyListener> setUpPolicyListener(WebCore::FramePolicyFunction);
 
-    NSDictionary *actionDictionary(const WebCore::NavigationAction&) const;
+    NSDictionary *actionDictionary(const WebCore::NavigationAction&, PassRefPtr<WebCore::FormState>) const;
 
     virtual bool canCachePage() const;
 

diff --git a/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm b/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm
@@ -585,22 +585,22 @@ - (void)invalidate;
 }
 
 void WebFrameLoaderClient::dispatchDecidePolicyForNewWindowAction(FramePolicyFunction function,
-    const NavigationAction& action, const ResourceRequest& request, const String& frameName)
+    const NavigationAction& action, const ResourceRequest& request, PassRefPtr<FormState> formState, const String& frameName)
 {
     WebView *webView = getWebView(m_webFrame.get());
     [[webView _policyDelegateForwarder] webView:webView
-            decidePolicyForNewWindowAction:actionDictionary(action)
+            decidePolicyForNewWindowAction:actionDictionary(action, formState)
                                    request:request.nsURLRequest()
                               newFrameName:frameName
                           decisionListener:setUpPolicyListener(function).get()];
 }
 
 void WebFrameLoaderClient::dispatchDecidePolicyForNavigationAction(FramePolicyFunction function,
-    const NavigationAction& action, const ResourceRequest& request)
+    const NavigationAction& action, const ResourceRequest& request, PassRefPtr<FormState> formState)
 {
     WebView *webView = getWebView(m_webFrame.get());
     [[webView _policyDelegateForwarder] webView:webView
-                decidePolicyForNavigationAction:actionDictionary(action)
+                decidePolicyForNavigationAction:actionDictionary(action, formState)
                                         request:request.nsURLRequest()
                                           frame:m_webFrame.get()
                                decisionListener:setUpPolicyListener(function).get()];
@@ -1014,7 +1014,7 @@ - (void)invalidate;
     return 0;
 }
 
-NSDictionary *WebFrameLoaderClient::actionDictionary(const NavigationAction& action) const
+NSDictionary *WebFrameLoaderClient::actionDictionary(const NavigationAction& action, PassRefPtr<FormState> formState) const
 {
     unsigned modifierFlags = 0;
     const Event* event = action.event();
@@ -1028,26 +1028,31 @@ - (void)invalidate;
         if (keyStateEvent->metaKey())
             modifierFlags |= NSCommandKeyMask;
     }
+
     NSURL *originalURL = action.url();
+
+    NSMutableDictionary *result = [NSMutableDictionary dictionaryWithObjectsAndKeys:
+        [NSNumber numberWithInt:action.type()], WebActionNavigationTypeKey,
+        [NSNumber numberWithInt:modifierFlags], WebActionModifierFlagsKey,
+        originalURL, WebActionOriginalURLKey,
+        nil];
+
     if (const MouseEvent* mouseEvent = findMouseEvent(event)) {
         IntPoint point(mouseEvent->pageX(), mouseEvent->pageY());
         WebElementDictionary *element = [[WebElementDictionary alloc]
             initWithHitTestResult:core(m_webFrame.get())->eventHandler()->hitTestResultAtPoint(point, false)];
-        NSDictionary *result = [NSDictionary dictionaryWithObjectsAndKeys:
-            [NSNumber numberWithInt:action.type()], WebActionNavigationTypeKey,
-            element, WebActionElementKey,
-            [NSNumber numberWithInt:mouseEvent->button()], WebActionButtonKey,
-            [NSNumber numberWithInt:modifierFlags], WebActionModifierFlagsKey,
-            originalURL, WebActionOriginalURLKey,
-            nil];
+        [result setObject:element forKey:WebActionElementKey];
         [element release];
-        return result;
+
+        [result setObject:[NSNumber numberWithInt:mouseEvent->button()] forKey:WebActionButtonKey];
     }
-    return [NSDictionary dictionaryWithObjectsAndKeys:
-        [NSNumber numberWithInt:action.type()], WebActionNavigationTypeKey,
-        [NSNumber numberWithInt:modifierFlags], WebActionModifierFlagsKey,
-        originalURL, WebActionOriginalURLKey,
-        nil];
+
+    if (formState) {
+        ASSERT(formState->form());
+        [result setObject:kit(formState->form()) forKey:WebActionFormKey];
+    }
+
+    return result;
 }
 
 bool WebFrameLoaderClient::canCachePage() const

diff --git a/WebKit/mac/WebKit.exp b/WebKit/mac/WebKit.exp
@@ -34,6 +34,7 @@ _HIWebViewCreate
 _HIWebViewGetWebView
 _WebActionButtonKey
 _WebActionElementKey
+_WebActionFormKey
 _WebActionModifierFlagsKey
 _WebActionNavigationTypeKey
 _WebActionOriginalURLKey

diff --git a/WebKit/mac/WebView/WebPolicyDelegate.mm b/WebKit/mac/WebView/WebPolicyDelegate.mm
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005, 2006 Apple Computer, Inc.  All rights reserved.
+ * Copyright (C) 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -33,10 +33,11 @@
 
 using namespace WebCore;
 
-NSString *WebActionNavigationTypeKey = @"WebActionNavigationTypeKey";
-NSString *WebActionElementKey = @"WebActionElementKey";
 NSString *WebActionButtonKey = @"WebActionButtonKey"; 
+NSString *WebActionElementKey = @"WebActionElementKey";
+NSString *WebActionFormKey = @"WebActionFormKey";
 NSString *WebActionModifierFlagsKey = @"WebActionModifierFlagsKey";
+NSString *WebActionNavigationTypeKey = @"WebActionNavigationTypeKey";
 NSString *WebActionOriginalURLKey = @"WebActionOriginalURLKey";
 
 @interface WebPolicyDecisionListenerPrivate : NSObject

diff --git a/WebKit/mac/WebView/WebPolicyDelegatePrivate.h b/WebKit/mac/WebView/WebPolicyDelegatePrivate.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005 Apple Computer, Inc.  All rights reserved.
+ * Copyright (C) 2005, 2008 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -31,6 +31,8 @@
 @class WebHistoryItem;
 @class WebPolicyDecisionListenerPrivate;
 
+extern NSString *WebActionFormKey; // HTMLFormElement
+
 typedef enum {
     WebNavigationTypePlugInRequest = WebNavigationTypeOther + 1
 } WebExtraNavigationType;

diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
@@ -1,3 +1,13 @@
+2008-06-13  Darin Adler  <darin@apple.com>
+
+        Reviewed by John Sullivan.
+
+        - updated for addition of FormState argument to action policy functions
+
+        * WebCoreSupport/FrameLoaderClientQt.cpp:
+        (WebCore::FrameLoaderClientQt::dispatchDecidePolicyForNewWindowAction):
+        (WebCore::FrameLoaderClientQt::dispatchDecidePolicyForNavigationAction):
+
 2008-06-11  Ariya Hidayat  <ariya.hidayat@trolltech.com>
 
         Reviewed by Simon.

diff --git a/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp b/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
@@ -872,7 +872,7 @@ void FrameLoaderClientQt::dispatchDecidePolicyForMIMEType(FramePolicyFunction fu
         slotCallPolicyFunction(PolicyDownload);
 }
 
-void FrameLoaderClientQt::dispatchDecidePolicyForNewWindowAction(FramePolicyFunction function, const WebCore::NavigationAction& action, const WebCore::ResourceRequest& request, const WebCore::String&)
+void FrameLoaderClientQt::dispatchDecidePolicyForNewWindowAction(FramePolicyFunction function, const WebCore::NavigationAction& action, const WebCore::ResourceRequest& request, PassRefPtr<WebCore::FormState>, const WebCore::String&)
 {
     Q_ASSERT(!m_policyFunction);
     Q_ASSERT(m_webFrame);
@@ -893,7 +893,7 @@ void FrameLoaderClientQt::dispatchDecidePolicyForNewWindowAction(FramePolicyFunc
     slotCallPolicyFunction(PolicyUse);
 }
 
-void FrameLoaderClientQt::dispatchDecidePolicyForNavigationAction(FramePolicyFunction function, const WebCore::NavigationAction& action, const WebCore::ResourceRequest& request)
+void FrameLoaderClientQt::dispatchDecidePolicyForNavigationAction(FramePolicyFunction function, const WebCore::NavigationAction& action, const WebCore::ResourceRequest& request, PassRefPtr<WebCore::FormState>)
 {
     Q_ASSERT(!m_policyFunction);
     Q_ASSERT(m_webFrame);

diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
@@ -1,3 +1,22 @@
+2008-06-13  Darin Adler  <darin@apple.com>
+
+        Reviewed by John Sullivan.
+
+        - updated for addition of FormState argument to action policy functions
+        - added WebActionFormKey
+
+        * Interfaces/IWebPolicyDelegate.idl:
+        * WebActionPropertyBag.cpp:
+        (WebActionPropertyBag::WebActionPropertyBag):
+        (WebActionPropertyBag::createInstance):
+        (WebActionPropertyBag::AddRef):
+        (WebActionPropertyBag::Release):
+        (WebActionPropertyBag::Read):
+        * WebActionPropertyBag.h:
+        * WebFrame.cpp:
+        (WebFrame::dispatchDecidePolicyForNewWindowAction):
+        (WebFrame::dispatchDecidePolicyForNavigationAction):
+
 2008-06-07  Darin Adler  <darin@apple.com>
 
         Reviewed by Mitz.

diff --git a/WebKit/win/Interfaces/IWebPolicyDelegate.idl b/WebKit/win/Interfaces/IWebPolicyDelegate.idl
@@ -57,20 +57,13 @@ typedef enum WebNavigationType {
     WebNavigationTypeOther
 } WebNavigationType;
 
-cpp_quote("#define WebActionNavigationTypeKey TEXT(\"WebActionNavigationTypeKey\")")
-cpp_quote("#define WebActionElementKey TEXT(\"WebActionElementKey\")")
 cpp_quote("#define WebActionButtonKey TEXT(\"WebActionButtonKey\")")
+cpp_quote("#define WebActionElementKey TEXT(\"WebActionElementKey\")")
+cpp_quote("#define WebActionFormKey TEXT(\"WebActionFormKey\")")
 cpp_quote("#define WebActionModifierFlagsKey TEXT(\"WebActionModifierFlagsKey\")")
+cpp_quote("#define WebActionNavigationTypeKey TEXT(\"WebActionNavigationTypeKey\")")
 cpp_quote("#define WebActionOriginalURLKey TEXT(\"WebActionOriginalURLKey\")")
 
-/*
-extern NSString *WebActionNavigationTypeKey; // NSNumber (WebNavigationType)
-extern NSString *WebActionElementKey; // NSDictionary of element info
-extern NSString *WebActionButtonKey;  // NSEventType
-extern NSString *WebActionModifierFlagsKey; // NSNumber (unsigned)
-extern NSString *WebActionOriginalURLKey; // NSURL
-*/
-
 /*!
     @protocol WebPolicyDecisionListener
     @discussion This protocol is used to call back with the results of a