topcoderKai
diff --git a/‎Source/WebKit/ChangeLog
+46 b/‎Source/WebKit/ChangeLog
+46
diff --git a/‎Source/WebKit/UIProcess/WebPageProxy.h
-4 b/‎Source/WebKit/UIProcess/WebPageProxy.h
-4
diff --git a/‎Source/WebKit/UIProcess/ios/WKContentView.mm
-10 b/‎Source/WebKit/UIProcess/ios/WKContentView.mm
-10
diff --git a/‎Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm
+12 b/‎Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm
+12
diff --git a/‎Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm
-12 b/‎Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm
-12
diff --git a/‎Source/WebKitLegacy/mac/ChangeLog
+15 b/‎Source/WebKitLegacy/mac/ChangeLog
+15
diff --git a/‎Source/WebKitLegacy/mac/DOM/DOMHTMLInputElement.mm
+9-8 b/‎Source/WebKitLegacy/mac/DOM/DOMHTMLInputElement.mm
+9-8
diff --git a/‎Tools/ChangeLog
+43 b/‎Tools/ChangeLog
+43
@@ -1,3 +1,49 @@
+2017-10-06  Wenson Hsieh  <[email protected]>
+
+        [iOS] Tweak support for classifying form controls (followup to r222487)
+        https://bugs.webkit.org/show_bug.cgi?id=177917
+        <rdar://problem/34820122>
+
+        Reviewed by Dean Jackson.
+
+        This patch follows up with <http://trac.webkit.org/r222487>. It combines the functionality of two SPI hooks
+        implemented on WKContentView into a single method that vends a context dictionary, and additionally addresses an
+        issue with the original implementation, wherein some cached state on WebPageProxy is set upon starting node
+        assistance, but is never unset when stopping node assistance, nor set anywhere else. See per-method comments for
+        more detail.
+
+        * UIProcess/WebPageProxy.h:
+
+        Remove members m_acceptsAutofilledLoginCredentials and m_representingPageURL from WebPageProxy. This state is
+        retrieved from the AssistedNodeInformation struct when starting node assistance, but is never reset anywhere
+        else. Instead of introducing new members to remember this state, we can just use the WKContentView's current
+        assisted node information.
+
+        This also means that programmatically focusing forms (without user gesture) will no longer cause WKContentView
+        to accept autofilled login credentials, since we bail out of node assistance and don't begin an input session.
+
+        * UIProcess/ios/WKContentView.mm:
+        (-[WKContentView acceptsAutofilledLoginCredentials]): Deleted.
+        (-[WKContentView representingPageURL]): Deleted.
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (-[WKContentView _autofillContext]):
+
+        Merge functionality of the previous two SPI hooks, such that -_autofillContext will return a non-null dictionary
+        containing the URL of the focused element's document if and only if WKContentView accepts autofilled login
+        credentials, and there exists a representing page URL.
+
+        When the page stops assisting the focused node, we set the AssistedNodeInformation's element type to None, so we
+        additionally bail and return nil if the element type is None. As an aside, it seems a more reasonable approach to
+        resetting state upon stopping node assistance is to just completely reset _assistedNodeInformation to its initial
+        value, i.e. via _assistedNodeInformation = { }. It's not clear whether there are behaviors relying on the fact
+        that all members but the element type in the content view's assisted node information could be stale, so this
+        seems worthy of some investigation.
+
+        * UIProcess/ios/WebPageProxyIOS.mm:
+        (WebKit::WebPageProxy::startAssistingNode):
+        (WebKit::WebPageProxy::acceptsAutofilledLoginCredentials): Deleted.
+        (WebKit::WebPageProxy::representingPageURL): Deleted.
+
 2017-10-06  Yousuke Kimoto  <[email protected]>
 
         [WinCairo] Add shared curl files
 
@@ -559,8 +559,6 @@ class WebPageProxy : public API::ObjectImpl<API::Object::Type::Page>
     void setIsScrollingOrZooming(bool);
     void requestRectsForGranularityWithSelectionOffset(WebCore::TextGranularity, uint32_t offset, WTF::Function<void(const Vector<WebCore::SelectionRect>&, CallbackBase::Error)>&&);
     void requestRectsAtSelectionOffsetWithText(int32_t offset, const String&, WTF::Function<void(const Vector<WebCore::SelectionRect>&, CallbackBase::Error)>&&);
-    bool acceptsAutofilledLoginCredentials();
-    WebCore::URL representingPageURL();
     void autofillLoginCredentials(const String& username, const String& password);
 #if ENABLE(DATA_INTERACTION)
     void didPerformDataInteractionControllerOperation(bool handled);
@@ -1998,8 +1996,6 @@ class WebPageProxy : public API::ObjectImpl<API::Object::Type::Page>
     bool m_hasDeferredStartAssistingNode { false };
     std::unique_ptr<NodeAssistanceArguments> m_deferredNodeAssistanceArguments;
     bool m_forceAlwaysUserScalable { false };
-    bool m_acceptsAutofilledLoginCredentials { false };
-    WebCore::URL m_representingPageURL;
 #endif
 
 #if ENABLE(POINTER_LOCK)
 
@@ -257,16 +257,6 @@ - (WebPageProxy*)page
     return _page.get();
 }
 
-- (BOOL)acceptsAutofilledLoginCredentials
-{
-    return _page->acceptsAutofilledLoginCredentials();
-}
-
-- (NSURL *)representingPageURL
-{
-    return _page->representingPageURL();
-}
-
 - (void)willMoveToWindow:(UIWindow *)newWindow
 {
     NSNotificationCenter *defaultCenter = [NSNotificationCenter defaultCenter];
 
@@ -4518,6 +4518,18 @@ - (void)_restoreCalloutBarIfNeeded
     return dragItems;
 }
 
+- (NSDictionary *)_autofillContext
+{
+    if (_assistedNodeInformation.elementType == InputType::None || !_assistedNodeInformation.acceptsAutofilledLoginCredentials)
+        return nil;
+
+    NSURL *platformURL = _assistedNodeInformation.representingPageURL;
+    if (!platformURL)
+        return nil;
+
+    return @{ @"_WebViewURL" : platformURL };
+}
+
 #pragma mark - UIDragInteractionDelegate
 
 - (BOOL)_dragInteraction:(UIDragInteraction *)interaction shouldDelayCompetingGestureRecognizer:(UIGestureRecognizer *)competingGestureRecognizer
 
