- Revision
- 167343
- Author
- m...@apple.com
- Date
- 2014-04-15 22:16:36 -0700 (Tue, 15 Apr 2014)
Log Message
[Cocoa] Add a form delegate method corresponding to willSubmitForm
https://bugs.webkit.org/show_bug.cgi?id=131718
Reviewed by Tim Horton.
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView _setFormDelegate:]): Changed to define and create a FormClient (which derives
from API::FormClient and messages a delegate), and set it as the form client.
* UIProcess/API/Cocoa/_WKFormDelegate.h: Declared new delegate method.
* WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFormDelegatePrivate.h: Added a
variant of willSubmitForm that returs a user object to pass to the delegate in the UI
process, giving it a temporary name with “new”.
* WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm:
(-[WKWebProcessPlugInBrowserContextController _setFormDelegate:]): Changed willSubmitForm()
to check for the new bundle delegate method first and encode the user object as user data.
Moved the encoding of an NSObject <NSSecureCoding> as user data into a helper function.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (167342 => 167343)
--- trunk/Source/WebKit2/ChangeLog 2014-04-16 03:45:28 UTC (rev 167342)
+++ trunk/Source/WebKit2/ChangeLog 2014-04-16 05:16:36 UTC (rev 167343)
@@ -1,3 +1,25 @@
+2014-04-15 Dan Bernstein <m...@apple.com>
+
+ [Cocoa] Add a form delegate method corresponding to willSubmitForm
+ https://bugs.webkit.org/show_bug.cgi?id=131718
+
+ Reviewed by Tim Horton.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _setFormDelegate:]): Changed to define and create a FormClient (which derives
+ from API::FormClient and messages a delegate), and set it as the form client.
+
+ * UIProcess/API/Cocoa/_WKFormDelegate.h: Declared new delegate method.
+
+ * WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFormDelegatePrivate.h: Added a
+ variant of willSubmitForm that returs a user object to pass to the delegate in the UI
+ process, giving it a temporary name with “new”.
+
+ * WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm:
+ (-[WKWebProcessPlugInBrowserContextController _setFormDelegate:]): Changed willSubmitForm()
+ to check for the new bundle delegate method first and encode the user object as user data.
+ Moved the encoding of an NSObject <NSSecureCoding> as user data into a helper function.
+
2014-04-15 Hyowon Kim <hw1008....@samsung.com>
Make page overlay functionality working on coordinated graphics.
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (167342 => 167343)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-04-16 03:45:28 UTC (rev 167342)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-04-16 05:16:36 UTC (rev 167343)
@@ -28,6 +28,7 @@
#if WK_API_ENABLED
+#import "APIFormClient.h"
#import "FindClient.h"
#import "NavigationState.h"
#import "RemoteLayerTreeTransaction.h"
@@ -52,10 +53,12 @@
#import "WebBackForwardList.h"
#import "WebCertificateInfo.h"
#import "WebContext.h"
+#import "WebFormSubmissionListenerProxy.h"
#import "WebPageGroup.h"
#import "WebPageProxy.h"
#import "WebProcessProxy.h"
#import "_WKFindDelegate.h"
+#import "_WKFormDelegate.h"
#import "_WKRemoteObjectRegistryInternal.h"
#import "_WKVisitedLinkProviderInternal.h"
#import <wtf/RetainPtr.h>
@@ -1185,6 +1188,59 @@
- (void)_setFormDelegate:(id <_WKFormDelegate>)formDelegate
{
_formDelegate = formDelegate;
+
+ class FormClient : public API::FormClient {
+ public:
+ explicit FormClient(WKWebView *webView)
+ : m_webView(webView)
+ {
+ }
+
+ virtual ~FormClient() { }
+
+ virtual bool willSubmitForm(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, WebKit::WebFrameProxy* sourceFrame, const Vector<std::pair<WTF::String, WTF::String>>& textFieldValues, API::Object* userData, WebKit::WebFormSubmissionListenerProxy* listener) override
+ {
+ if (userData && userData->type() != API::Object::Type::Data) {
+ ASSERT(!userData || userData->type() == API::Object::Type::Data);
+ m_webView->_page->process().connection()->markCurrentlyDispatchedMessageAsInvalid();
+ return false;
+ }
+
+ auto formDelegate = m_webView->_formDelegate.get();
+
+ if (![formDelegate respondsToSelector:@selector(_webView:willSubmitFormValues:userObject:submissionHandler:)])
+ return false;
+
+ auto valueMap = adoptNS([[NSMutableDictionary alloc] initWithCapacity:textFieldValues.size()]);
+ for (const auto& pair : textFieldValues)
+ [valueMap setObject:pair.second forKey:pair.first];
+
+ NSObject <NSSecureCoding> *userObject = nil;
+ if (API::Data* data = "" {
+ auto nsData = adoptNS([[NSData alloc] initWithBytesNoCopy:const_cast<void*>(static_cast<const void*>(data->bytes())) length:data->size() freeWhenDone:NO]);
+ auto unarchiver = adoptNS([[NSKeyedUnarchiver alloc] initForReadingWithData:nsData.get()]);
+ [unarchiver setRequiresSecureCoding:YES];
+ @try {
+ userObject = [unarchiver decodeObjectOfClass:[NSObject class] forKey:@"userObject"];
+ } @catch (NSException *exception) {
+ LOG_ERROR("Failed to decode user data: %@", exception);
+ }
+ }
+
+ [formDelegate _webView:m_webView willSubmitFormValues:valueMap.get() userObject:userObject submissionHandler:^{
+ listener->continueSubmission();
+ }];
+ return true;
+ }
+
+ private:
+ WKWebView *m_webView;
+ };
+
+ if (formDelegate)
+ _page->setFormClient(std::make_unique<FormClient>(self));
+ else
+ _page->setFormClient(nullptr);
}
#pragma mark iOS-specific methods
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKFormDelegate.h (167342 => 167343)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKFormDelegate.h 2014-04-16 03:45:28 UTC (rev 167342)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKFormDelegate.h 2014-04-16 05:16:36 UTC (rev 167343)
@@ -37,6 +37,7 @@
@optional
- (void)_webView:(WKWebView *)webView didStartInputSession:(id <_WKFormInputSession>)inputSession;
+- (void)_webView:(WKWebView *)webView willSubmitFormValues:(NSDictionary *)values userObject:(NSObject <NSSecureCoding> *)userObject submissionHandler:(void (^)(void))submissionHandler;
#if TARGET_OS_IPHONE
- (void)_webView:(WKWebView *)webView accessoryViewCustomButtonTappedInFormInputSession:(id <_WKFormInputSession>)inputSession;
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFormDelegatePrivate.h (167342 => 167343)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFormDelegatePrivate.h 2014-04-16 03:45:28 UTC (rev 167342)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFormDelegatePrivate.h 2014-04-16 05:16:36 UTC (rev 167343)
@@ -40,6 +40,10 @@
- (void)_webProcessPlugInBrowserContextController:(WKWebProcessPlugInBrowserContextController *)controller willSubmitForm:(WKWebProcessPlugInNodeHandle *)form toFrame:(WKWebProcessPlugInFrame *)frame fromFrame:(WKWebProcessPlugInFrame *)sourceFrame withValues:(NSDictionary *)values;
- (void)_webProcessPlugInBrowserContextController:(WKWebProcessPlugInBrowserContextController *)controller textDidChangeInTextField:(WKWebProcessPlugInNodeHandle *)textField inFrame:(WKWebProcessPlugInFrame *)frame initiatedByUserTyping:(BOOL)initiatedByUserTyping;
+// FIXME: Once no one implements the above willSubmitForm:, remove "new" from the name.
+// The return value is exposed in the UI process via the userObject parameter to [id <_WKFormDelegate> _webView:willSubmitFormValues:userObject:submissionHandler:].
+- (NSObject <NSSecureCoding> *)_webProcessPlugInBrowserContextController:(WKWebProcessPlugInBrowserContextController *)controller newWillSubmitForm:(WKWebProcessPlugInNodeHandle *)form toFrame:(WKWebProcessPlugInFrame *)frame fromFrame:(WKWebProcessPlugInFrame *)sourceFrame withValues:(NSDictionary *)values;
+
// The return value is exposed in the UI process via the userObject property of the _WKFormInputSession object.
- (NSObject <NSSecureCoding> *)_webProcessPlugInBrowserContextController:(WKWebProcessPlugInBrowserContextController *)controller willBeginInputSessionForElement:(WKWebProcessPlugInNodeHandle *)node inFrame:(WKWebProcessPlugInFrame *)frame;
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm (167342 => 167343)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm 2014-04-16 03:45:28 UTC (rev 167342)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm 2014-04-16 05:16:36 UTC (rev 167343)
@@ -407,15 +407,41 @@
}
}
+ static void encodeUserObject(NSObject <NSSecureCoding> *userObject, RefPtr<API::Object>& userData)
+ {
+ if (!userObject)
+ return;
+
+ auto data = "" alloc] init]);
+ auto archiver = adoptNS([[NSKeyedArchiver alloc] initForWritingWithMutableData:data.get()]);
+ [archiver setRequiresSecureCoding:YES];
+ @try {
+ [archiver encodeObject:userObject forKey:@"userObject"];
+ } @catch (NSException *exception) {
+ LOG_ERROR("Failed to encode user object: %@", exception);
+ return;
+ }
+ [archiver finishEncoding];
+
+ userData = API::Data::createWithoutCopying((const unsigned char*)[data bytes], [data length], releaseNSData, data.leakRef()).leakRef();
+ }
+
virtual void willSubmitForm(WebPage*, HTMLFormElement* formElement, WebFrame* frame, WebFrame* sourceFrame, const Vector<std::pair<WTF::String, WTF::String>>& values, RefPtr<API::Object>& userData) override
{
auto formDelegate = m_controller->_formDelegate.get();
- if ([formDelegate respondsToSelector:@selector(_webProcessPlugInBrowserContextController:willSubmitForm:toFrame:fromFrame:withValues:)]) {
+ if ([formDelegate respondsToSelector:@selector(_webProcessPlugInBrowserContextController:newWillSubmitForm:toFrame:fromFrame:withValues:)]) {
auto valueMap = adoptNS([[NSMutableDictionary alloc] initWithCapacity:values.size()]);
for (const auto& pair : values)
[valueMap setObject:pair.second forKey:pair.first];
+ NSObject <NSSecureCoding> *userObject = [formDelegate _webProcessPlugInBrowserContextController:m_controller newWillSubmitForm:wrapper(*InjectedBundleNodeHandle::getOrCreate(formElement).get()) toFrame:wrapper(*frame) fromFrame:wrapper(*sourceFrame) withValues:valueMap.get()];
+ encodeUserObject(userObject, userData);
+ } else if ([formDelegate respondsToSelector:@selector(_webProcessPlugInBrowserContextController:willSubmitForm:toFrame:fromFrame:withValues:)]) {
+ auto valueMap = adoptNS([[NSMutableDictionary alloc] initWithCapacity:values.size()]);
+ for (const auto& pair : values)
+ [valueMap setObject:pair.second forKey:pair.first];
+
[formDelegate _webProcessPlugInBrowserContextController:m_controller willSubmitForm:wrapper(*InjectedBundleNodeHandle::getOrCreate(formElement).get()) toFrame:wrapper(*frame) fromFrame:wrapper(*sourceFrame) withValues:valueMap.get()];
}
}
@@ -441,21 +467,7 @@
return;
NSObject <NSSecureCoding> *userObject = [formDelegate _webProcessPlugInBrowserContextController:m_controller willBeginInputSessionForElement:wrapper(*WebKit::InjectedBundleNodeHandle::getOrCreate(element)) inFrame:wrapper(*frame)];
- if (!userObject)
- return;
-
- auto data = "" alloc] init]);
- auto archiver = adoptNS([[NSKeyedArchiver alloc] initForWritingWithMutableData:data.get()]);
- [archiver setRequiresSecureCoding:YES];
- @try {
- [archiver encodeObject:userObject forKey:@"userObject"];
- } @catch (NSException *exception) {
- LOG_ERROR("Failed to encode user object: %@", exception);
- return;
- }
- [archiver finishEncoding];
-
- userData = API::Data::createWithoutCopying((const unsigned char*)[data bytes], [data length], releaseNSData, data.leakRef()).leakRef();
+ encodeUserObject(userObject, userData);
}
private:
