Remove Strong Confirmation Password button
authordbates@webkit.org <dbates@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 6 Jul 2018 16:29:40 +0000 (16:29 +0000)
committerdbates@webkit.org <dbates@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 6 Jul 2018 16:29:40 +0000 (16:29 +0000)
https://bugs.webkit.org/show_bug.cgi?id=187306
<rdar://problem/41795185>

Reviewed by Sam Weinig.

Remove support for the Strong Confirmation Password button because we never made use of it.

Source/WebCore:

* English.lproj/Localizable.strings:
* accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
(-[WebAccessibilityObjectWrapper _accessibilityIsStrongPasswordField]):
* accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
(-[WebAccessibilityObjectWrapper accessibilityAttributeValue:]):
* html/HTMLInputElement.h:
(WebCore::HTMLInputElement::hasAutoFillStrongPasswordButton const):
* html/HTMLTextFormControlElement.h:
* html/TextFieldInputType.cpp:
(WebCore::autoFillButtonTypeToAccessibilityLabel):
(WebCore::autoFillButtonTypeToAutoFillButtonText):
(WebCore::autoFillButtonTypeToAutoFillButtonPseudoClassName):
(WebCore::isAutoFillButtonTypeChanged):
* platform/LocalizedStrings.cpp:
(WebCore::AXAutoFillStrongConfirmationPasswordLabel): Deleted.
* platform/LocalizedStrings.h:
* rendering/RenderTextControlSingleLine.cpp:
(WebCore::RenderTextControlSingleLine::layout):
* testing/Internals.cpp:
(WebCore::toAutoFillButtonType):
(WebCore::toInternalsAutoFillButtonType):
* testing/Internals.h:
* testing/Internals.idl:

Source/WebKit:

* WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInNodeHandle.mm:
(toAutoFillButtonType):
(toWKAutoFillButtonType):
* WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInNodeHandlePrivate.h:
* WebProcess/InjectedBundle/API/c/WKBundleNodeHandle.cpp:
(toAutoFillButtonType):
(toWKAutoFillButtonType):
* WebProcess/InjectedBundle/API/c/WKBundleNodeHandlePrivate.h:

LayoutTests:

* accessibility/ios-simulator/strong-password-field-expected.txt:
* accessibility/ios-simulator/strong-password-field.html:
* fast/forms/auto-fill-button/auto-fill-strong-password-button-when-maxlength-changes-expected.html:
* fast/forms/auto-fill-button/auto-fill-strong-password-button-when-maxlength-changes.html:
* fast/forms/auto-fill-button/auto-fill-strong-password-button-when-minlength-changes-expected.html:
* fast/forms/auto-fill-button/auto-fill-strong-password-button-when-minlength-changes.html:
* fast/forms/auto-fill-button/hide-auto-fill-strong-password-button-when-form-is-reset-expected.html:
* fast/forms/auto-fill-button/hide-auto-fill-strong-password-button-when-form-is-reset.html:
* fast/forms/auto-fill-button/hide-auto-fill-strong-password-button-when-value-changes-expected.html:
* fast/forms/auto-fill-button/hide-auto-fill-strong-password-button-when-value-changes.html:
* fast/forms/auto-fill-button/hide-strong-password-when-field-type-changes-expected.html:
* fast/forms/auto-fill-button/hide-strong-password-when-field-type-changes.html:
* fast/forms/auto-fill-button/input-autofilled-disabled-strong-password-auto-fill-button-expected.html: Removed.
* fast/forms/auto-fill-button/input-autofilled-disabled-strong-password-auto-fill-button.html: Removed.
* fast/forms/auto-fill-button/input-autofilled-readonly-strong-password-auto-fill-button-expected.html: Removed.
* fast/forms/auto-fill-button/input-autofilled-readonly-strong-password-auto-fill-button.html: Removed.
* fast/forms/auto-fill-button/input-disabled-strong-password-and-strong-confirmation-password-auto-fill-buttons-expected.html:
* fast/forms/auto-fill-button/input-disabled-strong-password-and-strong-confirmation-password-auto-fill-buttons.html:
* fast/forms/auto-fill-button/input-readonly-strong-password-and-strong-confirmation-password-auto-fill-buttons-expected.html:
* fast/forms/auto-fill-button/input-readonly-strong-password-and-strong-confirmation-password-auto-fill-buttons.html:
* fast/forms/auto-fill-button/input-strong-confirmation-password-auto-fill-button.html: Removed.
* fast/forms/auto-fill-button/last-auto-fill-button-type-expected.txt:
* fast/forms/auto-fill-button/last-auto-fill-button-type.html:
* platform/gtk/TestExpectations:
* platform/gtk/fast/forms/auto-fill-button/input-strong-confirmation-password-auto-fill-button-expected.txt: Removed.
* platform/ios/fast/forms/auto-fill-button/input-strong-confirmation-password-auto-fill-button-expected.txt: Removed.
* platform/mac/fast/forms/auto-fill-button/input-strong-confirmation-password-auto-fill-button-expected.txt: Removed.
* platform/win/TestExpectations:
* platform/win/fast/forms/auto-fill-button/input-strong-confirmation-password-auto-fill-button-expected.txt: Removed.
* platform/wincairo/fast/forms/auto-fill-button/input-strong-confirmation-password-auto-fill-button-expected.txt: Removed.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@233578 268f45cc-cd09-0410-ab3c-d52691b4dbfc

49 files changed:
LayoutTests/ChangeLog
LayoutTests/accessibility/ios-simulator/strong-password-field-expected.txt
LayoutTests/accessibility/ios-simulator/strong-password-field.html
LayoutTests/fast/forms/auto-fill-button/auto-fill-strong-password-button-when-maxlength-changes-expected.html
LayoutTests/fast/forms/auto-fill-button/auto-fill-strong-password-button-when-maxlength-changes.html
LayoutTests/fast/forms/auto-fill-button/auto-fill-strong-password-button-when-minlength-changes-expected.html
LayoutTests/fast/forms/auto-fill-button/auto-fill-strong-password-button-when-minlength-changes.html
LayoutTests/fast/forms/auto-fill-button/hide-auto-fill-strong-password-button-when-form-is-reset-expected.html
LayoutTests/fast/forms/auto-fill-button/hide-auto-fill-strong-password-button-when-form-is-reset.html
LayoutTests/fast/forms/auto-fill-button/hide-auto-fill-strong-password-button-when-value-changes-expected.html
LayoutTests/fast/forms/auto-fill-button/hide-auto-fill-strong-password-button-when-value-changes.html
LayoutTests/fast/forms/auto-fill-button/hide-strong-password-when-field-type-changes-expected.html
LayoutTests/fast/forms/auto-fill-button/hide-strong-password-when-field-type-changes.html
LayoutTests/fast/forms/auto-fill-button/input-autofilled-disabled-strong-password-auto-fill-button-expected.html [deleted file]
LayoutTests/fast/forms/auto-fill-button/input-autofilled-disabled-strong-password-auto-fill-button.html [deleted file]
LayoutTests/fast/forms/auto-fill-button/input-autofilled-readonly-strong-password-auto-fill-button-expected.html [deleted file]
LayoutTests/fast/forms/auto-fill-button/input-autofilled-readonly-strong-password-auto-fill-button.html [deleted file]
LayoutTests/fast/forms/auto-fill-button/input-disabled-strong-password-and-strong-confirmation-password-auto-fill-buttons-expected.html
LayoutTests/fast/forms/auto-fill-button/input-disabled-strong-password-and-strong-confirmation-password-auto-fill-buttons.html
LayoutTests/fast/forms/auto-fill-button/input-readonly-strong-password-and-strong-confirmation-password-auto-fill-buttons-expected.html
LayoutTests/fast/forms/auto-fill-button/input-readonly-strong-password-and-strong-confirmation-password-auto-fill-buttons.html
LayoutTests/fast/forms/auto-fill-button/input-strong-confirmation-password-auto-fill-button.html [deleted file]
LayoutTests/fast/forms/auto-fill-button/last-auto-fill-button-type-expected.txt
LayoutTests/fast/forms/auto-fill-button/last-auto-fill-button-type.html
LayoutTests/platform/gtk/TestExpectations
LayoutTests/platform/gtk/fast/forms/auto-fill-button/input-strong-confirmation-password-auto-fill-button-expected.txt [deleted file]
LayoutTests/platform/ios/fast/forms/auto-fill-button/input-strong-confirmation-password-auto-fill-button-expected.txt [deleted file]
LayoutTests/platform/mac/fast/forms/auto-fill-button/input-strong-confirmation-password-auto-fill-button-expected.txt [deleted file]
LayoutTests/platform/win/TestExpectations
LayoutTests/platform/win/fast/forms/auto-fill-button/input-strong-confirmation-password-auto-fill-button-expected.txt [deleted file]
LayoutTests/platform/wincairo/fast/forms/auto-fill-button/input-strong-confirmation-password-auto-fill-button-expected.txt [deleted file]
Source/WebCore/ChangeLog
Source/WebCore/English.lproj/Localizable.strings
Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm
Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm
Source/WebCore/html/HTMLInputElement.h
Source/WebCore/html/HTMLTextFormControlElement.h
Source/WebCore/html/TextFieldInputType.cpp
Source/WebCore/platform/LocalizedStrings.cpp
Source/WebCore/platform/LocalizedStrings.h
Source/WebCore/rendering/RenderTextControlSingleLine.cpp
Source/WebCore/testing/Internals.cpp
Source/WebCore/testing/Internals.h
Source/WebCore/testing/Internals.idl
Source/WebKit/ChangeLog
Source/WebKit/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInNodeHandle.mm
Source/WebKit/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInNodeHandlePrivate.h
Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleNodeHandle.cpp
Source/WebKit/WebProcess/InjectedBundle/API/c/WKBundleNodeHandlePrivate.h

