Changeset 191535 in webkit

Timestamp:

Oct 24, 2015 8:57:25 AM (9 years ago)

Author:

mitz@apple.com

Message:

[Cocoa] _WKFormInputSession should provide access to the focused element info
​https://bugs.webkit.org/show_bug.cgi?id=150512

Reviewed by Tim Horton.

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

• UIProcess/ios/WKContentViewInteraction.mm:

(-[WKFormInputSession initWithContentView:focusedElementInfo:userObject:]): Added the

focusedElementInfo argument, used to initialize a new ivar.

(-[WKFormInputSession focusedElementInfo]): Added this getter for the new

_WKFormInputSession property.

(-[WKContentView _startAssistingNode:userIsInteracting:blurPreviousNode:userObject:]):

Create the WKFocusedElementInfo unconditionally and pass it to the new WKFormInputSession
initializer.

Location:

trunk/Source/WebKit2

Files:

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

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-10-24  Dan Bernstein  <mitz@apple.com>
+
+        [Cocoa] _WKFormInputSession should provide access to the focused element info
+        https://bugs.webkit.org/show_bug.cgi?id=150512
+
+        Reviewed by Tim Horton.
+
+        * UIProcess/API/Cocoa/_WKFormInputSession.h: Added focusedElementInfo property to the
+          protocol.
+
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (-[WKFormInputSession initWithContentView:focusedElementInfo:userObject:]): Added the
+          focusedElementInfo argument, used to initialize a new ivar.
+        (-[WKFormInputSession focusedElementInfo]): Added this getter for the new
+          _WKFormInputSession property.
+        (-[WKContentView _startAssistingNode:userIsInteracting:blurPreviousNode:userObject:]):
+          Create the WKFocusedElementInfo unconditionally and pass it to the new WKFormInputSession
+          initializer.
+
 2015-10-24  Dan Bernstein  <mitz@apple.com>
 

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

@@ -29 +29 @@
 
 #import <Foundation/Foundation.h>
+#import <WebKit/_WKFocusedElementInfo.h>
 
 @protocol _WKFormInputSession <NSObject>
@@ -34 +35 @@
 @property (nonatomic, readonly, getter=isValid) BOOL valid;
 @property (nonatomic, readonly) NSObject <NSSecureCoding> *userObject;
+@property (nonatomic, readonly) id <_WKFocusedElementInfo> focusedElementInfo WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
 
 #if TARGET_OS_IPHONE

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

@@ -224 +224 @@
 #endif
 
+@interface WKFocusedElementInfo : NSObject <_WKFocusedElementInfo>
+- (instancetype)initWithAssistedNodeInformation:(const AssistedNodeInformation&)information isUserInitiated:(BOOL)isUserInitiated;
+@end
+
 @interface WKFormInputSession : NSObject <_WKFormInputSession>
 
-- (instancetype)initWithContentView:(WKContentView *)view userObject:(NSObject <NSSecureCoding> *)userObject;
+- (instancetype)initWithContentView:(WKContentView *)view focusedElementInfo:(WKFocusedElementInfo *)elementInfo userObject:(NSObject <NSSecureCoding> *)userObject;
 - (void)invalidate;
 
@@ -234 +238 @@
     WKContentView *_contentView;
     RetainPtr<NSObject <NSSecureCoding>> _userObject;
+    RetainPtr<WKFocusedElementInfo> _focusedElementInfo;
     RetainPtr<UIView> _customInputView;
 }
 
-- (instancetype)initWithContentView:(WKContentView *)view userObject:(NSObject <NSSecureCoding> *)userObject
+- (instancetype)initWithContentView:(WKContentView *)view focusedElementInfo:(WKFocusedElementInfo *)elementInfo userObject:(NSObject <NSSecureCoding> *)userObject
 {
     if (!(self = [super init]))
@@ -243 +248 @@
 
     _contentView = view;
+    _focusedElementInfo = elementInfo;
     _userObject = userObject;
 
     return self;
+}
+
+- (id <_WKFocusedElementInfo>)focusedElementInfo
+{
+    return _focusedElementInfo.get();
 }
 
@@ -292 +303 @@
 }
 
-@end
-
-@interface WKFocusedElementInfo : NSObject <_WKFocusedElementInfo>
-- (instancetype)initWithAssistedNodeInformation:(const AssistedNodeInformation&)information isUserInitiated:(BOOL)isUserInitiated;
 @end
 
@@ -3193 +3200 @@
 {
     id <_WKInputDelegate> inputDelegate = [_webView _inputDelegate];
+    RetainPtr<WKFocusedElementInfo> focusedElementInfo = adoptNS([[WKFocusedElementInfo alloc] initWithAssistedNodeInformation:information isUserInitiated:userIsInteracting]);
     BOOL shouldShowKeyboard;
-    if ([inputDelegate respondsToSelector:@selector(_webView:focusShouldStartInputSession:)]) {
-        RetainPtr<WKFocusedElementInfo> focusedElementInfo = adoptNS([[WKFocusedElementInfo alloc] initWithAssistedNodeInformation:information isUserInitiated:userIsInteracting]);
+
+    if ([inputDelegate respondsToSelector:@selector(_webView:focusShouldStartInputSession:)])
         shouldShowKeyboard = [inputDelegate _webView:_webView focusShouldStartInputSession:focusedElementInfo.get()];
-    } else {
+    else {
         // The default behavior is to allow node assistance if the user is interacting or the keyboard is already active.
         shouldShowKeyboard = userIsInteracting || _textSelectionAssistant;
@@ -3245 +3253 @@
 
     if ([inputDelegate respondsToSelector:@selector(_webView:didStartInputSession:)]) {
-        _formInputSession = adoptNS([[WKFormInputSession alloc] initWithContentView:self userObject:userObject]);
+        _formInputSession = adoptNS([[WKFormInputSession alloc] initWithContentView:self focusedElementInfo:focusedElementInfo.get() userObject:userObject]);
         [inputDelegate _webView:_webView didStartInputSession:_formInputSession.get()];
     }