@@ -891,8 +891,6 @@ static bool exceedsRenderTreeSizeSizeThreshold(uint64_t thresholdSize, uint64_t
 
 void WebPageProxy::startAssistingNode(const AssistedNodeInformation& information, bool userIsInteracting, bool blurPreviousNode, const UserData& userData)
 {
-    m_acceptsAutofilledLoginCredentials = information.acceptsAutofilledLoginCredentials;
-    m_representingPageURL = information.representingPageURL;
     API::Object* userDataObject = process().transformHandlesToObjects(userData.object()).get();
     if (m_editorState.isMissingPostLayoutData) {
         m_deferredNodeAssistanceArguments = std::make_unique<NodeAssistanceArguments>(NodeAssistanceArguments { information, userIsInteracting, blurPreviousNode, userDataObject });
@@ -912,16 +910,6 @@ static bool exceedsRenderTreeSizeSizeThreshold(uint64_t thresholdSize, uint64_t
     m_pageClient.stopAssistingNode();
 }
 
-bool WebPageProxy::acceptsAutofilledLoginCredentials()
-{
-    return m_acceptsAutofilledLoginCredentials;
-}
-
-WebCore::URL WebPageProxy::representingPageURL()
-{
-    return m_representingPageURL;
-}
-
 void WebPageProxy::autofillLoginCredentials(const String& username, const String& password)
 {
     m_process->send(Messages::WebPage::AutofillLoginCredentials(username, password), m_pageID);
 
@@ -1,3 +1,18 @@
+2017-10-06  Wenson Hsieh  <[email protected]>
+
+        [iOS] Tweak support for classifying form controls (followup to r222487)
+        https://bugs.webkit.org/show_bug.cgi?id=177917
+        <rdar://problem/34820122>
+
+        Reviewed by Dean Jackson.
+
+        Implement _autofillContext in legacy WebKit, and remove the two previous SPI hooks.
+
+        * DOM/DOMHTMLInputElement.mm:
+        (-[DOMHTMLInputElement _autofillContext]):
+        (-[DOMHTMLInputElement acceptsAutofilledLoginCredentials]): Deleted.
+        (-[DOMHTMLInputElement representingPageURL]): Deleted.
+
 2017-10-05  Keith Miller  <[email protected]>
 
         Unreviewed, tapi builds without optimization so we should have TAPI passes -DRELEASE_WITHOUT_OPTIMIZATIONS.
 
@@ -34,7 +34,7 @@
 #import "DOMPrivate.h"
 #import "ExceptionHandlers.h"
 
-// FIXME <radar:34583628>: Simplyfy this once the UIKit work is available in the build.
+// FIXME: Simplify this once <rdar://problem/34583628> is available in the build.
 #if USE(APPLE_INTERNAL_SDK) && TARGET_OS_IPHONE
 #if __has_include(<UIKit/UIKeyboardLoginCredentialsSuggestion.h>)
 #import <UIKit/UIKeyboardLoginCredentialsSuggestion.h>
@@ -683,16 +683,17 @@ - (void)setValueForUser:(NSString *)inValue
     IMPL->setValueForUser(inValue);
 }
 
-- (BOOL)acceptsAutofilledLoginCredentials
+- (NSDictionary *)_autofillContext
 {
     WebCore::JSMainThreadNullState state;
-    return !!WebCore::AutofillElements::computeAutofillElements(*IMPL);
-}
+    if (!WebCore::AutofillElements::computeAutofillElements(*IMPL))
+        return nil;
 
-- (NSURL *)representingPageURL
-{
-    WebCore::JSMainThreadNullState state;
-    return [NSURL URLWithString:self.ownerDocument.URL];
+    NSURL *documentURL = [NSURL URLWithString:self.ownerDocument.URL];
+    if (!documentURL)
+        return nil;
+
+    return @{ @"_WebViewURL" : documentURL };
 }
 
 #if USE(APPLE_INTERNAL_SDK) && TARGET_OS_IPHONE
 
@@ -1,3 +1,46 @@
+2017-10-06  Wenson Hsieh  <[email protected]>
+
+        [iOS] Tweak support for classifying form controls (followup to r222487)
+        https://bugs.webkit.org/show_bug.cgi?id=177917
+        <rdar://problem/34820122>
+
+        Reviewed by Dean Jackson.
+
+        Minor cleanup around autofill API tests added in r222487. Additionally, augments some of these API tests to
+        verify that after blurring the focused element, the content view no longer accepts autofill credentials (see
+        WebKit ChangeLog for more details). Also augments tests to verify that the URL in the autofill context matches
+        the document URL.
+
+        * TestWebKitAPI/Tests/ios/WKWebViewAutofillTests.mm:
+
+        Remove the USE(APPLE_INTERNAL_SDK) guard for these API tests.
+
+        (newUIKeyboardLoginCredentialsSuggestion):
+
+        Add a stub implementation of UIKeyboardLoginCredentialsSuggestion. This allows
+        [UIKeyboardLoginCredentialsSuggestion new] to return a nonnull object, which allows these API tests to verify
+        that the credential filling codepath works as intended without any additional UIKit changes. Currently, tests
+        for the value of username and password fields are passing even though the fields are not being populated because
+        the expected string values are null, and the observed value is an empty string. We instead check the literal
+        string values here instead of credentialSuggestion's properties, so that tests verifying the behavior of
+        -insertTextSuggestion: will require username and password inputs to be populated.
+
+        (-[TestInputDelegate _webView:focusShouldStartInputSession:]):
+        (-[AutofillTestView initWithFrame:]):
+        (-[AutofillTestView _autofillInputView]):
+        (-[AutofillTestView textInputHasAutofillContext]):
+        (TestWebKitAPI::TEST):
+
+        Add an additional API test to verify that programmatic focus without user interaction (and also without testing
+        overrides) does not activate autofill.
+
+        (createUIKeyboardLoginCredentialsSuggestion): Deleted.
+        (-[WKWebView _privateTextInput]): Deleted.
+        * TestWebKitAPI/ios/UIKitSPI.h:
+
+        Minor gardening to remove iOS version >= 11 guards that are now unnecessary. Additionally, add some more private
+        header imports (with corresponding interface definitions for building and running with the public SDK).
+
 2017-10-06  Antti Koivisto  <[email protected]>
 
         Minor WeakPtr improvements