index 77b0d64..9fc8693 100644 (file)
@@ -1,3 +1,44 @@
+2018-07-06  Daniel Bates  <dabates@apple.com>
+
+        Remove Strong Confirmation Password button
+        https://bugs.webkit.org/show_bug.cgi?id=187306
+        <rdar://problem/41795185>
+
+        Reviewed by Sam Weinig.
+
+        Remove support for the Strong Confirmation Password button because we never made use of it.
+
+        * accessibility/ios-simulator/strong-password-field-expected.txt:
+        * accessibility/ios-simulator/strong-password-field.html:
+        * fast/forms/auto-fill-button/auto-fill-strong-password-button-when-maxlength-changes-expected.html:
+        * fast/forms/auto-fill-button/auto-fill-strong-password-button-when-maxlength-changes.html:
+        * fast/forms/auto-fill-button/auto-fill-strong-password-button-when-minlength-changes-expected.html:
+        * fast/forms/auto-fill-button/auto-fill-strong-password-button-when-minlength-changes.html:
+        * fast/forms/auto-fill-button/hide-auto-fill-strong-password-button-when-form-is-reset-expected.html:
+        * fast/forms/auto-fill-button/hide-auto-fill-strong-password-button-when-form-is-reset.html:
+        * fast/forms/auto-fill-button/hide-auto-fill-strong-password-button-when-value-changes-expected.html:
+        * fast/forms/auto-fill-button/hide-auto-fill-strong-password-button-when-value-changes.html:
+        * fast/forms/auto-fill-button/hide-strong-password-when-field-type-changes-expected.html:
+        * fast/forms/auto-fill-button/hide-strong-password-when-field-type-changes.html:
+        * fast/forms/auto-fill-button/input-autofilled-disabled-strong-password-auto-fill-button-expected.html: Removed.
+        * fast/forms/auto-fill-button/input-autofilled-disabled-strong-password-auto-fill-button.html: Removed.
+        * fast/forms/auto-fill-button/input-autofilled-readonly-strong-password-auto-fill-button-expected.html: Removed.
+        * fast/forms/auto-fill-button/input-autofilled-readonly-strong-password-auto-fill-button.html: Removed.
+        * fast/forms/auto-fill-button/input-disabled-strong-password-and-strong-confirmation-password-auto-fill-buttons-expected.html:
+        * fast/forms/auto-fill-button/input-disabled-strong-password-and-strong-confirmation-password-auto-fill-buttons.html:
+        * fast/forms/auto-fill-button/input-readonly-strong-password-and-strong-confirmation-password-auto-fill-buttons-expected.html:
+        * fast/forms/auto-fill-button/input-readonly-strong-password-and-strong-confirmation-password-auto-fill-buttons.html:
+        * fast/forms/auto-fill-button/input-strong-confirmation-password-auto-fill-button.html: Removed.
+        * fast/forms/auto-fill-button/last-auto-fill-button-type-expected.txt:
+        * fast/forms/auto-fill-button/last-auto-fill-button-type.html:
+        * platform/gtk/TestExpectations:
+        * platform/gtk/fast/forms/auto-fill-button/input-strong-confirmation-password-auto-fill-button-expected.txt: Removed.
+        * platform/ios/fast/forms/auto-fill-button/input-strong-confirmation-password-auto-fill-button-expected.txt: Removed.
+        * platform/mac/fast/forms/auto-fill-button/input-strong-confirmation-password-auto-fill-button-expected.txt: Removed.
+        * platform/win/TestExpectations:
+        * platform/win/fast/forms/auto-fill-button/input-strong-confirmation-password-auto-fill-button-expected.txt: Removed.
+        * platform/wincairo/fast/forms/auto-fill-button/input-strong-confirmation-password-auto-fill-button-expected.txt: Removed.
+
 2018-07-05  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         Unreviewed GTK gardening. Remove platform expectations for imported/w3c/web-platform-tests/web-animations/interfaces/Animatable/animate-no-browsing-context.html
index 0508949..1a683e3 100644 (file)
@@ -6,10 +6,8 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
 
 PASS axPw1.boolAttributeValue('AXIsStrongPasswordField') is false
 PASS axPw2.boolAttributeValue('AXIsStrongPasswordField') is true
-PASS axPw3.boolAttributeValue('AXIsStrongPasswordField') is true
 PASS axPw1.stringValue is 'AXValue: ••••••••'
 PASS axPw2.stringValue is 'AXValue: strong password'
-PASS axPw3.stringValue is 'AXValue: strong confirmation password'
 PASS successfullyParsed is true
 
 TEST COMPLETE
index bcd4d58..fc98773 100644 (file)
@@ -9,7 +9,6 @@
 <div id="container">
 <input id="pw1" type="password" value="password">
 <input id="pw2" type="password" value="strong password">
-<input id="pw3" type="password" value="strong confirmation password">
 </div>
 
 <p id="description"></p>
 
     var pw1 = document.getElementById("pw1");
     var pw2 = document.getElementById("pw2");
-    var pw3 = document.getElementById("pw3");
 
     if (window.internals) {
         window.internals.setAutofilled(pw2, true);
-        window.internals.setShowAutoFillButton(pw2, "StrongConfirmationPassword");
-
-        window.internals.setAutofilled(pw3, true);
-        window.internals.setShowAutoFillButton(pw3, "StrongPassword");
+        window.internals.setShowAutoFillButton(pw2, "StrongPassword");
     }
 
     if (window.accessibilityController) {
         var axPw1 = accessibilityController.accessibleElementById("pw1");
         var axPw2 = accessibilityController.accessibleElementById("pw2");
-        var axPw3 = accessibilityController.accessibleElementById("pw3");
 
         shouldBeFalse("axPw1.boolAttributeValue('AXIsStrongPasswordField')");
         shouldBeTrue("axPw2.boolAttributeValue('AXIsStrongPasswordField')");
-        shouldBeTrue("axPw3.boolAttributeValue('AXIsStrongPasswordField')");
 
         shouldBe("axPw1.stringValue", "'AXValue: ••••••••'");
         shouldBe("axPw2.stringValue", "'AXValue: strong password'");
-        shouldBe("axPw3.stringValue", "'AXValue: strong confirmation password'");
     }
     
 </script>
index fad3ada..97a8c3a 100644 (file)
@@ -16,8 +16,7 @@ function runTest()
 </script>
 </head>
 <body>
-<p>This tests that an autofilled Strong Password or Strong Confirmation Password decorated text field does not change appearance when its maxlength changes. It can only be tested in the test tool.</p>
+<p>This tests that an autofilled Strong Password decorated text field does not change appearance when its maxlength changes. It can only be tested in the test tool.</p>
 <input type="password" value="Cupertino" maxlength="100" data-auto-fill-button-type="StrongPassword" data-autofilled="true">
-<input type="password" value="Cupertino" maxlength="100" data-auto-fill-button-type="StrongConfirmationPassword" data-autofilled="true">
 </body>
 </html>
index 26eed37..df7a637 100644 (file)
@@ -19,8 +19,7 @@ function runTest()
 </script>
 </head>
 <body>
-<p>This tests that an autofilled Strong Password or Strong Confirmation Password decorated text field does not change appearance when its maxlength changes. It can only be tested in the test tool.</p>
+<p>This tests that an autofilled Strong Password decorated text field does not change appearance when its maxlength changes. It can only be tested in the test tool.</p>
 <input type="password" value="Cupertino" maxlength="100" data-auto-fill-button-type="StrongPassword" data-autofilled="true">
-<input type="password" value="Cupertino" maxlength="100" data-auto-fill-button-type="StrongConfirmationPassword" data-autofilled="true">
 </body>
 </html>
index 3fd6c1f..e12d3af 100644 (file)
@@ -16,8 +16,7 @@ function runTest()
 </script>
 </head>
 <body>
-<p>This tests that an autofilled Strong Password or Strong Confirmation Password decorated text field does not change appearance when its minlength changes. It can only be tested in the test tool.</p>
+<p>This tests that an autofilled Strong Password decorated text field does not change appearance when its minlength changes. It can only be tested in the test tool.</p>
 <input type="password" value="Cupertino" minlength="5" data-auto-fill-button-type="StrongPassword" data-autofilled="true">
