160179 2016-07-25 17:11:14 -0700 AX: Expose autoFillButtonType to accessibility 2016-07-25 22:28:43 -0700 1 1 1 Unclassified WebKit Accessibility WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 n_wang webkit-unassigned aboxhall apinheiro cfleizach commit-queue dmazzoni jcraig jdiggs mario n_wang samuel_white webkit-bug-importer oldest_to_newest 1214407 0 n_wang 2016-07-25 17:11:14 -0700 We currently only have function to check if value auto-fill is available. We also need to expose the auto-fill button type so that screen reader can speak the correct hint. <rdar://problem/27279453> 1214408 1 284552 n_wang 2016-07-25 17:14:05 -0700 Created attachment 284552 Patch 1214421 2 284552 cfleizach 2016-07-25 17:47:01 -0700 Comment on attachment 284552 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=284552&action=review > Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm:3247 > + return @"autofillNone"; since the type is already "AXValueAutofillType" the values can probably just be "none", "credentials", "contacts" 1214425 3 284556 n_wang 2016-07-25 17:59:58 -0700 Created attachment 284556 Patch Review comments 1214456 4 284556 commit-queue 2016-07-25 22:28:39 -0700 Comment on attachment 284556 Patch Clearing flags on attachment: 284556 Committed r203711: <http://trac.webkit.org/changeset/203711> 1214457 5 commit-queue 2016-07-25 22:28:43 -0700 All reviewed patches have been landed. Closing bug. 284552 2016-07-25 17:14:05 -0700 2016-07-25 17:59:58 -0700 Patch patch.txt text/plain 7142 n_wang SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIwMzcwMSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBACisyMDE2LTA3LTI1ICBOYW4gV2Fu ZyAgPG5fd2FuZ0BhcHBsZS5jb20+CisKKyAgICAgICAgQVg6IEV4cG9zZSBhdXRvRmlsbEJ1dHRv blR5cGUgdG8gYWNjZXNzaWJpbGl0eQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTYwMTc5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgQWRkZWQgYSBuZXcgYXR0cmlidXRlIG9uIE1hYyB0byBleHBvc2UgdGhl IGF1dG8tZmlsbCBidXR0b24gdHlwZS4KKworICAgICAgICBDaGFuZ2VzIGFyZSBjb3ZlcmVkIGlu IG1vZGlmaWVkIHRlc3QuCisKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlP YmplY3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eU9iamVjdDo6aXNWYWx1 ZUF1dG9maWxsQXZhaWxhYmxlKToKKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlPYmpl Y3Q6OnZhbHVlQXV0b2ZpbGxCdXR0b25UeXBlKToKKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2li aWxpdHlPYmplY3Q6OmlzVmFsdWVBdXRvZmlsbGVkKToKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5 L0FjY2Vzc2liaWxpdHlPYmplY3QuaDoKKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlP YmplY3Q6OnBhc3N3b3JkRmllbGRWYWx1ZSk6CisgICAgICAgICogYWNjZXNzaWJpbGl0eS9tYWMv V2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJNYWMubW06CisgICAgICAgICgtW1dlYkFjY2Vz c2liaWxpdHlPYmplY3RXcmFwcGVyIGFjY2Vzc2liaWxpdHlBdHRyaWJ1dGVWYWx1ZTpdKToKKwog MjAxNi0wNy0yNSAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIFBh cmFtZXRlcnMgdG8gRE9NSW1wbGVtZW50YXRpb24uY3JlYXRlRG9jdW1lbnRUeXBlKCkgc2hvdWxk IGJlIG1hbmRhdG9yeSBhbmQgbm9uLW51bGxhYmxlCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9hY2Nl c3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdC5jcHAJKHJldmlzaW9uIDIw MzQyOSkKKysrIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVj dC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIyNTMsNiArMjI1MywxNCBAQCBib29sIEFjY2Vzc2li aWxpdHlPYmplY3Q6OmlzVmFsdWVBdXRvZmlsCiAgICAgCiAgICAgcmV0dXJuIGRvd25jYXN0PEhU TUxJbnB1dEVsZW1lbnQ+KCpub2RlKS5hdXRvRmlsbEJ1dHRvblR5cGUoKSAhPSBBdXRvRmlsbEJ1 dHRvblR5cGU6Ok5vbmU7CiB9CisKK0F1dG9GaWxsQnV0dG9uVHlwZSBBY2Nlc3NpYmlsaXR5T2Jq ZWN0Ojp2YWx1ZUF1dG9maWxsQnV0dG9uVHlwZSgpIGNvbnN0Cit7CisgICAgaWYgKCFpc1ZhbHVl QXV0b2ZpbGxBdmFpbGFibGUoKSkKKyAgICAgICAgcmV0dXJuIEF1dG9GaWxsQnV0dG9uVHlwZTo6 Tm9uZTsKKyAgICAKKyAgICByZXR1cm4gZG93bmNhc3Q8SFRNTElucHV0RWxlbWVudD4oKnRoaXMt Pm5vZGUoKSkuYXV0b0ZpbGxCdXR0b25UeXBlKCk7Cit9CiAgICAgCiBib29sIEFjY2Vzc2liaWxp dHlPYmplY3Q6OmlzVmFsdWVBdXRvZmlsbGVkKCkgY29uc3QKIHsKSW5kZXg6IFNvdXJjZS9XZWJD b3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdC5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdC5oCShyZXZpc2lv biAyMDM0MjkpCisrKyBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlP YmplY3QuaAkod29ya2luZyBjb3B5KQpAQCAtMzEsNiArMzEsNyBAQAogI2RlZmluZSBBY2Nlc3Np YmlsaXR5T2JqZWN0X2gKIAogI2luY2x1ZGUgIkZsb2F0UXVhZC5oIgorI2luY2x1ZGUgIkhUTUxU ZXh0Rm9ybUNvbnRyb2xFbGVtZW50LmgiCiAjaW5jbHVkZSAiTGF5b3V0UmVjdC5oIgogI2luY2x1 ZGUgIlBhdGguaCIKICNpbmNsdWRlICJSYW5nZS5oIgpAQCAtOTA0LDYgKzkwNSw3IEBAIHB1Ymxp YzoKICAgICB2aXJ0dWFsIFN0cmluZyBwYXNzd29yZEZpZWxkVmFsdWUoKSBjb25zdCB7IHJldHVy biBTdHJpbmcoKTsgfQogICAgIGJvb2wgaXNWYWx1ZUF1dG9maWxsZWQoKSBjb25zdDsKICAgICBi b29sIGlzVmFsdWVBdXRvZmlsbEF2YWlsYWJsZSgpIGNvbnN0OworICAgIEF1dG9GaWxsQnV0dG9u VHlwZSB2YWx1ZUF1dG9maWxsQnV0dG9uVHlwZSgpIGNvbnN0OwogICAgIAogICAgIC8vIFVzZWQg YnkgYW4gQVJJQSB0cmVlIHRvIGdldCBhbGwgaXRzIHJvd3MuCiAgICAgdm9pZCBhcmlhVHJlZVJv d3MoQWNjZXNzaWJpbGl0eUNoaWxkcmVuVmVjdG9yJik7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9h Y2Nlc3NpYmlsaXR5L21hYy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlck1hYy5tbQo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9XZWJBY2Nlc3NpYmls aXR5T2JqZWN0V3JhcHBlck1hYy5tbQkocmV2aXNpb24gMjAzNDI5KQorKysgU291cmNlL1dlYkNv cmUvYWNjZXNzaWJpbGl0eS9tYWMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJNYWMubW0J KHdvcmtpbmcgY29weSkKQEAgLTE2MSw2ICsxNjEsMTAgQEAgdXNpbmcgbmFtZXNwYWNlIEhUTUxO YW1lczsKICNkZWZpbmUgTlNBY2Nlc3NpYmlsaXR5VmFsdWVBdXRvZmlsbEF2YWlsYWJsZUF0dHJp YnV0ZSBAIkFYVmFsdWVBdXRvZmlsbEF2YWlsYWJsZSIKICNlbmRpZgogCisjaWZuZGVmIE5TQWNj ZXNzaWJpbGl0eVZhbHVlQXV0b2ZpbGxUeXBlQXR0cmlidXRlCisjZGVmaW5lIE5TQWNjZXNzaWJp bGl0eVZhbHVlQXV0b2ZpbGxUeXBlQXR0cmlidXRlIEAiQVhWYWx1ZUF1dG9maWxsVHlwZSIKKyNl bmRpZgorCiAjaWZuZGVmIE5TQWNjZXNzaWJpbGl0eUxhbmd1YWdlQXR0cmlidXRlCiAjZGVmaW5l IE5TQWNjZXNzaWJpbGl0eUxhbmd1YWdlQXR0cmlidXRlIEAiQVhMYW5ndWFnZSIKICNlbmRpZgpA QCAtMzIzNyw2ICszMjQxLDE3IEBAIC0gKGlkKWFjY2Vzc2liaWxpdHlBdHRyaWJ1dGVWYWx1ZToo TlNTdHIKICAgICBpZiAoW2F0dHJpYnV0ZU5hbWUgaXNFcXVhbFRvU3RyaW5nOk5TQWNjZXNzaWJp bGl0eVZhbHVlQXV0b2ZpbGxBdmFpbGFibGVBdHRyaWJ1dGVdKQogICAgICAgICByZXR1cm4gQCht X29iamVjdC0+aXNWYWx1ZUF1dG9maWxsQXZhaWxhYmxlKCkpOwogICAgIAorICAgIGlmIChbYXR0 cmlidXRlTmFtZSBpc0VxdWFsVG9TdHJpbmc6TlNBY2Nlc3NpYmlsaXR5VmFsdWVBdXRvZmlsbFR5 cGVBdHRyaWJ1dGVdKSB7CisgICAgICAgIHN3aXRjaCAobV9vYmplY3QtPnZhbHVlQXV0b2ZpbGxC dXR0b25UeXBlKCkpIHsKKyAgICAgICAgY2FzZSBBdXRvRmlsbEJ1dHRvblR5cGU6Ok5vbmU6Cisg ICAgICAgICAgICByZXR1cm4gQCJhdXRvZmlsbE5vbmUiOworICAgICAgICBjYXNlIEF1dG9GaWxs QnV0dG9uVHlwZTo6Q3JlZGVudGlhbHM6CisgICAgICAgICAgICByZXR1cm4gQCJhdXRvZmlsbENy ZWRlbnRpYWwiOworICAgICAgICBjYXNlIEF1dG9GaWxsQnV0dG9uVHlwZTo6Q29udGFjdHM6Cisg ICAgICAgICAgICByZXR1cm4gQCJhdXRvZmlsbENvbnRhY3QiOworICAgICAgICB9CisgICAgfQor ICAgIAogICAgIGlmIChbYXR0cmlidXRlTmFtZSBpc0VxdWFsVG9TdHJpbmc6TlNBY2Nlc3NpYmls aXR5VmFsdWVBdXRvZmlsbGVkQXR0cmlidXRlXSkKICAgICAgICAgcmV0dXJuIEAobV9vYmplY3Qt PmlzVmFsdWVBdXRvZmlsbGVkKCkpOwogCkluZGV4OiBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMDM0MjkpCisrKyBM YXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxMyBAQAorMjAx Ni0wNy0yNSAgTmFuIFdhbmcgIDxuX3dhbmdAYXBwbGUuY29tPgorCisgICAgICAgIEFYOiBFeHBv c2UgYXV0b0ZpbGxCdXR0b25UeXBlIHRvIGFjY2Vzc2liaWxpdHkKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2MDE3OQorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogYWNjZXNzaWJpbGl0eS9hdXRvLWZpbGwt dHlwZXMtZXhwZWN0ZWQudHh0OgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvYXV0by1maWxsLXR5 cGVzLmh0bWw6CisKIDIwMTYtMDctMTkgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4K IAogICAgICAgICBhdXRvY2FwaXRhbGl6ZSBhdHRyaWJ1dGUgc2hvdWxkIG5vdCB1c2UgW1RyZWF0 TnVsbEFzPUxlZ2FjeU51bGxTdHJpbmddCkluZGV4OiBMYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5 L2F1dG8tZmlsbC10eXBlcy1leHBlY3RlZC50eHQKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMv YWNjZXNzaWJpbGl0eS9hdXRvLWZpbGwtdHlwZXMtZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAyMDM0 MjkpCisrKyBMYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L2F1dG8tZmlsbC10eXBlcy1leHBlY3Rl ZC50eHQJKHdvcmtpbmcgY29weSkKQEAgLTUsMTAgKzUsMTMgQEAgT24gc3VjY2VzcywgeW91IHdp bGwgc2VlIGEgc2VyaWVzIG9mICJQQQogCiAKIEluaXRpYWwgYXV0by1maWxsIGF2YWlsYWJsZTog ZmFsc2UKK0F1dG8tZmlsbCB0eXBlIDphdXRvZmlsbE5vbmUKIENvbnRhY3QgYnV0dG9uIHJvbGU6 IEFYUm9sZTogQVhCdXR0b24KIENvbnRhY3QgYnV0dG9uIGxhYmVsOiBBWERlc2NyaXB0aW9uOiBj b250YWN0IGluZm8gYXV0byBmaWxsCitBdXRvLWZpbGwgdHlwZTogYXV0b2ZpbGxDb250YWN0CiBD cmVkZW50aWFscyBidXR0b24gcm9sZTogQVhSb2xlOiBBWEJ1dHRvbgogQ3JlZGVudGlhbHMgYnV0 dG9uIGxhYmVsOiBBWERlc2NyaXB0aW9uOiBwYXNzd29yZCBhdXRvIGZpbGwKK0F1dG8tZmlsbCB0 eXBlOiBhdXRvZmlsbENyZWRlbnRpYWwKIFBvc3QgYXV0by1maWxsIGF2YWlsYWJsZTogdHJ1ZQog UEFTUyBzdWNjZXNzZnVsbHlQYXJzZWQgaXMgdHJ1ZQogCkluZGV4OiBMYXlvdXRUZXN0cy9hY2Nl c3NpYmlsaXR5L2F1dG8tZmlsbC10eXBlcy5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3Rz L2FjY2Vzc2liaWxpdHkvYXV0by1maWxsLXR5cGVzLmh0bWwJKHJldmlzaW9uIDIwMzQyOSkKKysr IExheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvYXV0by1maWxsLXR5cGVzLmh0bWwJKHdvcmtpbmcg Y29weSkKQEAgLTE5LDE2ICsxOSwxOSBAQAogICAgICAgICB2YXIgdGV4dEZpZWxkID0gZG9jdW1l bnQuZ2V0RWxlbWVudEJ5SWQoInRleHRmaWVsZCIpOwogICAgICAgICB2YXIgYXhUZXh0RmllbGQg PSBhY2Nlc3NpYmlsaXR5Q29udHJvbGxlci5hY2Nlc3NpYmxlRWxlbWVudEJ5SWQoInRleHRmaWVs ZCIpOwogICAgICAgICBkZWJ1ZygiSW5pdGlhbCBhdXRvLWZpbGwgYXZhaWxhYmxlOiAiICsgYXhU ZXh0RmllbGQuYm9vbEF0dHJpYnV0ZVZhbHVlKCJBWFZhbHVlQXV0b2ZpbGxBdmFpbGFibGUiKSk7 CisgICAgICAgIGRlYnVnKCJBdXRvLWZpbGwgdHlwZSA6IiArIGF4VGV4dEZpZWxkLnN0cmluZ0F0 dHJpYnV0ZVZhbHVlKCJBWFZhbHVlQXV0b2ZpbGxUeXBlIikpOwogCiAgICAgICAgIHdpbmRvdy5p bnRlcm5hbHMuc2V0U2hvd0F1dG9GaWxsQnV0dG9uKGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJ0 ZXh0ZmllbGQiKSwgIkF1dG9GaWxsQnV0dG9uVHlwZUNvbnRhY3RzIik7CiAgICAgICAgIHZhciBj b250YWN0c0J1dHRvbiA9IGF4VGV4dEZpZWxkLmNoaWxkQXRJbmRleCgxKTsKICAgICAgICAgZGVi dWcoIkNvbnRhY3QgYnV0dG9uIHJvbGU6ICIgKyBjb250YWN0c0J1dHRvbi5yb2xlKTsKICAgICAg ICAgZGVidWcoIkNvbnRhY3QgYnV0dG9uIGxhYmVsOiAiICsgY29udGFjdHNCdXR0b24uZGVzY3Jp cHRpb24pOworICAgICAgICBkZWJ1ZygiQXV0by1maWxsIHR5cGU6ICIgKyBheFRleHRGaWVsZC5z dHJpbmdBdHRyaWJ1dGVWYWx1ZSgiQVhWYWx1ZUF1dG9maWxsVHlwZSIpKTsKIAogICAgICAgICB3 aW5kb3cuaW50ZXJuYWxzLnNldFNob3dBdXRvRmlsbEJ1dHRvbihkb2N1bWVudC5nZXRFbGVtZW50 QnlJZCgidGV4dGZpZWxkIiksICJBdXRvRmlsbEJ1dHRvblR5cGVDcmVkZW50aWFscyIpOwogICAg ICAgICB2YXIgY3JlZGVudGlhbHNCdXR0b24gPSBheFRleHRGaWVsZC5jaGlsZEF0SW5kZXgoMSk7 CiAgICAgICAgIGRlYnVnKCJDcmVkZW50aWFscyBidXR0b24gcm9sZTogIiArIGNyZWRlbnRpYWxz QnV0dG9uLnJvbGUpOwogICAgICAgICBkZWJ1ZygiQ3JlZGVudGlhbHMgYnV0dG9uIGxhYmVsOiAi ICsgY3JlZGVudGlhbHNCdXR0b24uZGVzY3JpcHRpb24pOworICAgICAgICBkZWJ1ZygiQXV0by1m aWxsIHR5cGU6ICIgKyBheFRleHRGaWVsZC5zdHJpbmdBdHRyaWJ1dGVWYWx1ZSgiQVhWYWx1ZUF1 dG9maWxsVHlwZSIpKTsKIAogICAgICAgICBkZWJ1ZygiUG9zdCBhdXRvLWZpbGwgYXZhaWxhYmxl OiAiICsgYXhUZXh0RmllbGQuYm9vbEF0dHJpYnV0ZVZhbHVlKCJBWFZhbHVlQXV0b2ZpbGxBdmFp bGFibGUiKSk7CiAgICAgfQo= 284556 2016-07-25 17:59:58 -0700 2016-07-25 22:28:39 -0700 Patch patch.txt text/plain 7098 n_wang SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIwMzcwMSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBACisyMDE2LTA3LTI1ICBOYW4gV2Fu ZyAgPG5fd2FuZ0BhcHBsZS5jb20+CisKKyAgICAgICAgQVg6IEV4cG9zZSBhdXRvRmlsbEJ1dHRv blR5cGUgdG8gYWNjZXNzaWJpbGl0eQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTYwMTc5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgQWRkZWQgYSBuZXcgYXR0cmlidXRlIG9uIE1hYyB0byBleHBvc2UgdGhl IGF1dG8tZmlsbCBidXR0b24gdHlwZS4KKworICAgICAgICBDaGFuZ2VzIGFyZSBjb3ZlcmVkIGlu IG1vZGlmaWVkIHRlc3QuCisKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlP YmplY3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eU9iamVjdDo6aXNWYWx1 ZUF1dG9maWxsQXZhaWxhYmxlKToKKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlPYmpl Y3Q6OnZhbHVlQXV0b2ZpbGxCdXR0b25UeXBlKToKKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2li aWxpdHlPYmplY3Q6OmlzVmFsdWVBdXRvZmlsbGVkKToKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5 L0FjY2Vzc2liaWxpdHlPYmplY3QuaDoKKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlP YmplY3Q6OnBhc3N3b3JkRmllbGRWYWx1ZSk6CisgICAgICAgICogYWNjZXNzaWJpbGl0eS9tYWMv V2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJNYWMubW06CisgICAgICAgICgtW1dlYkFjY2Vz c2liaWxpdHlPYmplY3RXcmFwcGVyIGFjY2Vzc2liaWxpdHlBdHRyaWJ1dGVWYWx1ZTpdKToKKwog MjAxNi0wNy0yNSAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIFBh cmFtZXRlcnMgdG8gRE9NSW1wbGVtZW50YXRpb24uY3JlYXRlRG9jdW1lbnRUeXBlKCkgc2hvdWxk IGJlIG1hbmRhdG9yeSBhbmQgbm9uLW51bGxhYmxlCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9hY2Nl c3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdC5jcHAJKHJldmlzaW9uIDIw MzQyOSkKKysrIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVj dC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIyNTMsNiArMjI1MywxNCBAQCBib29sIEFjY2Vzc2li aWxpdHlPYmplY3Q6OmlzVmFsdWVBdXRvZmlsCiAgICAgCiAgICAgcmV0dXJuIGRvd25jYXN0PEhU TUxJbnB1dEVsZW1lbnQ+KCpub2RlKS5hdXRvRmlsbEJ1dHRvblR5cGUoKSAhPSBBdXRvRmlsbEJ1 dHRvblR5cGU6Ok5vbmU7CiB9CisKK0F1dG9GaWxsQnV0dG9uVHlwZSBBY2Nlc3NpYmlsaXR5T2Jq ZWN0Ojp2YWx1ZUF1dG9maWxsQnV0dG9uVHlwZSgpIGNvbnN0Cit7CisgICAgaWYgKCFpc1ZhbHVl QXV0b2ZpbGxBdmFpbGFibGUoKSkKKyAgICAgICAgcmV0dXJuIEF1dG9GaWxsQnV0dG9uVHlwZTo6 Tm9uZTsKKyAgICAKKyAgICByZXR1cm4gZG93bmNhc3Q8SFRNTElucHV0RWxlbWVudD4oKnRoaXMt Pm5vZGUoKSkuYXV0b0ZpbGxCdXR0b25UeXBlKCk7Cit9CiAgICAgCiBib29sIEFjY2Vzc2liaWxp dHlPYmplY3Q6OmlzVmFsdWVBdXRvZmlsbGVkKCkgY29uc3QKIHsKSW5kZXg6IFNvdXJjZS9XZWJD b3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdC5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdC5oCShyZXZpc2lv biAyMDM0MjkpCisrKyBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlP YmplY3QuaAkod29ya2luZyBjb3B5KQpAQCAtMzEsNiArMzEsNyBAQAogI2RlZmluZSBBY2Nlc3Np YmlsaXR5T2JqZWN0X2gKIAogI2luY2x1ZGUgIkZsb2F0UXVhZC5oIgorI2luY2x1ZGUgIkhUTUxU ZXh0Rm9ybUNvbnRyb2xFbGVtZW50LmgiCiAjaW5jbHVkZSAiTGF5b3V0UmVjdC5oIgogI2luY2x1 ZGUgIlBhdGguaCIKICNpbmNsdWRlICJSYW5nZS5oIgpAQCAtOTA0LDYgKzkwNSw3IEBAIHB1Ymxp YzoKICAgICB2aXJ0dWFsIFN0cmluZyBwYXNzd29yZEZpZWxkVmFsdWUoKSBjb25zdCB7IHJldHVy biBTdHJpbmcoKTsgfQogICAgIGJvb2wgaXNWYWx1ZUF1dG9maWxsZWQoKSBjb25zdDsKICAgICBi b29sIGlzVmFsdWVBdXRvZmlsbEF2YWlsYWJsZSgpIGNvbnN0OworICAgIEF1dG9GaWxsQnV0dG9u VHlwZSB2YWx1ZUF1dG9maWxsQnV0dG9uVHlwZSgpIGNvbnN0OwogICAgIAogICAgIC8vIFVzZWQg YnkgYW4gQVJJQSB0cmVlIHRvIGdldCBhbGwgaXRzIHJvd3MuCiAgICAgdm9pZCBhcmlhVHJlZVJv d3MoQWNjZXNzaWJpbGl0eUNoaWxkcmVuVmVjdG9yJik7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9h Y2Nlc3NpYmlsaXR5L21hYy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlck1hYy5tbQo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9XZWJBY2Nlc3NpYmls aXR5T2JqZWN0V3JhcHBlck1hYy5tbQkocmV2aXNpb24gMjAzNDI5KQorKysgU291cmNlL1dlYkNv cmUvYWNjZXNzaWJpbGl0eS9tYWMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJNYWMubW0J KHdvcmtpbmcgY29weSkKQEAgLTE2MSw2ICsxNjEsMTAgQEAgdXNpbmcgbmFtZXNwYWNlIEhUTUxO YW1lczsKICNkZWZpbmUgTlNBY2Nlc3NpYmlsaXR5VmFsdWVBdXRvZmlsbEF2YWlsYWJsZUF0dHJp YnV0ZSBAIkFYVmFsdWVBdXRvZmlsbEF2YWlsYWJsZSIKICNlbmRpZgogCisjaWZuZGVmIE5TQWNj ZXNzaWJpbGl0eVZhbHVlQXV0b2ZpbGxUeXBlQXR0cmlidXRlCisjZGVmaW5lIE5TQWNjZXNzaWJp bGl0eVZhbHVlQXV0b2ZpbGxUeXBlQXR0cmlidXRlIEAiQVhWYWx1ZUF1dG9maWxsVHlwZSIKKyNl bmRpZgorCiAjaWZuZGVmIE5TQWNjZXNzaWJpbGl0eUxhbmd1YWdlQXR0cmlidXRlCiAjZGVmaW5l IE5TQWNjZXNzaWJpbGl0eUxhbmd1YWdlQXR0cmlidXRlIEAiQVhMYW5ndWFnZSIKICNlbmRpZgpA QCAtMzIzNyw2ICszMjQxLDE3IEBAIC0gKGlkKWFjY2Vzc2liaWxpdHlBdHRyaWJ1dGVWYWx1ZToo TlNTdHIKICAgICBpZiAoW2F0dHJpYnV0ZU5hbWUgaXNFcXVhbFRvU3RyaW5nOk5TQWNjZXNzaWJp bGl0eVZhbHVlQXV0b2ZpbGxBdmFpbGFibGVBdHRyaWJ1dGVdKQogICAgICAgICByZXR1cm4gQCht X29iamVjdC0+aXNWYWx1ZUF1dG9maWxsQXZhaWxhYmxlKCkpOwogICAgIAorICAgIGlmIChbYXR0 cmlidXRlTmFtZSBpc0VxdWFsVG9TdHJpbmc6TlNBY2Nlc3NpYmlsaXR5VmFsdWVBdXRvZmlsbFR5 cGVBdHRyaWJ1dGVdKSB7CisgICAgICAgIHN3aXRjaCAobV9vYmplY3QtPnZhbHVlQXV0b2ZpbGxC dXR0b25UeXBlKCkpIHsKKyAgICAgICAgY2FzZSBBdXRvRmlsbEJ1dHRvblR5cGU6Ok5vbmU6Cisg ICAgICAgICAgICByZXR1cm4gQCJub25lIjsKKyAgICAgICAgY2FzZSBBdXRvRmlsbEJ1dHRvblR5 cGU6OkNyZWRlbnRpYWxzOgorICAgICAgICAgICAgcmV0dXJuIEAiY3JlZGVudGlhbHMiOworICAg ICAgICBjYXNlIEF1dG9GaWxsQnV0dG9uVHlwZTo6Q29udGFjdHM6CisgICAgICAgICAgICByZXR1 cm4gQCJjb250YWN0cyI7CisgICAgICAgIH0KKyAgICB9CisgICAgCiAgICAgaWYgKFthdHRyaWJ1 dGVOYW1lIGlzRXF1YWxUb1N0cmluZzpOU0FjY2Vzc2liaWxpdHlWYWx1ZUF1dG9maWxsZWRBdHRy aWJ1dGVdKQogICAgICAgICByZXR1cm4gQChtX29iamVjdC0+aXNWYWx1ZUF1dG9maWxsZWQoKSk7 CiAKSW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0 cy9DaGFuZ2VMb2cJKHJldmlzaW9uIDIwMzQyOSkKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwko d29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisyMDE2LTA3LTI1ICBOYW4gV2FuZyAgPG5f d2FuZ0BhcHBsZS5jb20+CisKKyAgICAgICAgQVg6IEV4cG9zZSBhdXRvRmlsbEJ1dHRvblR5cGUg dG8gYWNjZXNzaWJpbGl0eQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTYwMTc5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L2F1dG8tZmlsbC10eXBlcy1leHBlY3RlZC50eHQ6Cisg ICAgICAgICogYWNjZXNzaWJpbGl0eS9hdXRvLWZpbGwtdHlwZXMuaHRtbDoKKwogMjAxNi0wNy0x OSAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIGF1dG9jYXBpdGFs aXplIGF0dHJpYnV0ZSBzaG91bGQgbm90IHVzZSBbVHJlYXROdWxsQXM9TGVnYWN5TnVsbFN0cmlu Z10KSW5kZXg6IExheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvYXV0by1maWxsLXR5cGVzLWV4cGVj dGVkLnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L2F1dG8tZmls bC10eXBlcy1leHBlY3RlZC50eHQJKHJldmlzaW9uIDIwMzQyOSkKKysrIExheW91dFRlc3RzL2Fj Y2Vzc2liaWxpdHkvYXV0by1maWxsLXR5cGVzLWV4cGVjdGVkLnR4dAkod29ya2luZyBjb3B5KQpA QCAtNSwxMCArNSwxMyBAQCBPbiBzdWNjZXNzLCB5b3Ugd2lsbCBzZWUgYSBzZXJpZXMgb2YgIlBB CiAKIAogSW5pdGlhbCBhdXRvLWZpbGwgYXZhaWxhYmxlOiBmYWxzZQorQXV0by1maWxsIHR5cGU6 IG5vbmUKIENvbnRhY3QgYnV0dG9uIHJvbGU6IEFYUm9sZTogQVhCdXR0b24KIENvbnRhY3QgYnV0 dG9uIGxhYmVsOiBBWERlc2NyaXB0aW9uOiBjb250YWN0IGluZm8gYXV0byBmaWxsCitBdXRvLWZp bGwgdHlwZTogY29udGFjdHMKIENyZWRlbnRpYWxzIGJ1dHRvbiByb2xlOiBBWFJvbGU6IEFYQnV0 dG9uCiBDcmVkZW50aWFscyBidXR0b24gbGFiZWw6IEFYRGVzY3JpcHRpb246IHBhc3N3b3JkIGF1 dG8gZmlsbAorQXV0by1maWxsIHR5cGU6IGNyZWRlbnRpYWxzCiBQb3N0IGF1dG8tZmlsbCBhdmFp bGFibGU6IHRydWUKIFBBU1Mgc3VjY2Vzc2Z1bGx5UGFyc2VkIGlzIHRydWUKIApJbmRleDogTGF5 b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9hdXRvLWZpbGwtdHlwZXMuaHRtbAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBMYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L2F1dG8tZmlsbC10eXBlcy5odG1sCShyZXZpc2lv biAyMDM0MjkpCisrKyBMYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L2F1dG8tZmlsbC10eXBlcy5o dG1sCSh3b3JraW5nIGNvcHkpCkBAIC0xOSwxNiArMTksMTkgQEAKICAgICAgICAgdmFyIHRleHRG aWVsZCA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJ0ZXh0ZmllbGQiKTsKICAgICAgICAgdmFy IGF4VGV4dEZpZWxkID0gYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIuYWNjZXNzaWJsZUVsZW1lbnRC eUlkKCJ0ZXh0ZmllbGQiKTsKICAgICAgICAgZGVidWcoIkluaXRpYWwgYXV0by1maWxsIGF2YWls YWJsZTogIiArIGF4VGV4dEZpZWxkLmJvb2xBdHRyaWJ1dGVWYWx1ZSgiQVhWYWx1ZUF1dG9maWxs QXZhaWxhYmxlIikpOworICAgICAgICBkZWJ1ZygiQXV0by1maWxsIHR5cGU6ICIgKyBheFRleHRG aWVsZC5zdHJpbmdBdHRyaWJ1dGVWYWx1ZSgiQVhWYWx1ZUF1dG9maWxsVHlwZSIpKTsKIAogICAg ICAgICB3aW5kb3cuaW50ZXJuYWxzLnNldFNob3dBdXRvRmlsbEJ1dHRvbihkb2N1bWVudC5nZXRF bGVtZW50QnlJZCgidGV4dGZpZWxkIiksICJBdXRvRmlsbEJ1dHRvblR5cGVDb250YWN0cyIpOwog ICAgICAgICB2YXIgY29udGFjdHNCdXR0b24gPSBheFRleHRGaWVsZC5jaGlsZEF0SW5kZXgoMSk7 CiAgICAgICAgIGRlYnVnKCJDb250YWN0IGJ1dHRvbiByb2xlOiAiICsgY29udGFjdHNCdXR0b24u cm9sZSk7CiAgICAgICAgIGRlYnVnKCJDb250YWN0IGJ1dHRvbiBsYWJlbDogIiArIGNvbnRhY3Rz QnV0dG9uLmRlc2NyaXB0aW9uKTsKKyAgICAgICAgZGVidWcoIkF1dG8tZmlsbCB0eXBlOiAiICsg YXhUZXh0RmllbGQuc3RyaW5nQXR0cmlidXRlVmFsdWUoIkFYVmFsdWVBdXRvZmlsbFR5cGUiKSk7 CiAKICAgICAgICAgd2luZG93LmludGVybmFscy5zZXRTaG93QXV0b0ZpbGxCdXR0b24oZG9jdW1l bnQuZ2V0RWxlbWVudEJ5SWQoInRleHRmaWVsZCIpLCAiQXV0b0ZpbGxCdXR0b25UeXBlQ3JlZGVu dGlhbHMiKTsKICAgICAgICAgdmFyIGNyZWRlbnRpYWxzQnV0dG9uID0gYXhUZXh0RmllbGQuY2hp bGRBdEluZGV4KDEpOwogICAgICAgICBkZWJ1ZygiQ3JlZGVudGlhbHMgYnV0dG9uIHJvbGU6ICIg KyBjcmVkZW50aWFsc0J1dHRvbi5yb2xlKTsKICAgICAgICAgZGVidWcoIkNyZWRlbnRpYWxzIGJ1 dHRvbiBsYWJlbDogIiArIGNyZWRlbnRpYWxzQnV0dG9uLmRlc2NyaXB0aW9uKTsKKyAgICAgICAg ZGVidWcoIkF1dG8tZmlsbCB0eXBlOiAiICsgYXhUZXh0RmllbGQuc3RyaW5nQXR0cmlidXRlVmFs dWUoIkFYVmFsdWVBdXRvZmlsbFR5cGUiKSk7CiAKICAgICAgICAgZGVidWcoIlBvc3QgYXV0by1m aWxsIGF2YWlsYWJsZTogIiArIGF4VGV4dEZpZWxkLmJvb2xBdHRyaWJ1dGVWYWx1ZSgiQVhWYWx1 ZUF1dG9maWxsQXZhaWxhYmxlIikpOwogICAgIH0K