Changeset 191534 in webkit

Timestamp:

Oct 24, 2015 8:54:09 AM (9 years ago)

Author:

mitz@apple.com

Message:

[iOS] Allow clients to specify a custom input view to be used for a form input session
​https://bugs.webkit.org/show_bug.cgi?id=150395

Reviewed by Tim Horton.

• UIProcess/API/Cocoa/_WKFormInputSession.h: Added customInputView property to the protocol.

• UIProcess/ios/WKContentViewInteraction.mm:

(-[WKFormInputSession customInputView]): Added this getter.
(-[WKFormInputSession setCustomInputView:]): Added this setter, which reloads the input

views when the custom input view changes.

(-[WKContentView inputView]): Changed to return the custom view from the input session if

there is one.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/Cocoa/_WKFormInputSession.h (modified) (1 diff)
• UIProcess/ios/WKContentViewInteraction.mm (modified) (3 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-10-24  Dan Bernstein  <mitz@apple.com>
+
+        [iOS] Allow clients to specify a custom input view to be used for a form input session
+        https://bugs.webkit.org/show_bug.cgi?id=150395
+
+        Reviewed by Tim Horton.
+
+        * UIProcess/API/Cocoa/_WKFormInputSession.h: Added customInputView property to the protocol.
+
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (-[WKFormInputSession customInputView]): Added this getter.
+        (-[WKFormInputSession setCustomInputView:]): Added this setter, which reloads the input
+          views when the custom input view changes.
+        (-[WKContentView inputView]): Changed to return the custom view from the input session if
+          there is one.
+
 2015-10-23  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKFormInputSession.h

@@ -37 +37 @@
 #if TARGET_OS_IPHONE
 @property (nonatomic, copy) NSString *accessoryViewCustomButtonTitle;
+@property (nonatomic, strong) UIView *customInputView WK_AVAILABLE(NA, WK_IOS_TBA);
 #endif
 

trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm

@@ -234 +234 @@
     WKContentView *_contentView;
     RetainPtr<NSObject <NSSecureCoding>> _userObject;
+    RetainPtr<UIView> _customInputView;
 }
 
@@ -270 +271 @@
     if (UICurrentUserInterfaceIdiomIsPad())
         [_contentView reloadInputViews];
+}
+
+- (UIView *)customInputView
+{
+    return _customInputView.get();
+}
+
+- (void)setCustomInputView:(UIView *)customInputView
+{
+    if (customInputView == _customInputView)
+        return;
+
+    _customInputView = customInputView;
+    [_contentView reloadInputViews];
 }
 
@@ -975 +990 @@
         [self _displayFormNodeInputView];
 
-    return [_inputPeripheral assistantView];
+    return [_formInputSession customInputView] ?: [_inputPeripheral assistantView];
 }