-<input type="password" value="Cupertino" minlength="5" data-auto-fill-button-type="StrongConfirmationPassword" data-autofilled="true">
 </body>
 </html>
index c1aea53..2de3f48 100644 (file)
@@ -19,8 +19,7 @@ function runTest()
 </script>
 </head>
 <body>
-<p>This tests that an autofilled Strong Password or Strong Confirmation Password decorated text field does not change appearance when its minlength changes. It can only be tested in the test tool.</p>
+<p>This tests that an autofilled Strong Password decorated text field does not change appearance when its minlength changes. It can only be tested in the test tool.</p>
 <input type="password" value="Cupertino" minlength="5" data-auto-fill-button-type="StrongPassword" data-autofilled="true">
-<input type="password" value="Cupertino" minlength="5" data-auto-fill-button-type="StrongConfirmationPassword" data-autofilled="true">
 </body>
 </html>
index 078bcdc..551adff 100644 (file)
@@ -1,10 +1,9 @@
 <!DOCTYPE html>
 <html>
 <body>
-<p>This tests that that an autofilled Strong Password or Strong Confirmation Password decorated text field reverts to its original appearance when the form is reset. It can only be tested in the test tool.</p>
+<p>This tests that that an autofilled Strong Password decorated text field reverts to its original appearance when the form is reset. It can only be tested in the test tool.</p>
 <form>
 <input type="password" value="Cupertino">
-<input type="password" value="Cupertino">
 </form>
 </body>
 </html>
index e8b25bb..00562af 100644 (file)
@@ -17,10 +17,9 @@ function runTest()
 </script>
 </head>
 <body>
-<p>This tests that that an autofilled Strong Password or Strong Confirmation Password decorated text field reverts to its original appearance when the form is reset. It can only be tested in the test tool.</p>
+<p>This tests that that an autofilled Strong Password decorated text field reverts to its original appearance when the form is reset. It can only be tested in the test tool.</p>
 <form>
 <input type="password" value="Cupertino" data-auto-fill-button-type="StrongPassword" data-autofilled="true">
-<input type="password" value="Cupertino" data-auto-fill-button-type="StrongConfirmationPassword" data-autofilled="true">
 </form>
 </body>
 </html>
index 1657231..a799f16 100644 (file)
@@ -1,8 +1,7 @@
 <!DOCTYPE html>
 <html>
 <body>
-<p>This tests that that an autofilled Strong Password or Strong Confirmation Password decorated text field reverts to its original appearance when its value changes. It can only be tested in the test tool.</p>
-<input type="password" value="">
+<p>This tests that that an autofilled Strong Password decorated text field reverts to its original appearance when its value changes. It can only be tested in the test tool.</p>
 <input type="password" value="">
 </body>
 </html>
index a948084..8c4d373 100644 (file)
@@ -19,8 +19,7 @@ function runTest()
 </script>
 </head>
 <body>
-<p>This tests that that an autofilled Strong Password or Strong Confirmation Password decorated text field reverts to its original appearance when its value changes. It can only be tested in the test tool.</p>
+<p>This tests that that an autofilled Strong Password decorated text field reverts to its original appearance when its value changes. It can only be tested in the test tool.</p>
 <input type="password" value="Cupertino" data-auto-fill-button-type="StrongPassword" data-autofilled="true">
-<input type="password" value="Cupertino" data-auto-fill-button-type="StrongConfirmationPassword" data-autofilled="true">
 </body>
 </html>
index b612dd6..8d86cfa 100644 (file)
@@ -1,8 +1,7 @@
 <!DOCTYPE html>
 <html>
 <body>
-<p>This tests that a text field decorated as a Strong Password or Strong Confirmation Password field revert to a normal text field when the type of the text field changes. It can only be tested in the test tool.</p>
-<input type="text" value="Cupertino">
+<p>This tests that a text field decorated as a Strong Password field revert to a normal text field when the type of the text field changes. It can only be tested in the test tool.</p>
 <input type="text" value="Cupertino">
 </body>
 </html>
index b90c76e..419d4cb 100644 (file)
@@ -19,8 +19,7 @@ function runTest()
 </script>
 </head>
 <body>
-<p>This tests that a text field decorated as a Strong Password or Strong Confirmation Password field revert to a normal text field when the type of the text field changes. It can only be tested in the test tool.</p>
+<p>This tests that a text field decorated as a Strong Password field revert to a normal text field when the type of the text field changes. It can only be tested in the test tool.</p>
 <input type="password" value="Cupertino" data-auto-fill-button-type="StrongPassword">
-<input type="password" value="Cupertino" data-auto-fill-button-type="StrongConfirmationPassword">
 </body>
 </html>
diff --git a/LayoutTests/fast/forms/auto-fill-button/input-autofilled-disabled-strong-password-auto-fill-button-expected.html b/LayoutTests/fast/forms/auto-fill-button/input-autofilled-disabled-strong-password-auto-fill-button-expected.html
deleted file mode 100644 (file)
index 675c8c7..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE html>
-<html>
-<body>
-<p>This tests that a disabled field with the Strong Password AutoFill buttons renders identical to a disabled field with the Strong Confirmation AutoFill button. It can only be tested in the test tool.</p>
-<input type="password" placeholder="disabled" disabled>
-<br>
-<input type="password" value="A quick brown fox jumped over the lazy dog." disabled>
-<br>
-<input type="password" value="A quick brown fox jumped over the lazy dog." style="width:300px" disabled>
-<script>
-if (window.internals) {
-    var inputElements = document.getElementsByTagName("input");
-    for (let inputElement of inputElements) {
-        internals.setAutofilled(inputElement, true);
-        internals.setShowAutoFillButton(inputElement, "StrongConfirmationPassword");
-    }
-}
-</script>
-</body>
-</html>
diff --git a/LayoutTests/fast/forms/auto-fill-button/input-autofilled-disabled-strong-password-auto-fill-button.html b/LayoutTests/fast/forms/auto-fill-button/input-autofilled-disabled-strong-password-auto-fill-button.html
deleted file mode 100644 (file)
index dc42b3a..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE html>
-<html>
-<body>
-<p>This tests that a disabled field with the Strong Password AutoFill buttons renders identical to a disabled field with the Strong Confirmation AutoFill button. It can only be tested in the test tool.</p>
-<input type="password" placeholder="disabled" disabled>
-<br>
-<input type="password" value="A quick brown fox jumped over the lazy dog." disabled>
-<br>
-<input type="password" value="A quick brown fox jumped over the lazy dog." style="width:300px" disabled>
-<script>
-if (window.internals) {
-    var inputElements = document.getElementsByTagName("input");
-    for (let inputElement of inputElements) {
-        internals.setAutofilled(inputElement, true);
-        internals.setShowAutoFillButton(inputElement, "StrongPassword");
-    }
-}
-</script>
-</body>
-</html>
diff --git a/LayoutTests/fast/forms/auto-fill-button/input-autofilled-readonly-strong-password-auto-fill-button-expected.html b/LayoutTests/fast/forms/auto-fill-button/input-autofilled-readonly-strong-password-auto-fill-button-expected.html
deleted file mode 100644 (file)
index 63536d8..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE html>
-<html>
-<body>
-<p>This tests that a readonly field with the Strong Password AutoFill buttons renders identical to a disabled field with the Strong Confirmation AutoFill button. It can only be tested in the test tool.</p>
-<input type="password" placeholder="read only" readonly>
-<br>
-<input type="password" value="A quick brown fox jumped over the lazy dog." readonly>
-<br>
-<input type="password" value="A quick brown fox jumped over the lazy dog." style="width:300px" readonly>
-<script>
-if (window.internals) {
-    var inputElements = document.getElementsByTagName("input");
-    for (let inputElement of inputElements) {
-        internals.setAutofilled(inputElement, true);
-        internals.setShowAutoFillButton(inputElement, "StrongConfirmationPassword");
-    }
-}
-</script>
-</body>
-</html>
diff --git a/LayoutTests/fast/forms/auto-fill-button/input-autofilled-readonly-strong-password-auto-fill-button.html b/LayoutTests/fast/forms/auto-fill-button/input-autofilled-readonly-strong-password-auto-fill-button.html
deleted file mode 100644 (file)
index 128a581..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE html>
-<html>
-<body>
-<p>This tests that a readonly field with the Strong Password AutoFill buttons renders identical to a disabled field with the Strong Confirmation AutoFill button. It can only be tested in the test tool.</p>
-<input type="password" placeholder="read only" readonly>
-<br>
-<input type="password" value="A quick brown fox jumped over the lazy dog." readonly>
-<br>
-<input type="password" value="A quick brown fox jumped over the lazy dog." style="width:300px" readonly>
-<script>
-if (window.internals) {
-    var inputElements = document.getElementsByTagName("input");
-    for (let inputElement of inputElements) {
-        internals.setAutofilled(inputElement, true);
-        internals.setShowAutoFillButton(inputElement, "StrongPassword");
-    }
-}
-</script>
-</body>
-</html>
index 404388b..5de4e9b 100644 (file)
@@ -1,8 +1,7 @@
 <!DOCTYPE html>
 <html>
 <body>
