<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[191228] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/191228">191228</a></dd>
<dt>Author</dt> <dd>wenson_hsieh@apple.com</dd>
<dt>Date</dt> <dd>2015-10-16 16:47:10 -0700 (Fri, 16 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add a WKWebView input delegate SPI
https://bugs.webkit.org/show_bug.cgi?id=149646
Reviewed by Dan Bernstein.
Renames the existing _WKFormDelegate to _WKInputDelegate and adds a new delegate SPI method
-[_WKInputDelegate _webView:focusShouldStartInputSession:] that allows clients to allow or
disallow showing up the keyboard. To make this decision, clients are given a
_WKFocusedElementInfo, which contains information about the focused element prior to the
keyboard showing up so the client will be able to override default assistance behavior.
While the information contained in a _WKFocusedElementInfo currently seems like overkill for
_webView:focusShouldStartInputSession, our intentions are to give WebKit clients control over more
details of how node assistance works, such as being able to use a custom editor for certain
types of nodes.
* Shared/API/Cocoa/WebKitPrivate.h: Added new header _WKFocusedElementInfo.h.
* UIProcess/API/Cocoa/WKWebView.h:
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView _inputDelegate]):
(-[WKWebView _formDelegate]):
(-[WKWebView _setInputDelegate:]):
(-[WKWebView _setFormDelegate:]):
(-[WKWebView initWithFrame:configuration:]): Deleted canAssistOnProgrammaticFocus flag.
(-[WKWebView canAssistOnProgrammaticFocus]): Ditto.
(-[WKWebView setCanAssistOnProgrammaticFocus:]): Ditto.
* UIProcess/API/Cocoa/WKWebViewConfiguration.h:
* UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
(-[WKWebViewConfiguration init]): Deleted.
(-[WKWebViewConfiguration _canAssistOnProgrammaticFocus]): Deleted canAssistOnProgrammaticFocus flag.
(-[WKWebViewConfiguration _setCanAssistOnProgrammaticFocus:]): Ditto.
* UIProcess/API/Cocoa/WKWebViewPrivate.h:
* UIProcess/API/Cocoa/_WKFocusedElementInfo.h: Added.
* UIProcess/API/Cocoa/_WKFormDelegate.h:
* UIProcess/API/Cocoa/_WKInputDelegate.h: Copied from Source/WebKit2/UIProcess/API/Cocoa/_WKFormDelegate.h.
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKFocusedElementInfo initWithAssistedNodeInformation:isInteracting:]):
(-[WKFocusedElementInfo type]):
(-[WKFocusedElementInfo value]):
(-[WKFocusedElementInfo isUserInitiated]):
(-[WKContentView accessoryAutoFill]):
(-[WKContentView _startAssistingNode:userIsInteracting:blurPreviousNode:userObject:]): If the input delegate responds to
shouldStartInputSession, consult it to see if we should bring up the keyboard; otherwise, use our default behavior.
* WebKit2.xcodeproj/project.pbxproj:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedAPICocoaWebKitPrivateh">trunk/Source/WebKit2/Shared/API/Cocoa/WebKitPrivate.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewConfigurationh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewConfigurationmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewPrivateh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoa_WKFormDelegateh">trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKFormDelegate.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWKContentViewInteractionmm">trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoa_WKFocusedElementInfoh">trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKFocusedElementInfo.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoa_WKInputDelegateh">trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKInputDelegate.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (191227 => 191228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-10-16 23:46:09 UTC (rev 191227)
+++ trunk/Source/WebKit2/ChangeLog 2015-10-16 23:47:10 UTC (rev 191228)
</span><span class="lines">@@ -1,3 +1,50 @@
</span><ins>+2015-10-16 Wenson Hsieh <wenson_hsieh@apple.com>
+
+ Add a WKWebView input delegate SPI
+ https://bugs.webkit.org/show_bug.cgi?id=149646
+
+ Reviewed by Dan Bernstein.
+
+ Renames the existing _WKFormDelegate to _WKInputDelegate and adds a new delegate SPI method
+ -[_WKInputDelegate _webView:focusShouldStartInputSession:] that allows clients to allow or
+ disallow showing up the keyboard. To make this decision, clients are given a
+ _WKFocusedElementInfo, which contains information about the focused element prior to the
+ keyboard showing up so the client will be able to override default assistance behavior.
+
+ While the information contained in a _WKFocusedElementInfo currently seems like overkill for
+ _webView:focusShouldStartInputSession, our intentions are to give WebKit clients control over more
+ details of how node assistance works, such as being able to use a custom editor for certain
+ types of nodes.
+
+ * Shared/API/Cocoa/WebKitPrivate.h: Added new header _WKFocusedElementInfo.h.
+ * UIProcess/API/Cocoa/WKWebView.h:
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _inputDelegate]):
+ (-[WKWebView _formDelegate]):
+ (-[WKWebView _setInputDelegate:]):
+ (-[WKWebView _setFormDelegate:]):
+ (-[WKWebView initWithFrame:configuration:]): Deleted canAssistOnProgrammaticFocus flag.
+ (-[WKWebView canAssistOnProgrammaticFocus]): Ditto.
+ (-[WKWebView setCanAssistOnProgrammaticFocus:]): Ditto.
+ * UIProcess/API/Cocoa/WKWebViewConfiguration.h:
+ * UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
+ (-[WKWebViewConfiguration init]): Deleted.
+ (-[WKWebViewConfiguration _canAssistOnProgrammaticFocus]): Deleted canAssistOnProgrammaticFocus flag.
+ (-[WKWebViewConfiguration _setCanAssistOnProgrammaticFocus:]): Ditto.
+ * UIProcess/API/Cocoa/WKWebViewPrivate.h:
+ * UIProcess/API/Cocoa/_WKFocusedElementInfo.h: Added.
+ * UIProcess/API/Cocoa/_WKFormDelegate.h:
+ * UIProcess/API/Cocoa/_WKInputDelegate.h: Copied from Source/WebKit2/UIProcess/API/Cocoa/_WKFormDelegate.h.
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKFocusedElementInfo initWithAssistedNodeInformation:isInteracting:]):
+ (-[WKFocusedElementInfo type]):
+ (-[WKFocusedElementInfo value]):
+ (-[WKFocusedElementInfo isUserInitiated]):
+ (-[WKContentView accessoryAutoFill]):
+ (-[WKContentView _startAssistingNode:userIsInteracting:blurPreviousNode:userObject:]): If the input delegate responds to
+ shouldStartInputSession, consult it to see if we should bring up the keyboard; otherwise, use our default behavior.
+ * WebKit2.xcodeproj/project.pbxproj:
+
</ins><span class="cx"> 2015-10-16 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Make TextStream the canonical way to log classes in WebCore
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPICocoaWebKitPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/Cocoa/WebKitPrivate.h (191227 => 191228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/Cocoa/WebKitPrivate.h 2015-10-16 23:46:09 UTC (rev 191227)
+++ trunk/Source/WebKit2/Shared/API/Cocoa/WebKitPrivate.h 2015-10-16 23:47:10 UTC (rev 191228)
</span><span class="lines">@@ -31,8 +31,10 @@
</span><span class="cx"> #import <WebKit/WKWebViewPrivate.h>
</span><span class="cx"> #import <WebKit/_WKActivatedElementInfo.h>
</span><span class="cx"> #import <WebKit/_WKElementAction.h>
</span><ins>+#import <WebKit/_WKFocusedElementInfo.h>
</ins><span class="cx"> #import <WebKit/_WKFormDelegate.h>
</span><span class="cx"> #import <WebKit/_WKFormInputSession.h>
</span><ins>+#import <WebKit/_WKInputDelegate.h>
</ins><span class="cx"> #import <WebKit/_WKProcessPoolConfiguration.h>
</span><span class="cx"> #import <WebKit/_WKThumbnailView.h>
</span><span class="cx"> #import <WebKit/_WKVisitedLinkStore.h>
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h (191227 => 191228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h 2015-10-16 23:46:09 UTC (rev 191227)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h 2015-10-16 23:47:10 UTC (rev 191228)
</span><span class="lines">@@ -241,11 +241,6 @@
</span><span class="cx"> /*! @abstract The scroll view associated with the web view.
</span><span class="cx"> */
</span><span class="cx"> @property (nonatomic, readonly, strong) UIScrollView *scrollView;
</span><del>-
-/*! @abstract A Boolean value indicating whether programmatic focus on
- an element is allowed to trigger assistance.
- */
-@property (nonatomic) BOOL canAssistOnProgrammaticFocus;
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if !TARGET_OS_IPHONE
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (191227 => 191228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-10-16 23:46:09 UTC (rev 191227)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-10-16 23:47:10 UTC (rev 191228)
</span><span class="lines">@@ -74,6 +74,7 @@
</span><span class="cx"> #import "_WKDiagnosticLoggingDelegate.h"
</span><span class="cx"> #import "_WKFindDelegate.h"
</span><span class="cx"> #import "_WKFormDelegate.h"
</span><ins>+#import "_WKInputDelegate.h"
</ins><span class="cx"> #import "_WKRemoteObjectRegistryInternal.h"
</span><span class="cx"> #import "_WKSessionStateInternal.h"
</span><span class="cx"> #import "_WKVisitedLinkStoreInternal.h"
</span><span class="lines">@@ -159,7 +160,7 @@
</span><span class="cx"> RetainPtr<_WKRemoteObjectRegistry> _remoteObjectRegistry;
</span><span class="cx"> _WKRenderingProgressEvents _observedRenderingProgressEvents;
</span><span class="cx">
</span><del>- WebKit::WeakObjCPtr<id <_WKFormDelegate>> _formDelegate;
</del><ins>+ WebKit::WeakObjCPtr<id <_WKInputDelegate>> _inputDelegate;
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> RetainPtr<WKScrollView> _scrollView;
</span><span class="lines">@@ -212,8 +213,6 @@
</span><span class="cx"> BOOL _pageIsPrintingToPDF;
</span><span class="cx"> RetainPtr<CGPDFDocumentRef> _printedDocument;
</span><span class="cx"> Vector<std::function<void ()>> _snapshotsDeferredDuringResize;
</span><del>-
- BOOL _canAssistOnProgrammaticFocus;
</del><span class="cx"> #endif
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> RetainPtr<WKView> _wkView;
</span><span class="lines">@@ -366,8 +365,6 @@
</span><span class="cx"> _page->contentSizeCategoryDidChange([self _contentSizeCategory]);
</span><span class="cx">
</span><span class="cx"> [[_configuration _contentProviderRegistry] addPage:*_page];
</span><del>-
- [self setCanAssistOnProgrammaticFocus:[_configuration canAssistOnProgrammaticFocus]];
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="lines">@@ -724,16 +721,6 @@
</span><span class="cx"> return _scrollView.get();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (BOOL)canAssistOnProgrammaticFocus
-{
- return _canAssistOnProgrammaticFocus;
-}
-
-- (void)setCanAssistOnProgrammaticFocus:(BOOL)canAssistOnProgrammaticFocus
-{
- _canAssistOnProgrammaticFocus = canAssistOnProgrammaticFocus;
-}
-
</del><span class="cx"> - (WKBrowsingContextController *)browsingContextController
</span><span class="cx"> {
</span><span class="cx"> return [_contentView browsingContextController];
</span><span class="lines">@@ -2476,14 +2463,19 @@
</span><span class="cx"> _page->recordNavigationSnapshot(item._item);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (id <_WKInputDelegate>)_inputDelegate
+{
+ return _inputDelegate.getAutoreleased();
+}
+
</ins><span class="cx"> - (id <_WKFormDelegate>)_formDelegate
</span><span class="cx"> {
</span><del>- return _formDelegate.getAutoreleased();
</del><ins>+ return (id <_WKFormDelegate>)[self _inputDelegate];
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)_setFormDelegate:(id <_WKFormDelegate>)formDelegate
</del><ins>+- (void)_setInputDelegate:(id <_WKInputDelegate>)inputDelegate
</ins><span class="cx"> {
</span><del>- _formDelegate = formDelegate;
</del><ins>+ _inputDelegate = inputDelegate;
</ins><span class="cx">
</span><span class="cx"> class FormClient : public API::FormClient {
</span><span class="cx"> public:
</span><span class="lines">@@ -2503,9 +2495,9 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- auto formDelegate = m_webView->_formDelegate.get();
</del><ins>+ auto inputDelegate = m_webView->_inputDelegate.get();
</ins><span class="cx">
</span><del>- if (![formDelegate respondsToSelector:@selector(_webView:willSubmitFormValues:userObject:submissionHandler:)]) {
</del><ins>+ if (![inputDelegate respondsToSelector:@selector(_webView:willSubmitFormValues:userObject:submissionHandler:)]) {
</ins><span class="cx"> listener->continueSubmission();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -2527,8 +2519,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<WebKit::WebFormSubmissionListenerProxy> localListener = WTF::move(listener);
</span><del>- RefPtr<WebKit::CompletionHandlerCallChecker> checker = WebKit::CompletionHandlerCallChecker::create(formDelegate.get(), @selector(_webView:willSubmitFormValues:userObject:submissionHandler:));
- [formDelegate _webView:m_webView willSubmitFormValues:valueMap.get() userObject:userObject submissionHandler:[localListener, checker] {
</del><ins>+ RefPtr<WebKit::CompletionHandlerCallChecker> checker = WebKit::CompletionHandlerCallChecker::create(inputDelegate.get(), @selector(_webView:willSubmitFormValues:userObject:submissionHandler:));
+ [inputDelegate _webView:m_webView willSubmitFormValues:valueMap.get() userObject:userObject submissionHandler:[localListener, checker] {
</ins><span class="cx"> checker->didCallCompletionHandler();
</span><span class="cx"> localListener->continueSubmission();
</span><span class="cx"> }];
</span><span class="lines">@@ -2538,12 +2530,17 @@
</span><span class="cx"> WKWebView *m_webView;
</span><span class="cx"> };
</span><span class="cx">
</span><del>- if (formDelegate)
</del><ins>+ if (inputDelegate)
</ins><span class="cx"> _page->setFormClient(std::make_unique<FormClient>(self));
</span><span class="cx"> else
</span><span class="cx"> _page->setFormClient(nullptr);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)_setFormDelegate:(id <_WKFormDelegate>)formDelegate
+{
+ [self _setInputDelegate:(id <_WKInputDelegate>)formDelegate];
+}
+
</ins><span class="cx"> - (BOOL)_isDisplayingStandaloneImageDocument
</span><span class="cx"> {
</span><span class="cx"> if (auto* mainFrame = _page->mainFrame())
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewConfigurationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.h (191227 => 191228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.h 2015-10-16 23:46:09 UTC (rev 191227)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.h 2015-10-16 23:47:10 UTC (rev 191228)
</span><span class="lines">@@ -119,12 +119,6 @@
</span><span class="cx"> */
</span><span class="cx"> @property (nonatomic) BOOL allowsPictureInPictureMediaPlayback WK_AVAILABLE(NA, 9_0);
</span><span class="cx">
</span><del>-/*! @abstract A Boolean value indicating whether programmatic focus on
- an element is allowed to trigger assistance.
- @discussion The default value is NO.
- */
-@property (nonatomic) BOOL canAssistOnProgrammaticFocus;
-
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewConfigurationmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm (191227 => 191228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2015-10-16 23:46:09 UTC (rev 191227)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2015-10-16 23:47:10 UTC (rev 191228)
</span><span class="lines">@@ -112,7 +112,6 @@
</span><span class="cx"> _allowsInlineMediaPlayback = WKGetDeviceClass() == WKDeviceClassiPad;
</span><span class="cx"> _inlineMediaPlaybackRequiresPlaysInlineAttribute = !_allowsInlineMediaPlayback;
</span><span class="cx"> _mediaDataLoadsAutomatically = NO;
</span><del>- _canAssistOnProgrammaticFocus = NO;
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span><span class="lines">@@ -365,16 +364,6 @@
</span><span class="cx"> {
</span><span class="cx"> _mediaDataLoadsAutomatically = mediaDataLoadsAutomatically;
</span><span class="cx"> }
</span><del>-
-- (BOOL)_canAssistOnProgrammaticFocus
-{
- return _canAssistOnProgrammaticFocus;
-}
-
-- (void)_setCanAssistOnProgrammaticFocus:(BOOL)canAssistOnProgrammaticFocus
-{
- _canAssistOnProgrammaticFocus = canAssistOnProgrammaticFocus;
-}
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h (191227 => 191228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h 2015-10-16 23:46:09 UTC (rev 191227)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h 2015-10-16 23:47:10 UTC (rev 191228)
</span><span class="lines">@@ -58,6 +58,7 @@
</span><span class="cx"> @protocol _WKDiagnosticLoggingDelegate;
</span><span class="cx"> @protocol _WKFindDelegate;
</span><span class="cx"> @protocol _WKFormDelegate;
</span><ins>+@protocol _WKInputDelegate;
</ins><span class="cx">
</span><span class="cx"> @interface WKWebView (WKPrivate)
</span><span class="cx">
</span><span class="lines">@@ -216,7 +217,8 @@
</span><span class="cx"> - (void)_countStringMatches:(NSString *)string options:(_WKFindOptions)options maxCount:(NSUInteger)maxCount;
</span><span class="cx"> - (void)_hideFindUI;
</span><span class="cx">
</span><del>-@property (nonatomic, weak, setter=_setFormDelegate:) id <_WKFormDelegate> _formDelegate;
</del><ins>+@property (nonatomic, weak, setter=_setFormDelegate:) id <_WKFormDelegate> _formDelegate WK_DEPRECATED(10_10, WK_MAC_TBA, 8_0, WK_IOS_TBA, "use _inputDelegate");
+@property (nonatomic, weak, setter=_setInputDelegate:) id <_WKInputDelegate> _inputDelegate WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
</ins><span class="cx">
</span><span class="cx"> @property (nonatomic, readonly, getter=_isDisplayingStandaloneImageDocument) BOOL _displayingStandaloneImageDocument;
</span><span class="cx"> @property (nonatomic, readonly, getter=_isDisplayingStandaloneMediaDocument) BOOL _displayingStandaloneMediaDocument;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoa_WKFocusedElementInfoh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKFocusedElementInfo.h (0 => 191228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKFocusedElementInfo.h (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKFocusedElementInfo.h 2015-10-16 23:47:10 UTC (rev 191228)
</span><span class="lines">@@ -0,0 +1,80 @@
</span><ins>+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import <WebKit/WKFoundation.h>
+
+#if WK_API_ENABLED
+
+#import <Foundation/Foundation.h>
+
+/**
+ * WKInputType exposes a subset of all known input types enumerated in
+ * WebKit::InputType. While there is currently a one-to-one mapping, we
+ * need to consider how we should expose certain input types.
+ */
+typedef NS_ENUM(NSInteger, WKInputType) {
+ WKInputTypeNone,
+ WKInputTypeContentEditable,
+ WKInputTypeText,
+ WKInputTypePassword,
+ WKInputTypeTextArea,
+ WKInputTypeSearch,
+ WKInputTypeEmail,
+ WKInputTypeURL,
+ WKInputTypePhone,
+ WKInputTypeNumber,
+ WKInputTypeNumberPad,
+ WKInputTypeDate,
+ WKInputTypeDateTime,
+ WKInputTypeDateTimeLocal,
+ WKInputTypeMonth,
+ WKInputTypeWeek,
+ WKInputTypeTime,
+ WKInputTypeSelect
+};
+
+/**
+ * The _WKFocusedElementInfo provides basic information about an element
+ * that has been focused (either programmatically or through user interaction)
+ * but has not yet been assisted.
+ */
+@protocol _WKFocusedElementInfo <NSObject>
+
+/* The type of the input element that was focused. */
+@property (nonatomic, readonly) WKInputType type;
+
+/* The value of the input at the time it was focused. */
+@property (nonatomic, readonly, copy) NSString *value;
+
+/**
+ * Whether the element was focused due to user interaction. NO indicates that
+ * the element was focused programmatically, e.g. by calling focus() in JavaScript
+ * or by using the autofocus attribute.
+ */
+@property (nonatomic, readonly, getter=isUserInitiated) BOOL userInitiated;
+
+@end
+
+#endif // WK_API_ENABLED
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoa_WKFormDelegateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKFormDelegate.h (191227 => 191228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKFormDelegate.h 2015-10-16 23:46:09 UTC (rev 191227)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKFormDelegate.h 2015-10-16 23:47:10 UTC (rev 191228)
</span><span class="lines">@@ -27,24 +27,13 @@
</span><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><del>-#import <Foundation/Foundation.h>
</del><ins>+#import <WebKit/_WKInputDelegate.h>
</ins><span class="cx">
</span><del>-@class WKWebView;
-@protocol _WKFormInputSession;
-
-@protocol _WKFormDelegate <NSObject>
-
-@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;
-- (BOOL)_webView:(WKWebView *)webView hasSuggestionsForCurrentStringInInputSession:(id <_WKFormInputSession>)inputSession;
-- (NSArray *)_webView:(WKWebView *)webView suggestionsForString:(NSString *)string inInputSession:(id <_WKFormInputSession>)inputSession;
-#endif
-
</del><ins>+/**
+ * We are transitioning _WKFormDelegate to _WKInputDelegate. This header is here temporarily for source compatibility and
+ * should be removed when we are ready to make the switch.
+ */
+@protocol _WKFormDelegate <_WKInputDelegate>
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #endif // WK_API_ENABLED
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoa_WKInputDelegatehfromrev191225trunkSourceWebKit2UIProcessAPICocoa_WKFormDelegateh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKInputDelegate.h (from rev 191225, trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKFormDelegate.h) (0 => 191228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKInputDelegate.h (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKInputDelegate.h 2015-10-16 23:47:10 UTC (rev 191228)
</span><span class="lines">@@ -0,0 +1,52 @@
</span><ins>+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import <WebKit/WKFoundation.h>
+
+#if WK_API_ENABLED
+
+#import <Foundation/Foundation.h>
+
+@class WKWebView;
+@protocol _WKFocusedElementInfo;
+@protocol _WKFormInputSession;
+
+@protocol _WKInputDelegate <NSObject>
+
+@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
+- (BOOL)_webView:(WKWebView *)webView focusShouldStartInputSession:(id <_WKFocusedElementInfo>)info;
+- (void)_webView:(WKWebView *)webView accessoryViewCustomButtonTappedInFormInputSession:(id <_WKFormInputSession>)inputSession;
+- (BOOL)_webView:(WKWebView *)webView hasSuggestionsForCurrentStringInInputSession:(id <_WKFormInputSession>)inputSession;
+- (NSArray *)_webView:(WKWebView *)webView suggestionsForString:(NSString *)string inInputSession:(id <_WKFormInputSession>)inputSession;
+#endif
+
+@end
+
+#endif // WK_API_ENABLED
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKContentViewInteractionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (191227 => 191228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-10-16 23:46:09 UTC (rev 191227)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-10-16 23:47:10 UTC (rev 191228)
</span><span class="lines">@@ -53,8 +53,9 @@
</span><span class="cx"> #import "WebPageMessages.h"
</span><span class="cx"> #import "WebProcessProxy.h"
</span><span class="cx"> #import "_WKActivatedElementInfoInternal.h"
</span><del>-#import "_WKFormDelegate.h"
</del><ins>+#import "_WKFocusedElementInfo.h"
</ins><span class="cx"> #import "_WKFormInputSession.h"
</span><ins>+#import "_WKInputDelegate.h"
</ins><span class="cx"> #import <CoreText/CTFont.h>
</span><span class="cx"> #import <CoreText/CTFontDescriptor.h>
</span><span class="cx"> #import <MobileCoreServices/UTCoreTypes.h>
</span><span class="lines">@@ -277,6 +278,98 @@
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><ins>+@interface WKFocusedElementInfo : NSObject <_WKFocusedElementInfo>
+- (instancetype)initWithAssistedNodeInformation:(const AssistedNodeInformation&)information isUserInitiated:(BOOL)isUserInitiated;
+@end
+
+@implementation WKFocusedElementInfo {
+ WKInputType _type;
+ RetainPtr<NSString> _value;
+ BOOL _isUserInitiated;
+}
+
+- (instancetype)initWithAssistedNodeInformation:(const AssistedNodeInformation&)information isUserInitiated:(BOOL)isUserInitiated
+{
+ if (!(self = [super init]))
+ return nil;
+
+ switch (information.elementType) {
+ case WebKit::InputType::ContentEditable:
+ _type = WKInputTypeContentEditable;
+ break;
+ case WebKit::InputType::Text:
+ _type = WKInputTypeText;
+ break;
+ case WebKit::InputType::Password:
+ _type = WKInputTypePassword;
+ break;
+ case WebKit::InputType::TextArea:
+ _type = WKInputTypeTextArea;
+ break;
+ case WebKit::InputType::Search:
+ _type = WKInputTypeSearch;
+ break;
+ case WebKit::InputType::Email:
+ _type = WKInputTypeEmail;
+ break;
+ case WebKit::InputType::URL:
+ _type = WKInputTypeURL;
+ break;
+ case WebKit::InputType::Phone:
+ _type = WKInputTypePhone;
+ break;
+ case WebKit::InputType::Number:
+ _type = WKInputTypeNumber;
+ break;
+ case WebKit::InputType::NumberPad:
+ _type = WKInputTypeNumberPad;
+ break;
+ case WebKit::InputType::Date:
+ _type = WKInputTypeDate;
+ break;
+ case WebKit::InputType::DateTime:
+ _type = WKInputTypeDateTime;
+ break;
+ case WebKit::InputType::DateTimeLocal:
+ _type = WKInputTypeDateTimeLocal;
+ break;
+ case WebKit::InputType::Month:
+ _type = WKInputTypeMonth;
+ break;
+ case WebKit::InputType::Week:
+ _type = WKInputTypeWeek;
+ break;
+ case WebKit::InputType::Time:
+ _type = WKInputTypeTime;
+ break;
+ case WebKit::InputType::Select:
+ _type = WKInputTypeSelect;
+ break;
+ case WebKit::InputType::None:
+ _type = WKInputTypeNone;
+ break;
+ }
+ _value = information.value;
+ _isUserInitiated = isUserInitiated;
+ return self;
+}
+
+- (WKInputType)type
+{
+ return _type;
+}
+
+- (NSString *)value
+{
+ return _value.get();
+}
+
+- (BOOL)isUserInitiated
+{
+ return _isUserInitiated;
+}
+@end
+
</ins><span class="cx"> @interface WKContentView (WKInteractionPrivate)
</span><span class="cx"> - (void)accessibilitySpeakSelectionSetContent:(NSString *)string;
</span><span class="cx"> @end
</span><span class="lines">@@ -2258,9 +2351,9 @@
</span><span class="cx">
</span><span class="cx"> - (void)accessoryAutoFill
</span><span class="cx"> {
</span><del>- id <_WKFormDelegate> formDelegate = [_webView _formDelegate];
- if ([formDelegate respondsToSelector:@selector(_webView:accessoryViewCustomButtonTappedInFormInputSession:)])
- [formDelegate _webView:_webView accessoryViewCustomButtonTappedInFormInputSession:_formInputSession.get()];
</del><ins>+ id <_WKInputDelegate> inputDelegate = [_webView _inputDelegate];
+ if ([inputDelegate respondsToSelector:@selector(_webView:accessoryViewCustomButtonTappedInFormInputSession:)])
+ [inputDelegate _webView:_webView accessoryViewCustomButtonTappedInFormInputSession:_formInputSession.get()];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)accessoryClear
</span><span class="lines">@@ -3028,9 +3121,16 @@
</span><span class="cx">
</span><span class="cx"> - (void)_startAssistingNode:(const AssistedNodeInformation&)information userIsInteracting:(BOOL)userIsInteracting blurPreviousNode:(BOOL)blurPreviousNode userObject:(NSObject <NSSecureCoding> *)userObject
</span><span class="cx"> {
</span><del>- // FIXME: This is a temporary workaround for <rdar://problem/22126518>. The real fix will involve refactoring
- // the way we assist programmatically focused nodes.
- if (!userIsInteracting && !_textSelectionAssistant && !_webView.canAssistOnProgrammaticFocus)
</del><ins>+ id <_WKInputDelegate> inputDelegate = [_webView _inputDelegate];
+ BOOL shouldShowKeyboard;
+ if ([inputDelegate respondsToSelector:@selector(_webView:focusShouldStartInputSession:)]) {
+ RetainPtr<WKFocusedElementInfo> focusedElementInfo = adoptNS([[WKFocusedElementInfo alloc] initWithAssistedNodeInformation:information isUserInitiated:userIsInteracting]);
+ shouldShowKeyboard = [inputDelegate _webView:_webView focusShouldStartInputSession:focusedElementInfo.get()];
+ } else {
+ // The default behavior is to allow node assistance if the user is interacting or the keyboard is already active.
+ shouldShowKeyboard = userIsInteracting || _textSelectionAssistant;
+ }
+ if (!shouldShowKeyboard)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (blurPreviousNode)
</span><span class="lines">@@ -3073,10 +3173,9 @@
</span><span class="cx"> // _inputPeripheral has been initialized in inputView called by reloadInputViews.
</span><span class="cx"> [_inputPeripheral beginEditing];
</span><span class="cx">
</span><del>- id <_WKFormDelegate> formDelegate = [_webView _formDelegate];
- if ([formDelegate respondsToSelector:@selector(_webView:didStartInputSession:)]) {
</del><ins>+ if ([inputDelegate respondsToSelector:@selector(_webView:didStartInputSession:)]) {
</ins><span class="cx"> _formInputSession = adoptNS([[WKFormInputSession alloc] initWithContentView:self userObject:userObject]);
</span><del>- [formDelegate _webView:_webView didStartInputSession:_formInputSession.get()];
</del><ins>+ [inputDelegate _webView:_webView didStartInputSession:_formInputSession.get()];
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (191227 => 191228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-10-16 23:46:09 UTC (rev 191227)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-10-16 23:47:10 UTC (rev 191228)
</span><span class="lines">@@ -690,6 +690,8 @@
</span><span class="cx"> 2DF9EEE81A78245500B6CFBE /* WKFrameInfoInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DF9EEE71A78245500B6CFBE /* WKFrameInfoInternal.h */; };
</span><span class="cx"> 2DF9EEEC1A7836EE00B6CFBE /* APINavigationAction.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DF9EEEA1A7836EE00B6CFBE /* APINavigationAction.h */; };
</span><span class="cx"> 2DF9EEEE1A786EAD00B6CFBE /* APINavigationResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DF9EEED1A786EAD00B6CFBE /* APINavigationResponse.h */; };
</span><ins>+ 2E0B8A7A1BC59A590044B32D /* _WKFormDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 2E0B8A791BC59A590044B32D /* _WKFormDelegate.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 2E7A944A1BBD97C300945547 /* _WKFocusedElementInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 2E7A94491BBD95C600945547 /* _WKFocusedElementInfo.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> 31099973146C75A20029DEB9 /* WebNotificationClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 31099971146C759B0029DEB9 /* WebNotificationClient.cpp */; };
</span><span class="cx"> 310999C7146C9E3D0029DEB9 /* WebNotificationClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 31099968146C71F50029DEB9 /* WebNotificationClient.h */; };
</span><span class="cx"> 312C0C4A146DDC8A0016C911 /* WKNotificationProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 312C0C49146DDC8A0016C911 /* WKNotificationProvider.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -804,7 +806,7 @@
</span><span class="cx"> 379A873C18BBFF0700588AF2 /* _WKElementActionInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 379A873B18BBFF0700588AF2 /* _WKElementActionInternal.h */; };
</span><span class="cx"> 37A5E01318BBF937000A081E /* _WKActivatedElementInfo.mm in Sources */ = {isa = PBXBuildFile; fileRef = 37A5E01118BBF937000A081E /* _WKActivatedElementInfo.mm */; };
</span><span class="cx"> 37A5E01418BBF93F000A081E /* _WKActivatedElementInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 37A5E01218BBF937000A081E /* _WKActivatedElementInfo.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- 37A64E5518F38E3C00EB30F1 /* _WKFormDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 37A64E5418F38E3C00EB30F1 /* _WKFormDelegate.h */; settings = {ATTRIBUTES = (Private, ); }; };
</del><ins>+ 37A64E5518F38E3C00EB30F1 /* _WKInputDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 37A64E5418F38E3C00EB30F1 /* _WKInputDelegate.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> 37A64E5718F38F4600EB30F1 /* _WKFormInputSession.h in Headers */ = {isa = PBXBuildFile; fileRef = 37A64E5618F38F4600EB30F1 /* _WKFormInputSession.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 37B5045219EEF31300CE2CF8 /* WKErrorPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 37B5045119EEF31300CE2CF8 /* WKErrorPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 37BEC4DD1948FC6A008B4286 /* WebCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AA1C79A100E7FC50078DEBC /* WebCore.framework */; };
</span><span class="lines">@@ -2847,6 +2849,8 @@
</span><span class="cx"> 2DF9EEE71A78245500B6CFBE /* WKFrameInfoInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKFrameInfoInternal.h; sourceTree = "<group>"; };
</span><span class="cx"> 2DF9EEEA1A7836EE00B6CFBE /* APINavigationAction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APINavigationAction.h; sourceTree = "<group>"; };
</span><span class="cx"> 2DF9EEED1A786EAD00B6CFBE /* APINavigationResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APINavigationResponse.h; sourceTree = "<group>"; };
</span><ins>+ 2E0B8A791BC59A590044B32D /* _WKFormDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKFormDelegate.h; sourceTree = "<group>"; };
+ 2E7A94491BBD95C600945547 /* _WKFocusedElementInfo.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = _WKFocusedElementInfo.h; sourceTree = "<group>"; };
</ins><span class="cx"> 31099968146C71F50029DEB9 /* WebNotificationClient.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebNotificationClient.h; sourceTree = "<group>"; };
</span><span class="cx"> 31099971146C759B0029DEB9 /* WebNotificationClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebNotificationClient.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 312C0C49146DDC8A0016C911 /* WKNotificationProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKNotificationProvider.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -2965,7 +2969,7 @@
</span><span class="cx"> 379A873B18BBFF0700588AF2 /* _WKElementActionInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKElementActionInternal.h; sourceTree = "<group>"; };
</span><span class="cx"> 37A5E01118BBF937000A081E /* _WKActivatedElementInfo.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = _WKActivatedElementInfo.mm; sourceTree = "<group>"; };
</span><span class="cx"> 37A5E01218BBF937000A081E /* _WKActivatedElementInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKActivatedElementInfo.h; sourceTree = "<group>"; };
</span><del>- 37A64E5418F38E3C00EB30F1 /* _WKFormDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKFormDelegate.h; sourceTree = "<group>"; };
</del><ins>+ 37A64E5418F38E3C00EB30F1 /* _WKInputDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKInputDelegate.h; sourceTree = "<group>"; };
</ins><span class="cx"> 37A64E5618F38F4600EB30F1 /* _WKFormInputSession.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKFormInputSession.h; sourceTree = "<group>"; };
</span><span class="cx"> 37B5045119EEF31300CE2CF8 /* WKErrorPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKErrorPrivate.h; sourceTree = "<group>"; };
</span><span class="cx"> 37BEC4DE19491486008B4286 /* CompletionHandlerCallChecker.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CompletionHandlerCallChecker.mm; sourceTree = "<group>"; };
</span><span class="lines">@@ -5312,8 +5316,10 @@
</span><span class="cx"> 1AD01BC61905D37E00C9C45F /* _WKErrorRecoveryAttempting.mm */,
</span><span class="cx"> 005D158E18E4C4EB00734619 /* _WKFindDelegate.h */,
</span><span class="cx"> 2DEAC5CE1AC368BB00A195D8 /* _WKFindOptions.h */,
</span><del>- 37A64E5418F38E3C00EB30F1 /* _WKFormDelegate.h */,
</del><ins>+ 2E7A94491BBD95C600945547 /* _WKFocusedElementInfo.h */,
+ 2E0B8A791BC59A590044B32D /* _WKFormDelegate.h */,
</ins><span class="cx"> 37A64E5618F38F4600EB30F1 /* _WKFormInputSession.h */,
</span><ins>+ 37A64E5418F38E3C00EB30F1 /* _WKInputDelegate.h */,
</ins><span class="cx"> 2D790A9C1AD7050D00AB90B3 /* _WKLayoutMode.h */,
</span><span class="cx"> 9323611D1B015DA800FA9232 /* _WKOverlayScrollbarStyle.h */,
</span><span class="cx"> 1A43E828188F3CDC009E4D30 /* _WKProcessPoolConfiguration.h */,
</span><span class="lines">@@ -7528,10 +7534,12 @@
</span><span class="cx"> 1AD01BC91905D37E00C9C45F /* _WKErrorRecoveryAttempting.h in Headers */,
</span><span class="cx"> 005D158F18E4C4EB00734619 /* _WKFindDelegate.h in Headers */,
</span><span class="cx"> 2DEAC5CF1AC368BB00A195D8 /* _WKFindOptions.h in Headers */,
</span><del>- 37A64E5518F38E3C00EB30F1 /* _WKFormDelegate.h in Headers */,
</del><ins>+ 2E7A944A1BBD97C300945547 /* _WKFocusedElementInfo.h in Headers */,
+ 2E0B8A7A1BC59A590044B32D /* _WKFormDelegate.h in Headers */,
</ins><span class="cx"> 37A64E5718F38F4600EB30F1 /* _WKFormInputSession.h in Headers */,
</span><span class="cx"> 373D122318A473010066D9CC /* _WKFrameHandle.h in Headers */,
</span><span class="cx"> 373D122718A473F60066D9CC /* _WKFrameHandleInternal.h in Headers */,
</span><ins>+ 37A64E5518F38E3C00EB30F1 /* _WKInputDelegate.h in Headers */,
</ins><span class="cx"> 2D790A9D1AD7050D00AB90B3 /* _WKLayoutMode.h in Headers */,
</span><span class="cx"> A118A9F31908B8EA00F7C92B /* _WKNSFileManagerExtras.h in Headers */,
</span><span class="cx"> 9323611E1B015DA800FA9232 /* _WKOverlayScrollbarStyle.h in Headers */,
</span></span></pre>
</div>
</div>
</body>
</html>