221429 2021-02-04 14:18:07 -0800 Allow Password AutoFill in more text field configurations 2021-02-05 15:32:46 -0800 1 1 1 Unclassified WebKit Forms Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 rmondello rmondello cdumez ews-watchlist mifenton rmondello webkit-bug-importer wenson_hsieh oldest_to_newest 1725798 0 rmondello 2021-02-04 14:18:07 -0800 Allow Password AutoFill in more text field configurations 1725802 1 419321 rmondello 2021-02-04 14:22:24 -0800 Created attachment 419321 First attempt at a patch 1725803 2 webkit-bug-importer 2021-02-04 14:23:24 -0800 <rdar://problem/73997299> 1725827 3 419321 wenson_hsieh 2021-02-04 15:17:37 -0800 Comment on attachment 419321 First attempt at a patch View in context: https://bugs.webkit.org/attachment.cgi?id=419321&action=review Looks good! Just a couple of minor comments. We should also write an API test for this (similar to the existing ones in WKWebViewAutoFillTests). > Source/WebCore/editing/cocoa/AutofillElements.cpp:99 > + return AutofillElements( > + previousFieldIsTextField ? WTFMove(previousElement) : nullptr, > + WTFMove(start), > + hasSecondPasswordFieldToFill ? WTFMove(nextElement) : nullptr > + ); We could probably put this on one line, as `return {{ previousFieldIsTextField ? WTFMove(previousElement) : nullptr, WTFMove(start), hasSecondPasswordFieldToFill ? WTFMove(nextElement) : nullptr }};` > Source/WebCore/editing/cocoa/AutofillElements.cpp:104 > + RefPtr<HTMLInputElement> elementAfterNextElement = nextAutofillableElement(nextElement.get(), focusController); Nit - `auto elementAfterNextElement = nextAutofillableElement(nextElement.get(), focusController);` > Source/WebCore/editing/cocoa/AutofillElements.cpp:108 > + return AutofillElements(WTFMove(start), WTFMove(nextElement), > + hasSecondPasswordFieldToFill ? WTFMove(elementAfterNextElement) : nullptr); Nit - I think this should could just be a single line as `return {{ WTFMove(start), WTFMove(nextElement), hasSecondPasswordFieldToFill ? WTFMove(elementAfterNextElement) : nullptr }};` 1725893 4 wenson_hsieh 2021-02-04 17:32:43 -0800 (In reply to Wenson Hsieh from comment #3) > Comment on attachment 419321 [details] > First attempt at a patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=419321&action=review > > Looks good! Just a couple of minor comments. We should also write an API > test for this (similar to the existing ones in WKWebViewAutoFillTests). Actually, it looks like the existing test WKWebViewAutoFillTests.AccountCreationPage already exercises this scenario, and just needs to be rebaselined. > > > Source/WebCore/editing/cocoa/AutofillElements.cpp:99 > > + return AutofillElements( > > + previousFieldIsTextField ? WTFMove(previousElement) : nullptr, > > + WTFMove(start), > > + hasSecondPasswordFieldToFill ? WTFMove(nextElement) : nullptr > > + ); > > We could probably put this on one line, as `return {{ > previousFieldIsTextField ? WTFMove(previousElement) : nullptr, > WTFMove(start), hasSecondPasswordFieldToFill ? WTFMove(nextElement) : > nullptr }};` > > > Source/WebCore/editing/cocoa/AutofillElements.cpp:104 > > + RefPtr<HTMLInputElement> elementAfterNextElement = nextAutofillableElement(nextElement.get(), focusController); > > Nit - `auto elementAfterNextElement = > nextAutofillableElement(nextElement.get(), focusController);` > > > Source/WebCore/editing/cocoa/AutofillElements.cpp:108 > > + return AutofillElements(WTFMove(start), WTFMove(nextElement), > > + hasSecondPasswordFieldToFill ? WTFMove(elementAfterNextElement) : nullptr); > > Nit - I think this should could just be a single line as `return {{ > WTFMove(start), WTFMove(nextElement), hasSecondPasswordFieldToFill ? > WTFMove(elementAfterNextElement) : nullptr }};` 1726180 5 419433 rmondello 2021-02-05 10:50:15 -0800 Created attachment 419433 Second try 1726182 6 419433 wenson_hsieh 2021-02-05 10:52:46 -0800 Comment on attachment 419433 Second try View in context: https://bugs.webkit.org/attachment.cgi?id=419433&action=review r=mews > Source/WebCore/editing/cocoa/AutofillElements.cpp:78 > : m_username(username) > , m_password(password) > + , m_secondPassword(secondPassword) (Not exactly new to this patch, but these could all be `WTFMove`d into the class members) 1726195 7 wenson_hsieh 2021-02-05 11:00:28 -0800 (In reply to Wenson Hsieh from comment #6) > Comment on attachment 419433 [details] > Second try > > View in context: > https://bugs.webkit.org/attachment.cgi?id=419433&action=review > > r=mews > > > Source/WebCore/editing/cocoa/AutofillElements.cpp:78 > > : m_username(username) > > , m_password(password) > > + , m_secondPassword(secondPassword) > > (Not exactly new to this patch, but these could all be `WTFMove`d into the > class members) Perhaps we can just do this as a followup. 1726262 8 419433 wenson_hsieh 2021-02-05 13:51:02 -0800 Comment on attachment 419433 Second try C:\cygwin\home\buildbot\worker\Windows-EWS\build\Source\WebCore\inspector/agents/InspectorDOMAgent.cpp(1761,99): error C2514: 'WTF::Optional': class template cannot be constructed (compiling source file C:\cygwin\home\buildbot\worker\Windows-EWS\build\WebKitBuild\Release\DerivedSources\WebCore\unified-sources\UnifiedSource-84c9f43f-5.cpp) [C:\cygwin\home\buildbot\worker\Windows-EWS\build\WebKitBuild\Release\Source\WebCore\WebCore.vcxproj] C:\cygwin\home\buildbot\worker\Windows-EWS\build\Source\WebCore\inspector/agents/InspectorDOMAgent.cpp(1761,99): error C2451: conditional expression of type 'WTF::Optional' is illegal (compiling source file C:\cygwin\home\buildbot\worker\Windows-EWS\build\WebKitBuild\Release\DerivedSources\WebCore\unified-sources\UnifiedSource-84c9f43f-5.cpp) [C:\cygwin\home\buildbot\worker\Windows-EWS\build\WebKitBuild\Release\Source\WebCore\WebCore.vcxproj] C:\cygwin\home\buildbot\worker\Windows-EWS\build\Source\WebCore\inspector/agents/InspectorDOMAgent.cpp(1762,36): error C2039: 'setLayoutContextType': is not a member of 'Inspector::Protocol::DOM::Node' (compiling source file C:\cygwin\home\buildbot\worker\Windows-EWS\build\WebKitBuild\Release\DerivedSources\WebCore\unified-sources\UnifiedSource-84c9f43f-5.cpp) [C:\cygwin\home\buildbot\worker\Windows-EWS\build\WebKitBuild\Release\Source\WebCore\WebCore.vcxproj] C:\cygwin\home\buildbot\worker\Windows-EWS\build\Source\WebCore\inspector/agents/InspectorDOMAgent.cpp(1762,54): error C2663: 'WTF::Optional<T>::value': 3 overloads have no legal conversion for 'this' pointer (compiling source file C:\cygwin\home\buildbot\worker\Windows-EWS\build\WebKitBuild\Release\DerivedSources\WebCore\unified-sources\UnifiedSource-84c9f43f-5.cpp) [C:\cygwin\home\buildbot\worker\Windows-EWS\build\WebKitBuild\Release\Source\WebCore\WebCore.vcxproj] Windows build failure does not appear to be related. 1726300 9 ews-feeder 2021-02-05 15:32:44 -0800 Committed r272448: <https://trac.webkit.org/changeset/272448> All reviewed patches have been landed. Closing bug and clearing flags on attachment 419433. 419321 2021-02-04 14:22:24 -0800 2021-02-05 10:51:11 -0800 First attempt at a patch 0001-Allow-Password-AutoFill-in-more-text-field-configura.patch text/plain 7475 rmondello RnJvbSBlZTBjYTg5MGJmNzEyNWQ1NWY1M2RkMGY0ZGM5NjYwNDUwNzRhMzNhIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBSaWNreSBNb25kZWxsbyA8cm1vbmRlbGxvQGFwcGxlLmNvbT4K RGF0ZTogVGh1LCA0IEZlYiAyMDIxIDE0OjIxOjQ0IC0wODAwClN1YmplY3Q6IFtQQVRDSF0gQWxs b3cgUGFzc3dvcmQgQXV0b0ZpbGwgaW4gbW9yZSB0ZXh0IGZpZWxkIGNvbmZpZ3VyYXRpb25zCgpo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIxNDI5CnJkYXI6Ly9wcm9i bGVtLzczODk5OTQ3CgpSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KCkV4dGVuZCB3aGVyZSB3 ZSdsbCBvZmZlciBQYXNzd29yZCBBdXRvRmlsbCBpbiB3ZWIgdmlld3MuIEFsbG93IGFsbCB0eXBl PXBhc3N3b3JkIGZpZWxkcy4gQWxsb3cgaW4gc2l0dWF0aW9ucwp3aXRoIGJhY2stdG8tYmFjayB0 eXBlPXBhc3N3b3JkIGZpZWxkcywgYnV0IG9ubHkgYXR0ZW1wdCB0byBmaWxsIHRoZSBzZWNvbmQg cGFzc3dvcmQgZmllbGQgd2hlbiBpdCdzIGVtcHR5LAp0byBmbGV4aWJseSBhY2NvbW9kYXRlIGFj Y291bnQgY3JlYXRpb24gYW5kIHBhc3N3b3JkIGNoYW5nZSBzY2VuYXJpb3MuCgpJIGRpZCBhIHJv dW5kIG9mIG1hbnVhbCB0ZXN0aW5nIHdpdGggdGhlIHJlbGF0ZWQgZXhpc3RpbmcgT1MgZmVhdHVy ZS4KCiogZWRpdGluZy9jb2NvYS9BdXRvZmlsbEVsZW1lbnRzLmNwcDoKKFdlYkNvcmU6OkF1dG9m aWxsRWxlbWVudHM6OkF1dG9maWxsRWxlbWVudHMpOiBBZGQgc2Vjb25kUGFzc3dvcmQgdG8gaW5p dGlhbGl6ZXIuCihXZWJDb3JlOjpBdXRvZmlsbEVsZW1lbnRzOjpjb21wdXRlQXV0b2ZpbGxFbGVt ZW50cyk6IENoYW5nZSB0aGUgYWxnb3JpdGhtIGFzIGRlc2NyaWJlZCBhYm92ZS4KKFdlYkNvcmU6 OkF1dG9maWxsRWxlbWVudHM6OmF1dG9maWxsKTogQWxzbyBmaWxsIHRoZSBzZWNvbmRQYXNzd29y ZCwgaWYgYXBwbGljYWJsZS4KKiBlZGl0aW5nL2NvY29hL0F1dG9maWxsRWxlbWVudHMuaDogQ2hh bmdlIGNvbnN0cnVjdG9yIGFuZCBhZGQgbWVtYmVyIHZhcmlhYmxlLgotLS0KIFNvdXJjZS9XZWJD b3JlL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAgICB8IDIxICsrKysrKysrKysrCiAuLi4v ZWRpdGluZy9jb2NvYS9BdXRvZmlsbEVsZW1lbnRzLmNwcCAgICAgICAgfCAzNiArKysrKysrKyst LS0tLS0tLS0tCiAuLi4vV2ViQ29yZS9lZGl0aW5nL2NvY29hL0F1dG9maWxsRWxlbWVudHMuaCAg fCAgMyArLQogMyBmaWxlcyBjaGFuZ2VkLCA0MCBpbnNlcnRpb25zKCspLCAyMCBkZWxldGlvbnMo LSkKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKaW5kZXggMGQ3MDgwODdjNGVkLi40YThiNzM2NmY4NjQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cK QEAgLTEsMyArMSwyNCBAQAorMjAyMS0wMi0wNCAgUmlja3kgTW9uZGVsbG8gIDxybW9uZGVsbG9A YXBwbGUuY29tPgorCisgICAgICAgIEFsbG93IFBhc3N3b3JkIEF1dG9GaWxsIGluIG1vcmUgdGV4 dCBmaWVsZCBjb25maWd1cmF0aW9ucworCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMjE0MjkKKyAgICAgICAgcmRhcjovL3Byb2JsZW0vNzM4OTk5NDcK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBFeHRlbmQg d2hlcmUgd2UnbGwgb2ZmZXIgUGFzc3dvcmQgQXV0b0ZpbGwgaW4gd2ViIHZpZXdzLiBBbGxvdyBh bGwgdHlwZT1wYXNzd29yZCBmaWVsZHMuIEFsbG93IGluIHNpdHVhdGlvbnMKKyAgICAgICAgd2l0 aCBiYWNrLXRvLWJhY2sgdHlwZT1wYXNzd29yZCBmaWVsZHMsIGJ1dCBvbmx5IGF0dGVtcHQgdG8g ZmlsbCB0aGUgc2Vjb25kIHBhc3N3b3JkIGZpZWxkIHdoZW4gaXQncyBlbXB0eSwKKyAgICAgICAg dG8gZmxleGlibHkgYWNjb21vZGF0ZSBhY2NvdW50IGNyZWF0aW9uIGFuZCBwYXNzd29yZCBjaGFu Z2Ugc2NlbmFyaW9zLgorCisgICAgICAgIEkgZGlkIGEgcm91bmQgb2YgbWFudWFsIHRlc3Rpbmcg d2l0aCB0aGUgcmVsYXRlZCBleGlzdGluZyBPUyBmZWF0dXJlLgorCisgICAgICAgICogZWRpdGlu Zy9jb2NvYS9BdXRvZmlsbEVsZW1lbnRzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkF1dG9maWxs RWxlbWVudHM6OkF1dG9maWxsRWxlbWVudHMpOiBBZGQgc2Vjb25kUGFzc3dvcmQgdG8gaW5pdGlh bGl6ZXIuCisgICAgICAgIChXZWJDb3JlOjpBdXRvZmlsbEVsZW1lbnRzOjpjb21wdXRlQXV0b2Zp bGxFbGVtZW50cyk6IENoYW5nZSB0aGUgYWxnb3JpdGhtIGFzIGRlc2NyaWJlZCBhYm92ZS4KKyAg ICAgICAgKFdlYkNvcmU6OkF1dG9maWxsRWxlbWVudHM6OmF1dG9maWxsKTogQWxzbyBmaWxsIHRo ZSBzZWNvbmRQYXNzd29yZCwgaWYgYXBwbGljYWJsZS4KKyAgICAgICAgKiBlZGl0aW5nL2NvY29h L0F1dG9maWxsRWxlbWVudHMuaDogQ2hhbmdlIGNvbnN0cnVjdG9yIGFuZCBhZGQgbWVtYmVyIHZh cmlhYmxlLgorCiAyMDIxLTAyLTAyICBLYXRlIENoZW5leSAgPGthdGhlcmluZV9jaGVuZXlAYXBw bGUuY29tPgogCiAgICAgICAgIFBDTTogSW5kaWNhdGUgaWYgbmV0d29yayBsb2FkIGRhdGEgaXMg dXNlciBpZGVudGlmaWFibGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvY29j b2EvQXV0b2ZpbGxFbGVtZW50cy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL2NvY29hL0F1 dG9maWxsRWxlbWVudHMuY3BwCmluZGV4IGNiMWQ3YWViNmY0NC4uNDJkZjcwYWEyMTc4IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL2NvY29hL0F1dG9maWxsRWxlbWVudHMuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvY29jb2EvQXV0b2ZpbGxFbGVtZW50cy5jcHAK QEAgLTcyLDkgKzcyLDEwIEBAIHN0YXRpYyBpbmxpbmUgUmVmUHRyPEhUTUxJbnB1dEVsZW1lbnQ+ IHByZXZpb3VzQXV0b2ZpbGxhYmxlRWxlbWVudChOb2RlKiBzdGFydE5vCiAgICAgcmV0dXJuICZk b3duY2FzdDxIVE1MSW5wdXRFbGVtZW50PigqcHJldmlvdXNFbGVtZW50KTsKIH0KIAotQXV0b2Zp bGxFbGVtZW50czo6QXV0b2ZpbGxFbGVtZW50cyhSZWZQdHI8SFRNTElucHV0RWxlbWVudD4mJiB1 c2VybmFtZSwgUmVmUHRyPEhUTUxJbnB1dEVsZW1lbnQ+JiYgcGFzc3dvcmQpCitBdXRvZmlsbEVs ZW1lbnRzOjpBdXRvZmlsbEVsZW1lbnRzKFJlZlB0cjxIVE1MSW5wdXRFbGVtZW50PiYmIHVzZXJu YW1lLCBSZWZQdHI8SFRNTElucHV0RWxlbWVudD4mJiBwYXNzd29yZCwgUmVmUHRyPEhUTUxJbnB1 dEVsZW1lbnQ+JiYgc2Vjb25kUGFzc3dvcmQpCiAgICAgOiBtX3VzZXJuYW1lKHVzZXJuYW1lKQog ICAgICwgbV9wYXNzd29yZChwYXNzd29yZCkKKyAgICAsIG1fc2Vjb25kUGFzc3dvcmQoc2Vjb25k UGFzc3dvcmQpCiB7CiB9CiAKQEAgLTg2LDM0ICs4NywyOSBAQCBPcHRpb25hbDxBdXRvZmlsbEVs ZW1lbnRzPiBBdXRvZmlsbEVsZW1lbnRzOjpjb21wdXRlQXV0b2ZpbGxFbGVtZW50cyhSZWY8SFRN TElucAogICAgIGlmIChzdGFydC0+aXNQYXNzd29yZEZpZWxkKCkpIHsKICAgICAgICAgUmVmUHRy PEhUTUxJbnB1dEVsZW1lbnQ+IHByZXZpb3VzRWxlbWVudCA9IHByZXZpb3VzQXV0b2ZpbGxhYmxl RWxlbWVudChzdGFydC5wdHIoKSwgZm9jdXNDb250cm9sbGVyKTsKICAgICAgICAgUmVmUHRyPEhU TUxJbnB1dEVsZW1lbnQ+IG5leHRFbGVtZW50ID0gbmV4dEF1dG9maWxsYWJsZUVsZW1lbnQoc3Rh cnQucHRyKCksIGZvY3VzQ29udHJvbGxlcik7Ci0gICAgICAgIGJvb2wgaGFzRHVwbGljYXRlUGFz c3dvcmRFbGVtZW50cyA9IChuZXh0RWxlbWVudCAmJiBuZXh0RWxlbWVudC0+aXNQYXNzd29yZEZp ZWxkKCkpIHx8IChwcmV2aW91c0VsZW1lbnQgJiYgcHJldmlvdXNFbGVtZW50LT5pc1Bhc3N3b3Jk RmllbGQoKSk7Ci0gICAgICAgIGlmIChoYXNEdXBsaWNhdGVQYXNzd29yZEVsZW1lbnRzKQotICAg ICAgICAgICAgcmV0dXJuIFdURjo6bnVsbG9wdDsKIAotICAgICAgICBpZiAocHJldmlvdXNFbGVt ZW50ICYmIGlzPEhUTUxJbnB1dEVsZW1lbnQ+KCpwcmV2aW91c0VsZW1lbnQpKSB7Ci0gICAgICAg ICAgICBpZiAocHJldmlvdXNFbGVtZW50LT5pc1RleHRGaWVsZCgpKQotICAgICAgICAgICAgICAg IHJldHVybiBBdXRvZmlsbEVsZW1lbnRzKFdURk1vdmUocHJldmlvdXNFbGVtZW50KSwgV1RGTW92 ZShzdGFydCkpOwotICAgICAgICB9CisgICAgICAgIGJvb2wgcHJldmlvdXNGaWVsZElzVGV4dEZp ZWxkID0gcHJldmlvdXNFbGVtZW50ICYmICFwcmV2aW91c0VsZW1lbnQtPmlzUGFzc3dvcmRGaWVs ZCgpOworICAgICAgICBib29sIGhhc1NlY29uZFBhc3N3b3JkRmllbGRUb0ZpbGwgPSBuZXh0RWxl bWVudCAmJiBuZXh0RWxlbWVudC0+aXNQYXNzd29yZEZpZWxkKCkgJiYgbmV4dEVsZW1lbnQtPnZh bHVlKCkuaXNFbXB0eSgpOworCisgICAgICAgIC8vIEFsd2F5cyBhbGxvdyBBdXRvRmlsbCBpbiBh IHBhc3N3b3JkIGZpZWxkLCBldmVuIGlmIHdlIGZpbGwgaW5mb3JtYXRpb24gb25seSBpbnRvIGl0 LgorICAgICAgICByZXR1cm4gQXV0b2ZpbGxFbGVtZW50cygKKyAgICAgICAgICAgIHByZXZpb3Vz RmllbGRJc1RleHRGaWVsZCA/IFdURk1vdmUocHJldmlvdXNFbGVtZW50KSA6IG51bGxwdHIsCisg ICAgICAgICAgICBXVEZNb3ZlKHN0YXJ0KSwKKyAgICAgICAgICAgIGhhc1NlY29uZFBhc3N3b3Jk RmllbGRUb0ZpbGwgPyBXVEZNb3ZlKG5leHRFbGVtZW50KSA6IG51bGxwdHIKKyAgICAgICAgKTsK ICAgICB9IGVsc2UgewogICAgICAgICBSZWZQdHI8SFRNTElucHV0RWxlbWVudD4gbmV4dEVsZW1l bnQgPSBuZXh0QXV0b2ZpbGxhYmxlRWxlbWVudChzdGFydC5wdHIoKSwgZm9jdXNDb250cm9sbGVy KTsKICAgICAgICAgaWYgKG5leHRFbGVtZW50ICYmIGlzPEhUTUxJbnB1dEVsZW1lbnQ+KCpuZXh0 RWxlbWVudCkpIHsKICAgICAgICAgICAgIGlmIChuZXh0RWxlbWVudC0+aXNQYXNzd29yZEZpZWxk KCkpIHsKLSAgICAgICAgICAgICAgICBSZWZQdHI8SFRNTElucHV0RWxlbWVudD4gZWxlbWVudEFm dGVybmV4dEVsZW1lbnQgPSBuZXh0QXV0b2ZpbGxhYmxlRWxlbWVudChuZXh0RWxlbWVudC5nZXQo KSwgZm9jdXNDb250cm9sbGVyKTsKLSAgICAgICAgICAgICAgICBib29sIGhhc0R1cGxpY2F0ZVBh c3N3b3JkRWxlbWVudHMgPSBlbGVtZW50QWZ0ZXJuZXh0RWxlbWVudCAmJiBlbGVtZW50QWZ0ZXJu ZXh0RWxlbWVudC0+aXNQYXNzd29yZEZpZWxkKCk7Ci0gICAgICAgICAgICAgICAgaWYgKGhhc0R1 cGxpY2F0ZVBhc3N3b3JkRWxlbWVudHMpCi0gICAgICAgICAgICAgICAgICAgIHJldHVybiBXVEY6 Om51bGxvcHQ7CisgICAgICAgICAgICAgICAgUmVmUHRyPEhUTUxJbnB1dEVsZW1lbnQ+IGVsZW1l bnRBZnRlck5leHRFbGVtZW50ID0gbmV4dEF1dG9maWxsYWJsZUVsZW1lbnQobmV4dEVsZW1lbnQu Z2V0KCksIGZvY3VzQ29udHJvbGxlcik7CisgICAgICAgICAgICAgICAgYm9vbCBoYXNTZWNvbmRQ YXNzd29yZEZpZWxkVG9GaWxsID0gZWxlbWVudEFmdGVyTmV4dEVsZW1lbnQgJiYgZWxlbWVudEFm dGVyTmV4dEVsZW1lbnQtPmlzUGFzc3dvcmRGaWVsZCgpICYmIGVsZW1lbnRBZnRlck5leHRFbGVt ZW50LT52YWx1ZSgpLmlzRW1wdHkoKTsKIAotICAgICAgICAgICAgICAgIHJldHVybiBBdXRvZmls bEVsZW1lbnRzKFdURk1vdmUoc3RhcnQpLCBXVEZNb3ZlKG5leHRFbGVtZW50KSk7CisgICAgICAg ICAgICAgICAgcmV0dXJuIEF1dG9maWxsRWxlbWVudHMoV1RGTW92ZShzdGFydCksIFdURk1vdmUo bmV4dEVsZW1lbnQpLAorICAgICAgICAgICAgICAgICAgICBoYXNTZWNvbmRQYXNzd29yZEZpZWxk VG9GaWxsID8gV1RGTW92ZShlbGVtZW50QWZ0ZXJOZXh0RWxlbWVudCkgOiBudWxscHRyKTsKICAg ICAgICAgICAgIH0KICAgICAgICAgfQogICAgIH0KIAotICAgIGlmIChzdGFydC0+aXNQYXNzd29y ZEZpZWxkKCkpIHsKLSAgICAgICAgUmVmUHRyPEhUTUxJbnB1dEVsZW1lbnQ+IHByZXZpb3VzRWxl bWVudCA9IHByZXZpb3VzQXV0b2ZpbGxhYmxlRWxlbWVudChzdGFydC5wdHIoKSwgZm9jdXNDb250 cm9sbGVyKTsKLSAgICAgICAgUmVmUHRyPEhUTUxJbnB1dEVsZW1lbnQ+IG5leHRFbGVtZW50ID0g bmV4dEF1dG9maWxsYWJsZUVsZW1lbnQoc3RhcnQucHRyKCksIGZvY3VzQ29udHJvbGxlcik7Ci0g ICAgICAgIGlmICghcHJldmlvdXNFbGVtZW50ICYmICFuZXh0RWxlbWVudCkKLSAgICAgICAgICAg IHJldHVybiBBdXRvZmlsbEVsZW1lbnRzKG51bGxwdHIsIHN0YXJ0LnB0cigpKTsKLSAgICB9CiAg ICAgcmV0dXJuIFdURjo6bnVsbG9wdDsKIH0KIApAQCAtMTIzLDYgKzExOSw4IEBAIHZvaWQgQXV0 b2ZpbGxFbGVtZW50czo6YXV0b2ZpbGwoU3RyaW5nIHVzZXJuYW1lLCBTdHJpbmcgcGFzc3dvcmQp CiAgICAgICAgIG1fdXNlcm5hbWUtPnNldFZhbHVlRm9yVXNlcih1c2VybmFtZSk7CiAgICAgaWYg KG1fcGFzc3dvcmQpCiAgICAgICAgIG1fcGFzc3dvcmQtPnNldFZhbHVlRm9yVXNlcihwYXNzd29y ZCk7CisgICAgaWYgKG1fc2Vjb25kUGFzc3dvcmQpCisgICAgICAgIG1fc2Vjb25kUGFzc3dvcmQt PnNldFZhbHVlRm9yVXNlcihwYXNzd29yZCk7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvY29jb2EvQXV0b2ZpbGxFbGVtZW50 cy5oIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9jb2NvYS9BdXRvZmlsbEVsZW1lbnRzLmgKaW5k ZXggYmUwOThmYTFjMGQ5Li43NzZmMTY2NzE5YTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2VkaXRpbmcvY29jb2EvQXV0b2ZpbGxFbGVtZW50cy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Vk aXRpbmcvY29jb2EvQXV0b2ZpbGxFbGVtZW50cy5oCkBAIC0zNyw5ICszNywxMCBAQCBwdWJsaWM6 CiAKICAgICBjb25zdCBIVE1MSW5wdXRFbGVtZW50KiB1c2VybmFtZSgpIGNvbnN0IHsgcmV0dXJu IG1fdXNlcm5hbWUuZ2V0KCk7IH0KIHByaXZhdGU6Ci0gICAgQXV0b2ZpbGxFbGVtZW50cyhSZWZQ dHI8SFRNTElucHV0RWxlbWVudD4mJiwgUmVmUHRyPEhUTUxJbnB1dEVsZW1lbnQ+JiYpOworICAg IEF1dG9maWxsRWxlbWVudHMoUmVmUHRyPEhUTUxJbnB1dEVsZW1lbnQ+JiYsIFJlZlB0cjxIVE1M SW5wdXRFbGVtZW50PiYmLCBSZWZQdHI8SFRNTElucHV0RWxlbWVudD4mJik7CiAgICAgUmVmUHRy PEhUTUxJbnB1dEVsZW1lbnQ+IG1fdXNlcm5hbWU7CiAgICAgUmVmUHRyPEhUTUxJbnB1dEVsZW1l bnQ+IG1fcGFzc3dvcmQ7CisgICAgUmVmUHRyPEhUTUxJbnB1dEVsZW1lbnQ+IG1fc2Vjb25kUGFz c3dvcmQ7CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCi0tIAoyLjI5LjIgKEFwcGxlIEdp dC0xMjkpCgo= 419433 2021-02-05 10:50:15 -0800 2021-02-05 15:32:45 -0800 Second try 0001-Allow-Password-AutoFill-in-more-text-field-configura.patch text/plain 9066 rmondello RnJvbSBmN2IwMDlhNWUzZDY2OGYxYWVhYmQyOGY5NTdkZjc4MGQ1ZDFmYjE3IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBSaWNreSBNb25kZWxsbyA8cm1vbmRlbGxvQGFwcGxlLmNvbT4K RGF0ZTogVGh1LCA0IEZlYiAyMDIxIDE0OjIxOjQ0IC0wODAwClN1YmplY3Q6IFtQQVRDSF0gQWxs b3cgUGFzc3dvcmQgQXV0b0ZpbGwgaW4gbW9yZSB0ZXh0IGZpZWxkIGNvbmZpZ3VyYXRpb25zCgpo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIxNDI5CnJkYXI6Ly9wcm9i bGVtLzczODk5OTQ3CgpSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KCkV4dGVuZCB3aGVyZSB3 ZSdsbCBvZmZlciBQYXNzd29yZCBBdXRvRmlsbCBpbiB3ZWIgdmlld3MuIEFsbG93IGFsbCB0eXBl PXBhc3N3b3JkIGZpZWxkcy4gQWxsb3cgaW4gc2l0dWF0aW9ucwp3aXRoIGJhY2stdG8tYmFjayB0 eXBlPXBhc3N3b3JkIGZpZWxkcywgYnV0IG9ubHkgYXR0ZW1wdCB0byBmaWxsIHRoZSBzZWNvbmQg cGFzc3dvcmQgZmllbGQgd2hlbiBpdCdzIGVtcHR5LAp0byBmbGV4aWJseSBhY2NvbW9kYXRlIGFj Y291bnQgY3JlYXRpb24gYW5kIHBhc3N3b3JkIGNoYW5nZSBzY2VuYXJpb3MuCgpJIGRpZCBhIHJv dW5kIG9mIG1hbnVhbCB0ZXN0aW5nIHdpdGggdGhlIHJlbGF0ZWQgZXhpc3RpbmcgT1MgZmVhdHVy ZS4KCiogZWRpdGluZy9jb2NvYS9BdXRvZmlsbEVsZW1lbnRzLmNwcDoKKFdlYkNvcmU6OkF1dG9m aWxsRWxlbWVudHM6OkF1dG9maWxsRWxlbWVudHMpOiBBZGQgc2Vjb25kUGFzc3dvcmQgdG8gaW5p dGlhbGl6ZXIuCihXZWJDb3JlOjpBdXRvZmlsbEVsZW1lbnRzOjpjb21wdXRlQXV0b2ZpbGxFbGVt ZW50cyk6IENoYW5nZSB0aGUgYWxnb3JpdGhtIGFzIGRlc2NyaWJlZCBhYm92ZS4KKFdlYkNvcmU6 OkF1dG9maWxsRWxlbWVudHM6OmF1dG9maWxsKTogQWxzbyBmaWxsIHRoZSBzZWNvbmRQYXNzd29y ZCwgaWYgYXBwbGljYWJsZS4KKiBlZGl0aW5nL2NvY29hL0F1dG9maWxsRWxlbWVudHMuaDogQ2hh bmdlIGNvbnN0cnVjdG9yIGFuZCBhZGQgbWVtYmVyIHZhcmlhYmxlLgoqIFRvb2xzL1Rlc3RXZWJL aXRBUEkvVGVzdHMvaW9zL1dLV2ViVmlld0F1dG9maWxsVGVzdHMubW06IFJlYmFzZWxpbmUgYSB0 ZXN0LgotLS0KIFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAgICB8 IDIxICsrKysrKysrKysrCiAuLi4vZWRpdGluZy9jb2NvYS9BdXRvZmlsbEVsZW1lbnRzLmNwcCAg ICAgICAgfCAzNSArKysrKysrKy0tLS0tLS0tLS0tCiAuLi4vV2ViQ29yZS9lZGl0aW5nL2NvY29h L0F1dG9maWxsRWxlbWVudHMuaCAgfCAgMyArLQogLi4uL1Rlc3RzL2lvcy9XS1dlYlZpZXdBdXRv ZmlsbFRlc3RzLm1tICAgICAgIHwgIDYgKystLQogNCBmaWxlcyBjaGFuZ2VkLCA0MCBpbnNlcnRp b25zKCspLCAyNSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFu Z2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGQ3MDgwODdjNGVkLi40YThi NzM2NmY4NjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNCBAQAorMjAyMS0wMi0wNCAgUmlja3kg TW9uZGVsbG8gIDxybW9uZGVsbG9AYXBwbGUuY29tPgorCisgICAgICAgIEFsbG93IFBhc3N3b3Jk IEF1dG9GaWxsIGluIG1vcmUgdGV4dCBmaWVsZCBjb25maWd1cmF0aW9ucworCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjE0MjkKKyAgICAgICAgcmRh cjovL3Byb2JsZW0vNzM4OTk5NDcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBFeHRlbmQgd2hlcmUgd2UnbGwgb2ZmZXIgUGFzc3dvcmQgQXV0b0ZpbGwg aW4gd2ViIHZpZXdzLiBBbGxvdyBhbGwgdHlwZT1wYXNzd29yZCBmaWVsZHMuIEFsbG93IGluIHNp dHVhdGlvbnMKKyAgICAgICAgd2l0aCBiYWNrLXRvLWJhY2sgdHlwZT1wYXNzd29yZCBmaWVsZHMs IGJ1dCBvbmx5IGF0dGVtcHQgdG8gZmlsbCB0aGUgc2Vjb25kIHBhc3N3b3JkIGZpZWxkIHdoZW4g aXQncyBlbXB0eSwKKyAgICAgICAgdG8gZmxleGlibHkgYWNjb21vZGF0ZSBhY2NvdW50IGNyZWF0 aW9uIGFuZCBwYXNzd29yZCBjaGFuZ2Ugc2NlbmFyaW9zLgorCisgICAgICAgIEkgZGlkIGEgcm91 bmQgb2YgbWFudWFsIHRlc3Rpbmcgd2l0aCB0aGUgcmVsYXRlZCBleGlzdGluZyBPUyBmZWF0dXJl LgorCisgICAgICAgICogZWRpdGluZy9jb2NvYS9BdXRvZmlsbEVsZW1lbnRzLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkF1dG9maWxsRWxlbWVudHM6OkF1dG9maWxsRWxlbWVudHMpOiBBZGQgc2Vj b25kUGFzc3dvcmQgdG8gaW5pdGlhbGl6ZXIuCisgICAgICAgIChXZWJDb3JlOjpBdXRvZmlsbEVs ZW1lbnRzOjpjb21wdXRlQXV0b2ZpbGxFbGVtZW50cyk6IENoYW5nZSB0aGUgYWxnb3JpdGhtIGFz IGRlc2NyaWJlZCBhYm92ZS4KKyAgICAgICAgKFdlYkNvcmU6OkF1dG9maWxsRWxlbWVudHM6OmF1 dG9maWxsKTogQWxzbyBmaWxsIHRoZSBzZWNvbmRQYXNzd29yZCwgaWYgYXBwbGljYWJsZS4KKyAg ICAgICAgKiBlZGl0aW5nL2NvY29hL0F1dG9maWxsRWxlbWVudHMuaDogQ2hhbmdlIGNvbnN0cnVj dG9yIGFuZCBhZGQgbWVtYmVyIHZhcmlhYmxlLgorCiAyMDIxLTAyLTAyICBLYXRlIENoZW5leSAg PGthdGhlcmluZV9jaGVuZXlAYXBwbGUuY29tPgogCiAgICAgICAgIFBDTTogSW5kaWNhdGUgaWYg bmV0d29yayBsb2FkIGRhdGEgaXMgdXNlciBpZGVudGlmaWFibGUKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2VkaXRpbmcvY29jb2EvQXV0b2ZpbGxFbGVtZW50cy5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9lZGl0aW5nL2NvY29hL0F1dG9maWxsRWxlbWVudHMuY3BwCmluZGV4IGNiMWQ3YWViNmY0 NC4uMThmMzNiNjliOGQyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL2NvY29h L0F1dG9maWxsRWxlbWVudHMuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvY29jb2Ev QXV0b2ZpbGxFbGVtZW50cy5jcHAKQEAgLTcyLDkgKzcyLDEwIEBAIHN0YXRpYyBpbmxpbmUgUmVm UHRyPEhUTUxJbnB1dEVsZW1lbnQ+IHByZXZpb3VzQXV0b2ZpbGxhYmxlRWxlbWVudChOb2RlKiBz dGFydE5vCiAgICAgcmV0dXJuICZkb3duY2FzdDxIVE1MSW5wdXRFbGVtZW50PigqcHJldmlvdXNF bGVtZW50KTsKIH0KIAotQXV0b2ZpbGxFbGVtZW50czo6QXV0b2ZpbGxFbGVtZW50cyhSZWZQdHI8 SFRNTElucHV0RWxlbWVudD4mJiB1c2VybmFtZSwgUmVmUHRyPEhUTUxJbnB1dEVsZW1lbnQ+JiYg cGFzc3dvcmQpCitBdXRvZmlsbEVsZW1lbnRzOjpBdXRvZmlsbEVsZW1lbnRzKFJlZlB0cjxIVE1M SW5wdXRFbGVtZW50PiYmIHVzZXJuYW1lLCBSZWZQdHI8SFRNTElucHV0RWxlbWVudD4mJiBwYXNz d29yZCwgUmVmUHRyPEhUTUxJbnB1dEVsZW1lbnQ+JiYgc2Vjb25kUGFzc3dvcmQpCiAgICAgOiBt X3VzZXJuYW1lKHVzZXJuYW1lKQogICAgICwgbV9wYXNzd29yZChwYXNzd29yZCkKKyAgICAsIG1f c2Vjb25kUGFzc3dvcmQoc2Vjb25kUGFzc3dvcmQpCiB7CiB9CiAKQEAgLTg0LDM2ICs4NSwyNiBA QCBPcHRpb25hbDxBdXRvZmlsbEVsZW1lbnRzPiBBdXRvZmlsbEVsZW1lbnRzOjpjb21wdXRlQXV0 b2ZpbGxFbGVtZW50cyhSZWY8SFRNTElucAogICAgICAgICByZXR1cm4gV1RGOjpudWxsb3B0Owog ICAgIEZvY3VzQ29udHJvbGxlciYgZm9jdXNDb250cm9sbGVyID0gc3RhcnQtPmRvY3VtZW50KCku cGFnZSgpLT5mb2N1c0NvbnRyb2xsZXIoKTsKICAgICBpZiAoc3RhcnQtPmlzUGFzc3dvcmRGaWVs ZCgpKSB7Ci0gICAgICAgIFJlZlB0cjxIVE1MSW5wdXRFbGVtZW50PiBwcmV2aW91c0VsZW1lbnQg PSBwcmV2aW91c0F1dG9maWxsYWJsZUVsZW1lbnQoc3RhcnQucHRyKCksIGZvY3VzQ29udHJvbGxl cik7Ci0gICAgICAgIFJlZlB0cjxIVE1MSW5wdXRFbGVtZW50PiBuZXh0RWxlbWVudCA9IG5leHRB dXRvZmlsbGFibGVFbGVtZW50KHN0YXJ0LnB0cigpLCBmb2N1c0NvbnRyb2xsZXIpOwotICAgICAg ICBib29sIGhhc0R1cGxpY2F0ZVBhc3N3b3JkRWxlbWVudHMgPSAobmV4dEVsZW1lbnQgJiYgbmV4 dEVsZW1lbnQtPmlzUGFzc3dvcmRGaWVsZCgpKSB8fCAocHJldmlvdXNFbGVtZW50ICYmIHByZXZp b3VzRWxlbWVudC0+aXNQYXNzd29yZEZpZWxkKCkpOwotICAgICAgICBpZiAoaGFzRHVwbGljYXRl UGFzc3dvcmRFbGVtZW50cykKLSAgICAgICAgICAgIHJldHVybiBXVEY6Om51bGxvcHQ7CisgICAg ICAgIGF1dG8gcHJldmlvdXNFbGVtZW50ID0gcHJldmlvdXNBdXRvZmlsbGFibGVFbGVtZW50KHN0 YXJ0LnB0cigpLCBmb2N1c0NvbnRyb2xsZXIpOworICAgICAgICBhdXRvIG5leHRFbGVtZW50ID0g bmV4dEF1dG9maWxsYWJsZUVsZW1lbnQoc3RhcnQucHRyKCksIGZvY3VzQ29udHJvbGxlcik7CiAK LSAgICAgICAgaWYgKHByZXZpb3VzRWxlbWVudCAmJiBpczxIVE1MSW5wdXRFbGVtZW50PigqcHJl dmlvdXNFbGVtZW50KSkgewotICAgICAgICAgICAgaWYgKHByZXZpb3VzRWxlbWVudC0+aXNUZXh0 RmllbGQoKSkKLSAgICAgICAgICAgICAgICByZXR1cm4gQXV0b2ZpbGxFbGVtZW50cyhXVEZNb3Zl KHByZXZpb3VzRWxlbWVudCksIFdURk1vdmUoc3RhcnQpKTsKLSAgICAgICAgfQorICAgICAgICBi b29sIHByZXZpb3VzRmllbGRJc1RleHRGaWVsZCA9IHByZXZpb3VzRWxlbWVudCAmJiAhcHJldmlv dXNFbGVtZW50LT5pc1Bhc3N3b3JkRmllbGQoKTsKKyAgICAgICAgYm9vbCBoYXNTZWNvbmRQYXNz d29yZEZpZWxkVG9GaWxsID0gbmV4dEVsZW1lbnQgJiYgbmV4dEVsZW1lbnQtPmlzUGFzc3dvcmRG aWVsZCgpICYmIG5leHRFbGVtZW50LT52YWx1ZSgpLmlzRW1wdHkoKTsKKworICAgICAgICAvLyBB bHdheXMgYWxsb3cgQXV0b0ZpbGwgaW4gYSBwYXNzd29yZCBmaWVsZCwgZXZlbiBpZiB3ZSBmaWxs IGluZm9ybWF0aW9uIG9ubHkgaW50byBpdC4KKyAgICAgICAgcmV0dXJuIHt7IHByZXZpb3VzRmll bGRJc1RleHRGaWVsZCA/IFdURk1vdmUocHJldmlvdXNFbGVtZW50KSA6IG51bGxwdHIsIFdURk1v dmUoc3RhcnQpLCBoYXNTZWNvbmRQYXNzd29yZEZpZWxkVG9GaWxsID8gV1RGTW92ZShuZXh0RWxl bWVudCkgOiBudWxscHRyIH19OwogICAgIH0gZWxzZSB7CiAgICAgICAgIFJlZlB0cjxIVE1MSW5w dXRFbGVtZW50PiBuZXh0RWxlbWVudCA9IG5leHRBdXRvZmlsbGFibGVFbGVtZW50KHN0YXJ0LnB0 cigpLCBmb2N1c0NvbnRyb2xsZXIpOwogICAgICAgICBpZiAobmV4dEVsZW1lbnQgJiYgaXM8SFRN TElucHV0RWxlbWVudD4oKm5leHRFbGVtZW50KSkgewogICAgICAgICAgICAgaWYgKG5leHRFbGVt ZW50LT5pc1Bhc3N3b3JkRmllbGQoKSkgewotICAgICAgICAgICAgICAgIFJlZlB0cjxIVE1MSW5w dXRFbGVtZW50PiBlbGVtZW50QWZ0ZXJuZXh0RWxlbWVudCA9IG5leHRBdXRvZmlsbGFibGVFbGVt ZW50KG5leHRFbGVtZW50LmdldCgpLCBmb2N1c0NvbnRyb2xsZXIpOwotICAgICAgICAgICAgICAg IGJvb2wgaGFzRHVwbGljYXRlUGFzc3dvcmRFbGVtZW50cyA9IGVsZW1lbnRBZnRlcm5leHRFbGVt ZW50ICYmIGVsZW1lbnRBZnRlcm5leHRFbGVtZW50LT5pc1Bhc3N3b3JkRmllbGQoKTsKLSAgICAg ICAgICAgICAgICBpZiAoaGFzRHVwbGljYXRlUGFzc3dvcmRFbGVtZW50cykKLSAgICAgICAgICAg ICAgICAgICAgcmV0dXJuIFdURjo6bnVsbG9wdDsKKyAgICAgICAgICAgICAgICBhdXRvIGVsZW1l bnRBZnRlck5leHRFbGVtZW50ID0gbmV4dEF1dG9maWxsYWJsZUVsZW1lbnQobmV4dEVsZW1lbnQu Z2V0KCksIGZvY3VzQ29udHJvbGxlcik7CisgICAgICAgICAgICAgICAgYm9vbCBoYXNTZWNvbmRQ YXNzd29yZEZpZWxkVG9GaWxsID0gZWxlbWVudEFmdGVyTmV4dEVsZW1lbnQgJiYgZWxlbWVudEFm dGVyTmV4dEVsZW1lbnQtPmlzUGFzc3dvcmRGaWVsZCgpICYmIGVsZW1lbnRBZnRlck5leHRFbGVt ZW50LT52YWx1ZSgpLmlzRW1wdHkoKTsKIAotICAgICAgICAgICAgICAgIHJldHVybiBBdXRvZmls bEVsZW1lbnRzKFdURk1vdmUoc3RhcnQpLCBXVEZNb3ZlKG5leHRFbGVtZW50KSk7CisgICAgICAg ICAgICAgICAgcmV0dXJuIHt7IFdURk1vdmUoc3RhcnQpLCBXVEZNb3ZlKG5leHRFbGVtZW50KSwg aGFzU2Vjb25kUGFzc3dvcmRGaWVsZFRvRmlsbCA/IFdURk1vdmUoZWxlbWVudEFmdGVyTmV4dEVs ZW1lbnQpIDogbnVsbHB0ciB9fTsKICAgICAgICAgICAgIH0KICAgICAgICAgfQogICAgIH0KIAot ICAgIGlmIChzdGFydC0+aXNQYXNzd29yZEZpZWxkKCkpIHsKLSAgICAgICAgUmVmUHRyPEhUTUxJ bnB1dEVsZW1lbnQ+IHByZXZpb3VzRWxlbWVudCA9IHByZXZpb3VzQXV0b2ZpbGxhYmxlRWxlbWVu dChzdGFydC5wdHIoKSwgZm9jdXNDb250cm9sbGVyKTsKLSAgICAgICAgUmVmUHRyPEhUTUxJbnB1 dEVsZW1lbnQ+IG5leHRFbGVtZW50ID0gbmV4dEF1dG9maWxsYWJsZUVsZW1lbnQoc3RhcnQucHRy KCksIGZvY3VzQ29udHJvbGxlcik7Ci0gICAgICAgIGlmICghcHJldmlvdXNFbGVtZW50ICYmICFu ZXh0RWxlbWVudCkKLSAgICAgICAgICAgIHJldHVybiBBdXRvZmlsbEVsZW1lbnRzKG51bGxwdHIs IHN0YXJ0LnB0cigpKTsKLSAgICB9CiAgICAgcmV0dXJuIFdURjo6bnVsbG9wdDsKIH0KIApAQCAt MTIzLDYgKzExNCw4IEBAIHZvaWQgQXV0b2ZpbGxFbGVtZW50czo6YXV0b2ZpbGwoU3RyaW5nIHVz ZXJuYW1lLCBTdHJpbmcgcGFzc3dvcmQpCiAgICAgICAgIG1fdXNlcm5hbWUtPnNldFZhbHVlRm9y VXNlcih1c2VybmFtZSk7CiAgICAgaWYgKG1fcGFzc3dvcmQpCiAgICAgICAgIG1fcGFzc3dvcmQt PnNldFZhbHVlRm9yVXNlcihwYXNzd29yZCk7CisgICAgaWYgKG1fc2Vjb25kUGFzc3dvcmQpCisg ICAgICAgIG1fc2Vjb25kUGFzc3dvcmQtPnNldFZhbHVlRm9yVXNlcihwYXNzd29yZCk7CiB9CiAK IH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2VkaXRp bmcvY29jb2EvQXV0b2ZpbGxFbGVtZW50cy5oIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9jb2Nv YS9BdXRvZmlsbEVsZW1lbnRzLmgKaW5kZXggYmUwOThmYTFjMGQ5Li43NzZmMTY2NzE5YTcgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvY29jb2EvQXV0b2ZpbGxFbGVtZW50cy5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvY29jb2EvQXV0b2ZpbGxFbGVtZW50cy5oCkBA IC0zNyw5ICszNywxMCBAQCBwdWJsaWM6CiAKICAgICBjb25zdCBIVE1MSW5wdXRFbGVtZW50KiB1 c2VybmFtZSgpIGNvbnN0IHsgcmV0dXJuIG1fdXNlcm5hbWUuZ2V0KCk7IH0KIHByaXZhdGU6Ci0g ICAgQXV0b2ZpbGxFbGVtZW50cyhSZWZQdHI8SFRNTElucHV0RWxlbWVudD4mJiwgUmVmUHRyPEhU TUxJbnB1dEVsZW1lbnQ+JiYpOworICAgIEF1dG9maWxsRWxlbWVudHMoUmVmUHRyPEhUTUxJbnB1 dEVsZW1lbnQ+JiYsIFJlZlB0cjxIVE1MSW5wdXRFbGVtZW50PiYmLCBSZWZQdHI8SFRNTElucHV0 RWxlbWVudD4mJik7CiAgICAgUmVmUHRyPEhUTUxJbnB1dEVsZW1lbnQ+IG1fdXNlcm5hbWU7CiAg ICAgUmVmUHRyPEhUTUxJbnB1dEVsZW1lbnQ+IG1fcGFzc3dvcmQ7CisgICAgUmVmUHRyPEhUTUxJ bnB1dEVsZW1lbnQ+IG1fc2Vjb25kUGFzc3dvcmQ7CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJD b3JlCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL2lvcy9XS1dlYlZpZXdB dXRvZmlsbFRlc3RzLm1tIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9pb3MvV0tXZWJWaWV3 QXV0b2ZpbGxUZXN0cy5tbQppbmRleCBkOWE5Mjc0OWFlZGYuLjc1MjAxYjZkMmNlNCAxMDA2NDQK LS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9pb3MvV0tXZWJWaWV3QXV0b2ZpbGxUZXN0 cy5tbQorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL2lvcy9XS1dlYlZpZXdBdXRvZmls bFRlc3RzLm1tCkBAIC0xNTksMTMgKzE1OSwxMyBAQCBURVNUKFdLV2ViVmlld0F1dG9GaWxsVGVz dHMsIEFjY291bnRDcmVhdGlvblBhZ2UpCiAgICAgYXV0byB3ZWJWaWV3ID0gYWRvcHROUyhbW0F1 dG9GaWxsVGVzdFZpZXcgYWxsb2NdIGluaXRXaXRoRnJhbWU6Q0dSZWN0TWFrZSgwLCAwLCAzMjAs IDUwMCldKTsKICAgICBbd2ViVmlldyBzeW5jaHJvbm91c2x5TG9hZEhUTUxTdHJpbmc6QCI8aW5w dXQgaWQ9J3VzZXInIHR5cGU9J2VtYWlsJz48aW5wdXQgaWQ9J3Bhc3N3b3JkJyB0eXBlPSdwYXNz d29yZCc+PGlucHV0IGlkPSdjb25maXJtX3Bhc3N3b3JkJyB0eXBlPSdwYXNzd29yZCc+Il07CiAg ICAgW3dlYlZpZXcgZXZhbHVhdGVKYXZhU2NyaXB0QW5kV2FpdEZvcklucHV0U2Vzc2lvblRvQ2hh bmdlOkAidXNlci5mb2N1cygpIl07Ci0gICAgRVhQRUNUX0ZBTFNFKFt3ZWJWaWV3IHRleHRJbnB1 dEhhc0F1dG9GaWxsQ29udGV4dF0pOworICAgIEVYUEVDVF9UUlVFKFt3ZWJWaWV3IHRleHRJbnB1 dEhhc0F1dG9GaWxsQ29udGV4dF0pOwogCiAgICAgW3dlYlZpZXcgZXZhbHVhdGVKYXZhU2NyaXB0 QW5kV2FpdEZvcklucHV0U2Vzc2lvblRvQ2hhbmdlOkAicGFzc3dvcmQuZm9jdXMoKSJdOwotICAg IEVYUEVDVF9GQUxTRShbd2ViVmlldyB0ZXh0SW5wdXRIYXNBdXRvRmlsbENvbnRleHRdKTsKKyAg ICBFWFBFQ1RfVFJVRShbd2ViVmlldyB0ZXh0SW5wdXRIYXNBdXRvRmlsbENvbnRleHRdKTsKIAog ICAgIFt3ZWJWaWV3IGV2YWx1YXRlSmF2YVNjcmlwdEFuZFdhaXRGb3JJbnB1dFNlc3Npb25Ub0No YW5nZTpAImNvbmZpcm1fcGFzc3dvcmQuZm9jdXMoKSJdOwotICAgIEVYUEVDVF9GQUxTRShbd2Vi VmlldyB0ZXh0SW5wdXRIYXNBdXRvRmlsbENvbnRleHRdKTsKKyAgICBFWFBFQ1RfVFJVRShbd2Vi VmlldyB0ZXh0SW5wdXRIYXNBdXRvRmlsbENvbnRleHRdKTsKIH0KIAogc3RhdGljIEJPT0wgb3Zl cnJpZGVJc0luSGFyZHdhcmVLZXlib2FyZE1vZGUoKQotLSAKMi4yOS4yIChBcHBsZSBHaXQtMTI5 KQoK