-<p>This tests that the Strong Password and Strong Confirmation Password AutoFill buttons do not render in a disabled field. It can only be tested in the test tool.</p>
-<input type="password" placeholder="disabled" disabled>
+<p>This tests that the Strong Password button does not render in a disabled field. It can only be tested in the test tool.</p>
 <input type="password" placeholder="disabled" disabled>
 </body>
 </html>
index 012a93c..9e703cd 100644 (file)
@@ -4,8 +4,7 @@
 <script src="resources/process-auto-fill-button-type-and-invoke-runTest.js"></script>
 </head>
 <body>
-<p>This tests that the Strong Password and Strong Confirmation Password AutoFill buttons do not render in a disabled field. It can only be tested in the test tool.</p>
+<p>This tests that the Strong Password button does not render in a disabled field. It can only be tested in the test tool.</p>
 <input type="password" placeholder="disabled" disabled data-auto-fill-button-type="StrongPassword">
-<input type="password" placeholder="disabled" disabled data-auto-fill-button-type="StrongConfirmationPassword">
 </body>
 </html>
index c13b064..98d94de 100644 (file)
@@ -1,8 +1,7 @@
 <!DOCTYPE html>
 <html>
 <body>
-<p>This tests that the Strong Password and Strong Confirmation Password AutoFill buttons do not render read only field. It can only be tested in the test tool.</p>
-<input type="password" placeholder="read only" readonly>
+<p>This tests that the Strong Password button does not render read only field. It can only be tested in the test tool.</p>
 <input type="password" placeholder="read only" readonly>
 </body>
 </html>
index a3d1c03..5e87495 100644 (file)
@@ -4,8 +4,7 @@
 <script src="resources/process-auto-fill-button-type-and-invoke-runTest.js"></script>
 </head>
 <body>
-<p>This tests that the Strong Password and Strong Confirmation Password AutoFill buttons do not render read only field. It can only be tested in the test tool.</p>
+<p>This tests that the Strong Password button does not render read only field. It can only be tested in the test tool.</p>
 <input type="password" placeholder="read only" readonly data-auto-fill-button-type="StrongPassword">
-<input type="password" placeholder="read only" readonly data-auto-fill-button-type="StrongConfirmationPassword">
 </body>
 </html>
diff --git a/LayoutTests/fast/forms/auto-fill-button/input-strong-confirmation-password-auto-fill-button.html b/LayoutTests/fast/forms/auto-fill-button/input-strong-confirmation-password-auto-fill-button.html
deleted file mode 100644 (file)
index d63dbea..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html>
-<html>
-<body>
-<p>This tests that the Strong Confirmation Password AutoFill button renders in an auto-filled input. It can only be tested in the test tool.</p>
-<div id="container">
-    <input type="text" value="A quick brown fox jumped over the lazy dog.">
-    <input type="password" value="A quick brown fox jumped over the lazy dog.">
-    <input type="password" value="A quick brown fox jumped over the lazy dog." style="width:300px">
-    <input type="password" value="A quick brown fox jumped over the lazy dog." style="width:20px">
-    <input type="password" value="A quick brown fox jumped over the lazy dog." style="height:100px">
-    <input type="password" value="A quick brown fox jumped over the lazy dog." style="width:20px; height:100px">
-</div>
-<script>
-if (window.internals) {
-    var inputs = document.querySelectorAll("input");
-    for (var i = 0; i < inputs.length; ++i) {
-        window.internals.setAutofilled(inputs[i], true);
-        window.internals.setShowAutoFillButton(inputs[i], "StrongConfirmationPassword");
-    }
-
-    var dynamicInput = document.createElement("input");
-    window.internals.setAutofilled(dynamicInput, true);
-    window.internals.setShowAutoFillButton(dynamicInput, "StrongConfirmationPassword");
-    document.querySelector("#container").appendChild(dynamicInput);
-}
-</script>
-</body>
-</html>
index cf5c92a..7839caa 100644 (file)
@@ -13,12 +13,12 @@ PASS internals.lastAutoFillButtonType(inputElement) is "Credentials"
 internals.setShowAutoFillButton(inputElement, 'StrongPassword')
 PASS internals.autoFillButtonType(inputElement) is "StrongPassword"
 PASS internals.lastAutoFillButtonType(inputElement) is "Contacts"
-internals.setShowAutoFillButton(inputElement, 'StrongConfirmationPassword')
-PASS internals.autoFillButtonType(inputElement) is "StrongConfirmationPassword"
+internals.setShowAutoFillButton(inputElement, 'Credentials')
+PASS internals.autoFillButtonType(inputElement) is "Credentials"
 PASS internals.lastAutoFillButtonType(inputElement) is "StrongPassword"
 internals.setShowAutoFillButton(inputElement, 'None')
 PASS internals.autoFillButtonType(inputElement) is "None"
-PASS internals.lastAutoFillButtonType(inputElement) is "StrongConfirmationPassword"
+PASS internals.lastAutoFillButtonType(inputElement) is "Credentials"
 PASS successfullyParsed is true
 
 TEST COMPLETE
index 2509c2f..26a7550 100644 (file)
@@ -22,12 +22,12 @@ else {
     evalAndLog("internals.setShowAutoFillButton(inputElement, 'StrongPassword')");
     shouldBeEqualToString("internals.autoFillButtonType(inputElement)", "StrongPassword");
     shouldBeEqualToString("internals.lastAutoFillButtonType(inputElement)", "Contacts");
-    evalAndLog("internals.setShowAutoFillButton(inputElement, 'StrongConfirmationPassword')");
-    shouldBeEqualToString("internals.autoFillButtonType(inputElement)", "StrongConfirmationPassword");
+    evalAndLog("internals.setShowAutoFillButton(inputElement, 'Credentials')");
+    shouldBeEqualToString("internals.autoFillButtonType(inputElement)", "Credentials");
     shouldBeEqualToString("internals.lastAutoFillButtonType(inputElement)", "StrongPassword");
     evalAndLog("internals.setShowAutoFillButton(inputElement, 'None')");
     shouldBeEqualToString("internals.autoFillButtonType(inputElement)", "None");
-    shouldBeEqualToString("internals.lastAutoFillButtonType(inputElement)", "StrongConfirmationPassword");
+    shouldBeEqualToString("internals.lastAutoFillButtonType(inputElement)", "Credentials");
 }
 </script>
 </body>
index c846d7e..1d7f4c5 100644 (file)
@@ -3350,7 +3350,6 @@ webkit.org/b/180803 imported/w3c/web-platform-tests/media-source/mediasource-dur
 webkit.org/b/180805 inspector/canvas/requestContent-bitmaprenderer.html [ Failure ]
 
 webkit.org/b/181662 fast/forms/auto-fill-button/input-strong-password-auto-fill-button.html [ Missing Failure ]
-webkit.org/b/181662 fast/forms/auto-fill-button/input-strong-confirmation-password-auto-fill-button.html [ Missing Failure ]
 
 webkit.org/b/182050 http/wpt/fetch/response-opaque-clone.html [ Pass Crash ]
 
