Title: [168573] trunk/Source/WebKit2
- Revision
- 168573
- Author
- [email protected]
- Date
- 2014-05-09 23:48:51 -0700 (Fri, 09 May 2014)
Log Message
[Cocoa] Remove a deprecated bundle form delegate method now that no one implements it
https://bugs.webkit.org/show_bug.cgi?id=132769
Reviewed by Sam Weinig.
* WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm:
(-[WKWebProcessPlugInBrowserContextController _setFormDelegate:]):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (168572 => 168573)
--- trunk/Source/WebKit2/ChangeLog 2014-05-10 05:14:24 UTC (rev 168572)
+++ trunk/Source/WebKit2/ChangeLog 2014-05-10 06:48:51 UTC (rev 168573)
@@ -1,3 +1,13 @@
+2014-05-09 Dan Bernstein <[email protected]>
+
+ [Cocoa] Remove a deprecated bundle form delegate method now that no one implements it
+ https://bugs.webkit.org/show_bug.cgi?id=132769
+
+ Reviewed by Sam Weinig.
+
+ * WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm:
+ (-[WKWebProcessPlugInBrowserContextController _setFormDelegate:]):
+
2014-05-09 Benjamin Poulain <[email protected]>
[iOS][WK2] Fix bugs exposed by r168556
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm (168572 => 168573)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm 2014-05-10 05:14:24 UTC (rev 168572)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm 2014-05-10 06:48:51 UTC (rev 168573)
@@ -60,10 +60,6 @@
using namespace WebCore;
using namespace WebKit;
-@protocol WKWebProcessPlugInFormDelegatePrivateDeprecated <NSObject>
-- (NSObject <NSSecureCoding> *)_webProcessPlugInBrowserContextController:(WKWebProcessPlugInBrowserContextController *)controller newWillSubmitForm:(WKWebProcessPlugInNodeHandle *)form toFrame:(WKWebProcessPlugInFrame *)frame fromFrame:(WKWebProcessPlugInFrame *)sourceFrame withValues:(NSDictionary *)values;
-@end
-
@implementation WKWebProcessPlugInBrowserContextController {
API::ObjectStorage<WebPage> _page;
WeakObjCPtr<id <WKWebProcessPlugInLoadDelegate>> _loadDelegate;
@@ -434,18 +430,11 @@
{
auto formDelegate = m_controller->_formDelegate.get();
- if ([formDelegate respondsToSelector:@selector(_webProcessPlugInBrowserContextController:newWillSubmitForm:toFrame:fromFrame:withValues:)]) {
+ 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];
- NSObject <NSSecureCoding> *userObject = [(id)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];
-
NSObject <NSSecureCoding> *userObject = [formDelegate _webProcessPlugInBrowserContextController:m_controller willSubmitForm:wrapper(*InjectedBundleNodeHandle::getOrCreate(formElement).get()) toFrame:wrapper(*frame) fromFrame:wrapper(*sourceFrame) withValues:valueMap.get()];
encodeUserObject(userObject, userData);
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