diff --git a/LayoutTests/platform/gtk/fast/forms/auto-fill-button/input-strong-confirmation-password-auto-fill-button-expected.txt b/LayoutTests/platform/gtk/fast/forms/auto-fill-button/input-strong-confirmation-password-auto-fill-button-expected.txt
deleted file mode 100644 (file)
index 2633e12..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x132
-  RenderBlock {HTML} at (0,0) size 800x132
-    RenderBody {BODY} at (8,16) size 784x108
-      RenderBlock {P} at (0,0) size 784x36
-        RenderText {#text} at (0,0) size 771x35
-          text run at (0,0) width 771: "This tests that the Strong Confirmation Password AutoFill button renders in an auto-filled input. It can only be tested in the"
-          text run at (0,18) width 53: "test tool."
-      RenderBlock {DIV} at (0,52) size 784x56
-        RenderTextControl {INPUT} at (2,2) size 191x24 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
-          RenderFlexibleBox {DIV} at (3,3) size 185x18
-            RenderBlock {DIV} at (0,0) size 185x18
-            RenderBlock {DIV} at (185,9) size 0x0
-        RenderText {#text} at (195,5) size 4x17
-          text run at (195,5) width 4: " "
-        RenderTextControl {INPUT} at (201,2) size 191x24 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
-          RenderFlexibleBox {DIV} at (3,3) size 185x18
-            RenderBlock {DIV} at (0,0) size 185x18
-            RenderBlock {DIV} at (185,9) size 0x0
-        RenderText {#text} at (394,5) size 4x17
-          text run at (394,5) width 4: " "
-        RenderTextControl {INPUT} at (398,2) size 306x24 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
-          RenderFlexibleBox {DIV} at (3,3) size 300x18
-            RenderBlock {DIV} at (0,0) size 300x18
-            RenderBlock {DIV} at (300,9) size 0x0
-        RenderText {#text} at (704,5) size 4x17
-          text run at (704,5) width 4: " "
-        RenderTextControl {INPUT} at (2,30) size 191x24 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
-          RenderFlexibleBox {DIV} at (3,3) size 185x18
-            RenderBlock {DIV} at (0,0) size 185x18
-            RenderBlock {DIV} at (185,9) size 0x0
-layer at (13,73) size 185x18 scrollWidth 312
-  RenderBlock {DIV} at (0,0) size 185x18 [color=#00000099]
-    RenderText {#text} at (0,0) size 312x17
-      text run at (0,0) width 312: "A quick brown fox jumped over the lazy dog."
-layer at (212,73) size 185x18 scrollWidth 258
-  RenderBlock {DIV} at (0,0) size 185x18 [color=#00000099]
-    RenderText {#text} at (0,0) size 258x17
-      text run at (0,0) width 258: "\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}"
-layer at (409,73) size 300x18
-  RenderBlock {DIV} at (0,0) size 300x18 [color=#00000099]
-    RenderText {#text} at (0,0) size 258x17
-      text run at (0,0) width 258: "\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}"
-layer at (13,101) size 185x18
-  RenderBlock {DIV} at (0,0) size 185x18 [color=#00000099]
diff --git a/LayoutTests/platform/ios/fast/forms/auto-fill-button/input-strong-confirmation-password-auto-fill-button-expected.txt b/LayoutTests/platform/ios/fast/forms/auto-fill-button/input-strong-confirmation-password-auto-fill-button-expected.txt
deleted file mode 100644 (file)
index 4d2278f..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x211
-  RenderBlock {HTML} at (0,0) size 800x211
-    RenderBody {BODY} at (8,16) size 784x187
-      RenderBlock {P} at (0,0) size 784x40
-        RenderText {#text} at (0,0) size 766x39
-          text run at (0,0) width 766: "This tests that the Strong Confirmation Password AutoFill button renders in an auto-filled input. It can only be tested in"
-          text run at (0,20) width 79: "the test tool."
-      RenderBlock {DIV} at (0,56) size 784x131
-        RenderTextControl {INPUT} at (2,3) size 153x20 [bgcolor=#FAFFBD] [border: (1px solid #4C4C4C)]
-        RenderText {#text} at (157,0) size 4x19
-          text run at (157,0) width 4: " "
-        RenderTextControl {INPUT} at (163,3) size 153x20 [bgcolor=#FAFFBD] [border: (1px solid #4C4C4C)]
-        RenderText {#text} at (318,0) size 4x19
-          text run at (318,0) width 4: " "
-        RenderTextControl {INPUT} at (322,3) size 313x20 [bgcolor=#FAFFBD] [border: (1px solid #4C4C4C)]
-        RenderText {#text} at (635,0) size 4x19
-          text run at (635,0) width 4: " "
-        RenderTextControl {INPUT} at (639,3) size 33x20 [bgcolor=#FAFFBD] [border: (1px solid #4C4C4C)]
-        RenderText {#text} at (0,0) size 0x0
-        RenderTextControl {INPUT} at (2,24) size 153x108 [bgcolor=#FAFFBD] [border: (1px solid #4C4C4C)]
-        RenderText {#text} at (157,65) size 4x19
-          text run at (157,65) width 4: " "
-        RenderTextControl {INPUT} at (161,24) size 33x108 [bgcolor=#FAFFBD] [border: (1px solid #4C4C4C)]
-        RenderText {#text} at (194,65) size 4x19
-          text run at (194,65) width 4: " "
-        RenderTextControl {INPUT} at (200,68) size 153x20 [bgcolor=#FAFFBD] [border: (1px solid #4C4C4C)]
-layer at (17,78) size 140x12
-  RenderFlexibleBox {DIV} at (6,3) size 141x13
-    RenderBlock {DIV} at (140,6) size 0x0
-layer at (17,78) size 140x12
-  RenderBlock {DIV} at (0,0) size 140x12
-layer at (178,78) size 140x12
-  RenderFlexibleBox {DIV} at (6,3) size 141x13
-    RenderBlock {DIV} at (140,6) size 0x0
-layer at (178,78) size 140x12
-  RenderBlock {DIV} at (0,0) size 140x12
-layer at (337,78) size 300x12
-  RenderFlexibleBox {DIV} at (6,3) size 301x13
-    RenderBlock {DIV} at (300,6) size 0x0
-layer at (337,78) size 300x12
-  RenderBlock {DIV} at (0,0) size 300x12
-layer at (654,78) size 20x12
-  RenderFlexibleBox {DIV} at (6,3) size 21x13
-    RenderBlock {DIV} at (20,6) size 0x0
-layer at (654,78) size 20x12
-  RenderBlock {DIV} at (0,0) size 20x12
-layer at (17,99) size 140x100
-  RenderFlexibleBox {DIV} at (6,3) size 141x101
-    RenderBlock {DIV} at (140,50) size 0x0
-layer at (17,143) size 140x12
-  RenderBlock {DIV} at (0,44) size 140x12
-layer at (176,99) size 20x100
-  RenderFlexibleBox {DIV} at (6,3) size 21x101
-    RenderBlock {DIV} at (20,50) size 0x0
-layer at (176,143) size 20x12
-  RenderBlock {DIV} at (0,44) size 20x12
-layer at (215,143) size 140x12
-  RenderFlexibleBox {DIV} at (6,3) size 141x13
-    RenderBlock {DIV} at (140,6) size 0x0
-layer at (215,143) size 140x12
-  RenderBlock {DIV} at (0,0) size 140x12
-layer at (17,78) size 140x12 scrollWidth 284
-  RenderBlock {DIV} at (0,0) size 140x12 [color=#00000099]
-    RenderText {#text} at (0,0) size 284x12
-      text run at (0,0) width 284: "A quick brown fox jumped over the lazy dog."
-layer at (178,78) size 140x12 scrollWidth 284
-  RenderBlock {DIV} at (0,0) size 140x12 [color=#00000099]
-    RenderText {#text} at (0,0) size 284x12
-      text run at (0,0) width 284: "A quick brown fox jumped over the lazy dog."
-layer at (337,78) size 284x12 backgroundClip at (337,78) size 283x12 clip at (337,78) size 283x12
-  RenderBlock {DIV} at (0,0) size 284x12 [color=#00000099]
-    RenderText {#text} at (0,0) size 284x12
-      text run at (0,0) width 284: "A quick brown fox jumped over the lazy dog."
-layer at (654,78) size 20x12 scrollWidth 284
-  RenderBlock {DIV} at (0,0) size 20x12 [color=#00000099]
-    RenderText {#text} at (0,0) size 284x12
-      text run at (0,0) width 284: "A quick brown fox jumped over the lazy dog."
-layer at (17,143) size 140x12 scrollWidth 284
-  RenderBlock {DIV} at (0,0) size 140x12 [color=#00000099]
-    RenderText {#text} at (0,0) size 284x12
-      text run at (0,0) width 284: "A quick brown fox jumped over the lazy dog."
-layer at (176,143) size 20x12 scrollWidth 284
-  RenderBlock {DIV} at (0,0) size 20x12 [color=#00000099]
-    RenderText {#text} at (0,0) size 284x12
-      text run at (0,0) width 284: "A quick brown fox jumped over the lazy dog."
diff --git a/LayoutTests/platform/mac/fast/forms/auto-fill-button/input-strong-confirmation-password-auto-fill-button-expected.txt b/LayoutTests/platform/mac/fast/forms/auto-fill-button/input-strong-confirmation-password-auto-fill-button-expected.txt
deleted file mode 100644 (file)
index 6337d2e..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x205
-  RenderBlock {HTML} at (0,0) size 800x205
-    RenderBody {BODY} at (8,16) size 784x181
-      RenderBlock {P} at (0,0) size 784x36
-        RenderText {#text} at (0,0) size 764x36
-          text run at (0,0) width 764: "This tests that the Strong Confirmation Password AutoFill button renders in an auto-filled input. It can only be tested in"
-          text run at (0,18) width 79: "the test tool."
-      RenderBlock {DIV} at (0,52) size 784x129
-        RenderTextControl {INPUT} at (2,2) size 158x19 [bgcolor=#FAFFBD] [border: (2px inset #000000)]
-        RenderText {#text} at (162,1) size 4x18
-          text run at (162,1) width 4: " "
-        RenderTextControl {INPUT} at (168,2) size 158x19 [bgcolor=#FAFFBD] [border: (2px inset #000000)]
-        RenderText {#text} at (328,1) size 4x18
-          text run at (328,1) width 4: " "
-        RenderTextControl {INPUT} at (332,2) size 306x19 [bgcolor=#FAFFBD] [border: (2px inset #000000)]
-        RenderText {#text} at (638,1) size 4x18
-          text run at (638,1) width 4: " "
-        RenderTextControl {INPUT} at (642,2) size 26x19 [bgcolor=#FAFFBD] [border: (2px inset #000000)]
-        RenderText {#text} at (0,0) size 0x0
-        RenderTextControl {INPUT} at (2,23) size 158x106 [bgcolor=#FAFFBD] [border: (2px inset #000000)]
-        RenderText {#text} at (162,65) size 4x18
-          text run at (162,65) width 4: " "
-        RenderTextControl {INPUT} at (166,23) size 26x106 [bgcolor=#FAFFBD] [border: (2px inset #000000)]
-        RenderText {#text} at (192,65) size 4x18
-          text run at (192,65) width 4: " "
-        RenderTextControl {INPUT} at (198,66) size 158x19 [bgcolor=#FAFFBD] [border: (2px inset #000000)]
-layer at (13,73) size 152x13
-  RenderFlexibleBox {DIV} at (3,3) size 152x13
-    RenderBlock {DIV} at (152,6) size 0x0
-layer at (13,73) size 152x13
-  RenderBlock {DIV} at (0,0) size 152x13
-layer at (179,73) size 152x13
-  RenderFlexibleBox {DIV} at (3,3) size 152x13
-    RenderBlock {DIV} at (152,6) size 0x0
-layer at (179,73) size 152x13
-  RenderBlock {DIV} at (0,0) size 152x13
-layer at (343,73) size 300x13
-  RenderFlexibleBox {DIV} at (3,3) size 300x13
-    RenderBlock {DIV} at (300,6) size 0x0
-layer at (343,73) size 300x13
-  RenderBlock {DIV} at (0,0) size 300x13
-layer at (653,73) size 20x13
-  RenderFlexibleBox {DIV} at (3,3) size 20x13
-    RenderBlock {DIV} at (20,6) size 0x0
-layer at (653,73) size 20x13
-  RenderBlock {DIV} at (0,0) size 20x13
-layer at (13,94) size 152x100
-  RenderFlexibleBox {DIV} at (3,3) size 152x100
-    RenderBlock {DIV} at (152,50) size 0x0
-layer at (13,138) size 152x13
-  RenderBlock {DIV} at (0,43) size 152x14
-layer at (177,94) size 20x100
-  RenderFlexibleBox {DIV} at (3,3) size 20x100
-    RenderBlock {DIV} at (20,50) size 0x0
-layer at (177,138) size 20x13
-  RenderBlock {DIV} at (0,43) size 20x14
-layer at (209,137) size 152x13
-  RenderFlexibleBox {DIV} at (3,3) size 152x13
-    RenderBlock {DIV} at (152,6) size 0x0
-layer at (209,137) size 152x13
-  RenderBlock {DIV} at (0,0) size 152x13
-layer at (13,73) size 152x13 scrollWidth 284
-  RenderBlock {DIV} at (0,0) size 152x13 [color=#00000099]
-    RenderText {#text} at (0,0) size 284x13
-      text run at (0,0) width 284: "A quick brown fox jumped over the lazy dog."
-layer at (179,73) size 152x13 scrollWidth 284
-  RenderBlock {DIV} at (0,0) size 152x13 [color=#00000099]
-    RenderText {#text} at (0,0) size 284x13
-      text run at (0,0) width 284: "A quick brown fox jumped over the lazy dog."
-layer at (343,73) size 284x13
-  RenderBlock {DIV} at (0,0) size 284x13 [color=#00000099]
-    RenderText {#text} at (0,0) size 284x13
-      text run at (0,0) width 284: "A quick brown fox jumped over the lazy dog."
-layer at (653,73) size 20x13 scrollWidth 284
-  RenderBlock {DIV} at (0,0) size 20x13 [color=#00000099]
-    RenderText {#text} at (0,0) size 284x13
-      text run at (0,0) width 284: "A quick brown fox jumped over the lazy dog."
-layer at (13,138) size 152x13 scrollWidth 284
-  RenderBlock {DIV} at (0,0) size 152x13 [color=#00000099]
-    RenderText {#text} at (0,0) size 284x13
-      text run at (0,0) width 284: "A quick brown fox jumped over the lazy dog."
-layer at (177,138) size 20x13 scrollWidth 284
-  RenderBlock {DIV} at (0,0) size 20x13 [color=#00000099]
-    RenderText {#text} at (0,0) size 284x13
-      text run at (0,0) width 284: "A quick brown fox jumped over the lazy dog."
index 81f4498..175017c 100644 (file)
@@ -3944,7 +3944,6 @@ webkit.org/b/181346 mathml/opentype/opentype-stretchy-horizontal.html [ Failure
 webkit.org/b/181501 accessibility/table-header-calculation-for-header-rows.html [ Failure ]
 
 webkit.org/b/181662 fast/forms/auto-fill-button/input-strong-password-auto-fill-button.html [ Failure ]
-webkit.org/b/181662 fast/forms/auto-fill-button/input-strong-confirmation-password-auto-fill-button.html [ Failure ]
 
 webkit.org/b/181854 svg/filters/feDiffuseLighting-bottomRightPixel.html [ ImageOnlyFailure ]
 
diff --git a/LayoutTests/platform/win/fast/forms/auto-fill-button/input-strong-confirmation-password-auto-fill-button-expected.txt b/LayoutTests/platform/win/fast/forms/auto-fill-button/input-strong-confirmation-password-auto-fill-button-expected.txt
deleted file mode 100644 (file)
index dab5790..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x101
-  RenderBlock {HTML} at (0,0) size 800x101
-    RenderBody {BODY} at (8,16) size 784x77
-      RenderBlock {P} at (0,0) size 784x36
-        RenderText {#text} at (0,0) size 771x36
-          text run at (0,0) width 771: "This tests that the Strong Confirmation Password AutoFill button renders in an auto-filled input. It can only be tested in the"
-          text run at (0,18) width 53: "test tool."
-      RenderBlock {DIV} at (0,52) size 784x25
-        RenderTextControl {INPUT} at (2,2) size 149x21 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
-          RenderFlexibleBox {DIV} at (2,3) size 145x15
-            RenderBlock {DIV} at (0,0) size 145x15
-            RenderBlock {DIV} at (145,7) size 0x0
-        RenderText {#text} at (153,3) size 4x18
-          text run at (153,3) width 4: " "
-        RenderTextControl {INPUT} at (159,2) size 149x21 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
-          RenderFlexibleBox {DIV} at (2,3) size 145x15
-            RenderBlock {DIV} at (0,0) size 145x15
-            RenderBlock {DIV} at (145,7) size 0x0
-        RenderText {#text} at (310,3) size 4x18
-          text run at (310,3) width 4: " "
-        RenderTextControl {INPUT} at (314,2) size 304x21 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
-          RenderFlexibleBox {DIV} at (2,3) size 300x15
-            RenderBlock {DIV} at (0,0) size 300x15
-            RenderBlock {DIV} at (300,7) size 0x0
-        RenderText {#text} at (618,3) size 4x18
-          text run at (618,3) width 4: " "
-        RenderTextControl {INPUT} at (624,2) size 149x21 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
-          RenderFlexibleBox {DIV} at (2,3) size 145x15
-            RenderBlock {DIV} at (0,0) size 145x15
-            RenderBlock {DIV} at (145,7) size 0x0
-layer at (12,73) size 145x15 scrollWidth 250
-  RenderBlock {DIV} at (0,0) size 145x15 [color=#00000099]
-    RenderText {#text} at (0,0) size 250x15
-      text run at (0,0) width 250: "A quick brown fox jumped over the lazy dog."
-layer at (169,73) size 145x15 scrollWidth 215
-  RenderBlock {DIV} at (0,0) size 145x15 [color=#00000099]
-    RenderText {#text} at (0,0) size 215x15
-      text run at (0,0) width 215: "\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}"
-layer at (324,73) size 300x15
-  RenderBlock {DIV} at (0,0) size 300x15 [color=#00000099]
-    RenderText {#text} at (0,0) size 215x15
-      text run at (0,0) width 215: "\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}\x{2022}"
-layer at (634,73) size 145x15
-  RenderBlock {DIV} at (0,0) size 145x15 [color=#00000099]
diff --git a/LayoutTests/platform/wincairo/fast/forms/auto-fill-button/input-strong-confirmation-password-auto-fill-button-expected.txt b/LayoutTests/platform/wincairo/fast/forms/auto-fill-button/input-strong-confirmation-password-auto-fill-button-expected.txt
deleted file mode 100644 (file)
index ce5e822..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x132
-  RenderBlock {HTML} at (0,0) size 800x132
-    RenderBody {BODY} at (8,16) size 784x108
-      RenderBlock {P} at (0,0) size 784x40
-        RenderText {#text} at (0,0) size 757x39
-          text run at (0,0) width 757: "This tests that the Strong Confirmation Password AutoFill button renders in an auto-filled input. It can only be tested in the test"
-          text run at (0,20) width 27: "tool."
-      RenderBlock {DIV} at (0,56) size 784x52
-        RenderTextControl {INPUT} at (2,2) size 168x22 [bgcolor=#FAFFBD] [border: (2px inset #000000)]
-          RenderFlexibleBox {DIV} at (2,3) size 164x16
-            RenderBlock {DIV} at (0,0) size 164x16
-            RenderBlock {DIV} at (164,8) size 0x0
-        RenderText {#text} at (172,2) size 4x19
-          text run at (172,2) width 4: " "
-        RenderTextControl {INPUT} at (178,2) size 168x22 [bgcolor=#FAFFBD] [border: (2px inset #000000)]
-          RenderFlexibleBox {DIV} at (2,3) size 164x16
-            RenderBlock {DIV} at (0,0) size 164x16
-            RenderBlock {DIV} at (164,8) size 0x0
-        RenderText {#text} at (348,2) size 4x19
-          text run at (348,2) width 4: " "
-        RenderTextControl {INPUT} at (352,2) size 304x22 [bgcolor=#FAFFBD] [border: (2px inset #000000)]
-          RenderFlexibleBox {DIV} at (2,3) size 300x16
-            RenderBlock {DIV} at (0,0) size 300x16
-            RenderBlock {DIV} at (300,8) size 0x0
-        RenderText {#text} at (656,2) size 4x19
-          text run at (656,2) width 4: " "
-        RenderTextControl {INPUT} at (2,28) size 168x22 [bgcolor=#FAFFBD] [border: (2px inset #000000)]
-          RenderFlexibleBox {DIV} at (2,3) size 164x16
-            RenderBlock {DIV} at (0,0) size 164x16
-            RenderBlock {DIV} at (164,8) size 0x0
-layer at (12,77) size 164x16 scrollWidth 344
-  RenderBlock {DIV} at (0,0) size 164x16 [color=#00000099]
-    RenderText {#text} at (0,0) size 344x16
-      text run at (0,0) width 344: "A quick brown fox jumped over the lazy dog."
-layer at (188,77) size 164x16 scrollWidth 344
-  RenderBlock {DIV} at (0,0) size 164x16 [color=#00000099]
-    RenderText {#text} at (0,0) size 344x16
-      text run at (0,0) width 344: "A quick brown fox jumped over the lazy dog."
-layer at (362,77) size 300x16 scrollWidth 344
-  RenderBlock {DIV} at (0,0) size 300x16 [color=#00000099]
-    RenderText {#text} at (0,0) size 344x16
-      text run at (0,0) width 344: "A quick brown fox jumped over the lazy dog."
-layer at (12,103) size 164x16
-  RenderBlock {DIV} at (0,0) size 164x16 [color=#00000099]
index d3b369e..f15154b 100644 (file)
@@ -1,3 +1,37 @@
+2018-07-06  Daniel Bates  <dabates@apple.com>
+
+        Remove Strong Confirmation Password button
+        https://bugs.webkit.org/show_bug.cgi?id=187306
+        <rdar://problem/41795185>
+
+        Reviewed by Sam Weinig.
+
+        Remove support for the Strong Confirmation Password button because we never made use of it.
+
+        * English.lproj/Localizable.strings:
+        * accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
+        (-[WebAccessibilityObjectWrapper _accessibilityIsStrongPasswordField]):
+        * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
+        (-[WebAccessibilityObjectWrapper accessibilityAttributeValue:]):
+        * html/HTMLInputElement.h:
+        (WebCore::HTMLInputElement::hasAutoFillStrongPasswordButton const):
+        * html/HTMLTextFormControlElement.h:
+        * html/TextFieldInputType.cpp:
+        (WebCore::autoFillButtonTypeToAccessibilityLabel):
+        (WebCore::autoFillButtonTypeToAutoFillButtonText):
+        (WebCore::autoFillButtonTypeToAutoFillButtonPseudoClassName):
+        (WebCore::isAutoFillButtonTypeChanged):
+        * platform/LocalizedStrings.cpp:
+        (WebCore::AXAutoFillStrongConfirmationPasswordLabel): Deleted.
+        * platform/LocalizedStrings.h:
+        * rendering/RenderTextControlSingleLine.cpp:
+        (WebCore::RenderTextControlSingleLine::layout):
+        * testing/Internals.cpp:
+        (WebCore::toAutoFillButtonType):
+        (WebCore::toInternalsAutoFillButtonType):
+        * testing/Internals.h:
+        * testing/Internals.idl:
+
 2018-07-06  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         [GTK][WPE] REGRESSION(r233239): proxy settings not applied after r233239
index 813f694..60cee37 100644 (file)
 /* Label for the strong password auto fill button inside a text field. */
 "strong password auto fill" = "strong password auto fill";
 
-/* Label for the strong password confirmation auto fill button inside a text field. */
-"strong password confirmation auto fill" = "strong password confirmation auto fill";
-
 /* The suboptimal value description for a meter element. */
 "suboptimal value" = "suboptimal value";
 
index 8da42a1..50d9522 100644 (file)
@@ -1092,8 +1092,7 @@ static void appendStringToResult(NSMutableString *result, NSString *string)
     if (!m_object->isPasswordField())
         return NO;
     
-    AutoFillButtonType type = m_object->valueAutofillButtonType();
-    return type == AutoFillButtonType::StrongConfirmationPassword || type == AutoFillButtonType::StrongPassword;
+    return m_object->valueAutofillButtonType() == AutoFillButtonType::StrongPassword;
 }
 
 - (CGFloat)_accessibilityMinValue
index dc83b4c..bb38bc6 100644 (file)
@@ -3109,8 +3109,6 @@ static NSString* roleValueToNSString(AccessibilityRole value)
             return @"credentials";
         case AutoFillButtonType::Contacts:
             return @"contacts";
-        case AutoFillButtonType::StrongConfirmationPassword:
-            return @"strong confirmation password";
         case AutoFillButtonType::StrongPassword:
             return @"strong password";
         }
index 80a7e22..c894aa6 100644 (file)
@@ -242,7 +242,7 @@ public:
     AutoFillButtonType autoFillButtonType() const { return static_cast<AutoFillButtonType>(m_autoFillButtonType); }
     WEBCORE_EXPORT void setShowAutoFillButton(AutoFillButtonType);
 
-    bool hasAutoFillStrongPasswordButton() const  { return autoFillButtonType() == AutoFillButtonType::StrongPassword || autoFillButtonType() == AutoFillButtonType::StrongConfirmationPassword; }
+    bool hasAutoFillStrongPasswordButton() const  { return autoFillButtonType() == AutoFillButtonType::StrongPassword; }
 
     bool isAutoFillAvailable() const { return m_isAutoFillAvailable; }
     void setAutoFillAvailable(bool autoFillAvailable) { m_isAutoFillAvailable = autoFillAvailable; }
index 1c391b3..c320f2f 100644 (file)
@@ -33,7 +33,7 @@ class RenderTextControl;
 class TextControlInnerTextElement;
 class VisiblePosition;
 
-enum class AutoFillButtonType : uint8_t { None, Credentials, Contacts, StrongConfirmationPassword, StrongPassword };
+enum class AutoFillButtonType : uint8_t { None, Credentials, Contacts, StrongPassword };
 enum TextFieldSelectionDirection { SelectionHasNoDirection, SelectionHasForwardDirection, SelectionHasBackwardDirection };
 enum TextFieldEventBehavior { DispatchNoEvent, DispatchChangeEvent, DispatchInputAndChangeEvent };
 
index 4ab5b39..6667cf6 100644 (file)
@@ -450,8 +450,6 @@ static String autoFillButtonTypeToAccessibilityLabel(AutoFillButtonType autoFill
         return AXAutoFillContactsLabel();
     case AutoFillButtonType::Credentials:
         return AXAutoFillCredentialsLabel();
-    case AutoFillButtonType::StrongConfirmationPassword:
-        return AXAutoFillStrongConfirmationPasswordLabel();
     case AutoFillButtonType::StrongPassword:
         return AXAutoFillStrongPasswordLabel();
     case AutoFillButtonType::None:
@@ -467,7 +465,6 @@ static String autoFillButtonTypeToAutoFillButtonText(AutoFillButtonType autoFill
     switch (autoFillButtonType) {
     case AutoFillButtonType::Contacts:
     case AutoFillButtonType::Credentials:
-    case AutoFillButtonType::StrongConfirmationPassword:
         return emptyString();
     case AutoFillButtonType::StrongPassword:
         return autoFillStrongPasswordLabel();
@@ -486,8 +483,6 @@ static AtomicString autoFillButtonTypeToAutoFillButtonPseudoClassName(AutoFillBu
         return { "-webkit-contacts-auto-fill-button", AtomicString::ConstructFromLiteral };
     case AutoFillButtonType::Credentials:
         return { "-webkit-credentials-auto-fill-button", AtomicString::ConstructFromLiteral };
-    case AutoFillButtonType::StrongConfirmationPassword:
-        return { "-webkit-strong-confirmation-password-auto-fill-button", AtomicString::ConstructFromLiteral };
     case AutoFillButtonType::StrongPassword:
         return { "-webkit-strong-password-auto-fill-button", AtomicString::ConstructFromLiteral };
     case AutoFillButtonType::None:
@@ -504,8 +499,6 @@ static bool isAutoFillButtonTypeChanged(const AtomicString& attribute, AutoFillB
         return true;
     if (attribute == "-webkit-credentials-auto-fill-button" && autoFillButtonType != AutoFillButtonType::Credentials)
         return true;
-    if (attribute == "-webkit-strong-confirmation-password-auto-fill-button" && autoFillButtonType != AutoFillButtonType::StrongConfirmationPassword)
-        return true;
     if (attribute == "-webkit-strong-password-auto-fill-button" && autoFillButtonType != AutoFillButtonType::StrongPassword)
         return true;
     return false;
index 0fdd9b1..b0550cf 100644 (file)
@@ -630,11 +630,6 @@ String AXAutoFillStrongPasswordLabel()
     return WEB_UI_STRING("strong password auto fill", "Label for the strong password auto fill button inside a text field.");
 }
 
-String AXAutoFillStrongConfirmationPasswordLabel()
-{
-    return WEB_UI_STRING("strong password confirmation auto fill", "Label for the strong password confirmation auto fill button inside a text field.");
-}
-
 String autoFillStrongPasswordLabel()
 {
     return WEB_UI_STRING("Strong Password", "Label for strong password.");
index 70fd214..700c661 100644 (file)
@@ -216,7 +216,6 @@ namespace WebCore {
     String AXAutoFillCredentialsLabel();
     String AXAutoFillContactsLabel();
     String AXAutoFillStrongPasswordLabel();
-    String AXAutoFillStrongConfirmationPasswordLabel();
     String autoFillStrongPasswordLabel();
 
     String missingPluginText();
index 02a0ee9..939429a 100644 (file)
@@ -94,8 +94,7 @@ void RenderTextControlSingleLine::layout()
     // - Shrink the heights of the inner elements if the input height is smaller
     //   than the intrinsic heights of the inner elements.
     // - Make the height of the container element equal to the intrinsic height of
-    //   the inner elements when the field has a strong password or strong confirmation
-    //   password button.
+    //   the inner elements when the field has a strong password button.
     //
     // We don't honor paddings and borders for textfields without decorations
     // and type=search if the text height is taller than the contentHeight()
index 88feb66..3e6924b 100644 (file)
@@ -1756,8 +1756,6 @@ static AutoFillButtonType toAutoFillButtonType(Internals::AutoFillButtonType typ
         return AutoFillButtonType::Credentials;
     case Internals::AutoFillButtonType::Contacts:
         return AutoFillButtonType::Contacts;
-    case Internals::AutoFillButtonType::StrongConfirmationPassword:
-        return AutoFillButtonType::StrongConfirmationPassword;
     case Internals::AutoFillButtonType::StrongPassword:
         return AutoFillButtonType::StrongPassword;
     }
@@ -1774,9 +1772,7 @@ static Internals::AutoFillButtonType toInternalsAutoFillButtonType(AutoFillButto
         return Internals::AutoFillButtonType::Credentials;
     case AutoFillButtonType::Contacts:
         return Internals::AutoFillButtonType::Contacts;
-    case AutoFillButtonType::StrongConfirmationPassword:
-        return Internals::AutoFillButtonType::StrongConfirmationPassword;
-   case AutoFillButtonType::StrongPassword:
+    case AutoFillButtonType::StrongPassword:
         return Internals::AutoFillButtonType::StrongPassword;
     }
     ASSERT_NOT_REACHED();
index 0719a98..947732c 100644 (file)
@@ -245,7 +245,7 @@ public:
     bool elementShouldAutoComplete(HTMLInputElement&);
     void setEditingValue(HTMLInputElement&, const String&);
     void setAutofilled(HTMLInputElement&, bool enabled);
-    enum class AutoFillButtonType { None, Contacts, Credentials, StrongPassword, StrongConfirmationPassword };
+    enum class AutoFillButtonType { None, Contacts, Credentials, StrongPassword };
     void setShowAutoFillButton(HTMLInputElement&, AutoFillButtonType);
     AutoFillButtonType autoFillButtonType(const HTMLInputElement&);
     AutoFillButtonType lastAutoFillButtonType(const HTMLInputElement&);
index 5db5fd0..6062f48 100644 (file)
@@ -62,8 +62,7 @@ enum AutoFillButtonType {
     "None",
     "Contacts",
     "Credentials",
-    "StrongPassword",
-    "StrongConfirmationPassword"
+    "StrongPassword"
 };
 
 enum UserInterfaceLayoutDirection {
index b41893d..808094c 100644 (file)
@@ -1,3 +1,22 @@
+2018-07-06  Daniel Bates  <dabates@apple.com>
+
+        Remove Strong Confirmation Password button
+        https://bugs.webkit.org/show_bug.cgi?id=187306
+        <rdar://problem/41795185>
+
+        Reviewed by Sam Weinig.
+
+        Remove support for the Strong Confirmation Password button because we never made use of it.
+
+        * WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInNodeHandle.mm:
+        (toAutoFillButtonType):
+        (toWKAutoFillButtonType):
+        * WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInNodeHandlePrivate.h:
+        * WebProcess/InjectedBundle/API/c/WKBundleNodeHandle.cpp:
+        (toAutoFillButtonType):
+        (toWKAutoFillButtonType):
+        * WebProcess/InjectedBundle/API/c/WKBundleNodeHandlePrivate.h:
+
 2018-07-05  Youenn Fablet  <youenn@apple.com>
 
         REGRESSION (r230843): Flash doesn't work; Produces blue box on page
index 1457432..19744c8 100644 (file)
@@ -135,8 +135,6 @@ static WebCore::AutoFillButtonType toAutoFillButtonType(_WKAutoFillButtonType au
         return WebCore::AutoFillButtonType::Contacts;
     case _WKAutoFillButtonTypeCredentials:
         return WebCore::AutoFillButtonType::Credentials;
-    case _WKAutoFillButtonTypeStrongConfirmationPassword:
-        return WebCore::AutoFillButtonType::StrongConfirmationPassword;
     case _WKAutoFillButtonTypeStrongPassword:
         return WebCore::AutoFillButtonType::StrongPassword;
     }
@@ -153,8 +151,6 @@ static _WKAutoFillButtonType toWKAutoFillButtonType(WebCore::AutoFillButtonType
         return _WKAutoFillButtonTypeContacts;
     case WebCore::AutoFillButtonType::Credentials:
         return _WKAutoFillButtonTypeCredentials;
-    case WebCore::AutoFillButtonType::StrongConfirmationPassword:
-        return _WKAutoFillButtonTypeStrongConfirmationPassword;
     case WebCore::AutoFillButtonType::StrongPassword:
         return _WKAutoFillButtonTypeStrongPassword;
     }
index 6e356a9..a9dce0d 100644 (file)
@@ -31,7 +31,6 @@ typedef NS_ENUM(NSInteger, _WKAutoFillButtonType) {
     _WKAutoFillButtonTypeNone,
     _WKAutoFillButtonTypeCredentials,
     _WKAutoFillButtonTypeContacts,
-    _WKAutoFillButtonTypeStrongConfirmationPassword,
     _WKAutoFillButtonTypeStrongPassword,
 } WK_API_AVAILABLE(macosx(10.13.4), ios(11.3));
 
index d9b4f0a..cded804 100644 (file)
@@ -46,8 +46,6 @@ static WebCore::AutoFillButtonType toAutoFillButtonType(WKAutoFillButtonType wkA
         return WebCore::AutoFillButtonType::Contacts;
     case kWKAutoFillButtonTypeCredentials:
         return WebCore::AutoFillButtonType::Credentials;
-    case kWKAutoFillButtonTypeStrongConfirmationPassword:
-        return WebCore::AutoFillButtonType::StrongConfirmationPassword;
     case kWKAutoFillButtonTypeStrongPassword:
         return WebCore::AutoFillButtonType::StrongPassword;
     }
@@ -64,8 +62,6 @@ static WKAutoFillButtonType toWKAutoFillButtonType(WebCore::AutoFillButtonType a
         return kWKAutoFillButtonTypeContacts;
     case WebCore::AutoFillButtonType::Credentials:
         return kWKAutoFillButtonTypeCredentials;
-    case WebCore::AutoFillButtonType::StrongConfirmationPassword:
-        return kWKAutoFillButtonTypeStrongConfirmationPassword;
     case WebCore::AutoFillButtonType::StrongPassword:
         return kWKAutoFillButtonTypeStrongPassword;
     }
index e788a25..bcef9f2 100644 (file)
@@ -40,7 +40,6 @@ enum {
     kWKAutoFillButtonTypeCredentials,
     kWKAutoFillButtonTypeContacts,
     kWKAutoFillButtonTypeStrongPassword,
-    kWKAutoFillButtonTypeStrongConfirmationPassword,
 };
 typedef uint8_t WKAutoFillButtonType;