196988 2019-04-16 14:55:26 -0700 [ContentChangeObserver] Use aria role as a hint whether a tap should result in a synthetic click 2019-04-17 11:57:59 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan aboxhall apinheiro bfulgham cfleizach commit-queue dmazzoni ews-watchlist jcraig jdiggs samuel_white simon.fraser webkit-bug-importer zalan oldest_to_newest 1527892 0 zalan 2019-04-16 14:55:26 -0700 role="checkbox" e.g. 1527893 1 webkit-bug-importer 2019-04-16 14:56:01 -0700 <rdar://problem/49955328> 1527902 2 367581 zalan 2019-04-16 15:29:18 -0700 Created attachment 367581 Patch 1527910 3 367581 cfleizach 2019-04-16 15:45:19 -0700 Comment on attachment 367581 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=367581&action=review > Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm:569 > +static bool isAriaRoleForImmediateClick(AccessibilityRole role) feels like this might better live in AccessibilityObject. There's an existing bool AccessibilityObject::isARIAControl(AccessibilityRole ariaRole) that might be appropriate > Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm:572 > + || role == AccessibilityRole::Link || role == AccessibilityRole::List || role == AccessibilityRole::ListBox || role == AccessibilityRole::ListBoxOption || role == AccessibilityRole::ListItem not sure we want to tap ListBox > Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm:575 > + || role == AccessibilityRole::SearchField || role == AccessibilityRole::Slider || role == AccessibilityRole::SliderThumb || role ==AccessibilityRole::SpinButton || role == AccessibilityRole::SpinButtonPart spacing role ==AccessibilityRole::SpinButton > Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm:576 > + || role == AccessibilityRole::TextArea || role == AccessibilityRole::TextField || role == AccessibilityRole::ToggleButton; do we want to tap text areas and text fields? > Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm:577 > +} this might be better written as a switch statement > Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm:590 > + return isAriaRoleForImmediateClick(AccessibilityObject::ariaRoleToWebCoreRole(ariaRoleString)); ariaRoleToWebCoreRole should handle null and empty strings. you can probably remove this if 1528138 4 367641 zalan 2019-04-17 10:08:59 -0700 Created attachment 367641 Patch 1528139 5 zalan 2019-04-17 10:10:50 -0700 (In reply to chris fleizach from comment #3) > Comment on attachment 367581 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=367581&action=review > > > Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm:569 > > +static bool isAriaRoleForImmediateClick(AccessibilityRole role) > > feels like this might better live in AccessibilityObject. There's an existing > > bool AccessibilityObject::isARIAControl(AccessibilityRole ariaRole) that > might be appropriate I didn't know about isARIAControl and isARIAInput! Thanks! > > Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm:590 > > + return isAriaRoleForImmediateClick(AccessibilityObject::ariaRoleToWebCoreRole(ariaRoleString)); > > ariaRoleToWebCoreRole should handle null and empty strings. you can probably > remove this if Good idea. 1528207 6 367641 commit-queue 2019-04-17 11:57:57 -0700 Comment on attachment 367641 Patch Clearing flags on attachment: 367641 Committed r244392: <https://trac.webkit.org/changeset/244392> 1528208 7 commit-queue 2019-04-17 11:57:59 -0700 All reviewed patches have been landed. Closing bug. 367581 2019-04-16 15:29:18 -0700 2019-04-17 10:08:58 -0700 Patch bug-196988-20190416152917.patch text/plain 10206 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ0MzU3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjBjNTM3ZWJlNTJkMjdl MmRmNjZiMGQ4OGY0YWE3YmYzOWFkN2ZlMC4uM2E3ZjM4ZDExYTA4OGE0NmM2NTRkZGUyNzE5MGY3 YjI1MTFhMTFiMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE5LTA0LTE2ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0NvbnRlbnRDaGFuZ2VPYnNl cnZlcl0gVXNlIGFyaWEgcm9sZSBhcyBhIGhpbnQgd2hldGhlciBhIHRhcCBzaG91bGQgcmVzdWx0 IGluIGEgc3ludGhldGljIGNsaWNrCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xOTY5ODgKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzQ5OTU1MzI4Pgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRlc3Q6IGZh c3QvZXZlbnRzL3RvdWNoL2lvcy9jb250ZW50LW9ic2VydmF0aW9uL3RhcC1vbi1pbnB1dC1sb29r aW5nLWRpdi13aXRoLXJvbGUuaHRtbAorCisgICAgICAgICogYWNjZXNzaWJpbGl0eS9BY2Nlc3Np YmlsaXR5T2JqZWN0Lmg6CisKIDIwMTktMDQtMTYgIFRpbW90aHkgSGF0Y2hlciAgPHRpbW90aHlA YXBwbGUuY29tPgogCiAgICAgICAgIEZyYW1lVmlldyBiYXNlIGJhY2tncm91bmQgY29sb3IgYWx3 YXlzIHN0YXJ0cyB3aGl0ZS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIv U291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggMjk0OWUzYTk3MTVlOThjYmJiZTIzMjQzZTkz M2IzNjVhNDdjNzQ0MC4uZTFiMjU3M2ZjNGNiZTU2MTBkN2Q5NTIwY2E1NGQwYTE2NmYyMDkwNCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9D aGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAxOS0wNC0xNiAgWmFsYW4gQnVqdGFzICA8emFs YW5AYXBwbGUuY29tPgorCisgICAgICAgIFtDb250ZW50Q2hhbmdlT2JzZXJ2ZXJdIFVzZSBhcmlh IHJvbGUgYXMgYSBoaW50IHdoZXRoZXIgYSB0YXAgc2hvdWxkIHJlc3VsdCBpbiBhIHN5bnRoZXRp YyBjbGljaworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTk2OTg4CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80OTk1NTMyOD4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUYXBwaW5nIG9uIGVsZW1lbnRzIHdp dGggY3JldGFpbiBhcmlhIHJvbGUgYXR0cmlidXRlcyBzaG91bGQgdHJpZ2dlciBzeW50aGV0aWMg Y2xpY2sgdGhlIHNhbWUgd2F5IGl0IGRvZXMgb24gZm9ybSBjb250cm9sIGVsZW1lbnRzLiAKKwor ICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbToKKyAgICAgICAg KFdlYktpdDo6aXNBcmlhUm9sZUZvckltbWVkaWF0ZUNsaWNrKToKKyAgICAgICAgKFdlYktpdDo6 bm9kZUFsd2F5c1JlcXVpcmVzQ2xpY2spOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpoYW5k bGVTeW50aGV0aWNDbGljayk6CisKIDIwMTktMDQtMTYgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFw cGxlLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9OKHIyNDM1NTcpW0NvbnRlbnRDaGFuZ2VPYnNl cnZlcl0gTmVlZCB0byBkb3VibGUgdGFwIHRleHQgZm9ybWF0dGluZyBlbGVtZW50cyBpbiBNUyBX b3JkIHdlYiBhcHAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNj ZXNzaWJpbGl0eU9iamVjdC5oIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3Np YmlsaXR5T2JqZWN0LmgKaW5kZXggZDRmNzU2YTcyYTEzZTAyNGNjOTZiN2Y4NDIyYmEyMTQ4NjIx MDA2Yy4uYWJhYThiMjc5YTU4MGYxMDcxZmZhMWU5OTJjNTdhMWNlY2ViMjQ0OCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmgKKysr IGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmgKQEAg LTc1NSw3ICs3NTUsNyBAQCBwdWJsaWM6CiAgICAgYm9vbCBpc0FuY2VzdG9yT2ZPYmplY3QoY29u c3QgQWNjZXNzaWJpbGl0eU9iamVjdCopIGNvbnN0OwogICAgIEFjY2Vzc2liaWxpdHlPYmplY3Qq IGZpcnN0QW5vbnltb3VzQmxvY2tDaGlsZCgpIGNvbnN0OwogCi0gICAgc3RhdGljIEFjY2Vzc2li aWxpdHlSb2xlIGFyaWFSb2xlVG9XZWJDb3JlUm9sZShjb25zdCBTdHJpbmcmKTsKKyAgICBXRUJD T1JFX0VYUE9SVCBzdGF0aWMgQWNjZXNzaWJpbGl0eVJvbGUgYXJpYVJvbGVUb1dlYkNvcmVSb2xl KGNvbnN0IFN0cmluZyYpOwogICAgIGJvb2wgaGFzQXR0cmlidXRlKGNvbnN0IFF1YWxpZmllZE5h bWUmKSBjb25zdDsKICAgICBjb25zdCBBdG9taWNTdHJpbmcmIGdldEF0dHJpYnV0ZShjb25zdCBR dWFsaWZpZWROYW1lJikgY29uc3Q7CiAgICAgYm9vbCBoYXNUYWdOYW1lKGNvbnN0IFF1YWxpZmll ZE5hbWUmKSBjb25zdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQ YWdlL2lvcy9XZWJQYWdlSU9TLm1tIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2Uv aW9zL1dlYlBhZ2VJT1MubW0KaW5kZXggOTBkN2I3MzhkOWU0MDlkYjk4MWM5NjAzYzMzYzNiZWU1 MjZmMTJhNy4uZGI2N2I2MTc4ZWIyOWUxZTU2Mjc3MzkzMmFkY2RlOTEwZjAwZWJlYyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0K KysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0K QEAgLTU2Niw2ICs1NjYsMzAgQEAgc3RhdGljIHZvaWQgZGlzcGF0Y2hTeW50aGV0aWNNb3VzZU1v dmUoRnJhbWUmIG1haW5GcmFtZSwgY29uc3QgV2ViQ29yZTo6RmxvYXRQb2kKICAgICBtYWluRnJh bWUuZXZlbnRIYW5kbGVyKCkuZGlzcGF0Y2hTeW50aGV0aWNNb3VzZU1vdmUobW91c2VFdmVudCk7 CiB9CiAKK3N0YXRpYyBib29sIGlzQXJpYVJvbGVGb3JJbW1lZGlhdGVDbGljayhBY2Nlc3NpYmls aXR5Um9sZSByb2xlKQoreworICAgIHJldHVybiByb2xlID09IEFjY2Vzc2liaWxpdHlSb2xlOjpC dXR0b24gfHwgcm9sZSA9PSBBY2Nlc3NpYmlsaXR5Um9sZTo6Q2hlY2tCb3ggfHwgcm9sZSA9PSBB Y2Nlc3NpYmlsaXR5Um9sZTo6Q29tYm9Cb3ggfHwgcm9sZSA9PSBBY2Nlc3NpYmlsaXR5Um9sZTo6 RWRpdGFibGVUZXh0IHx8IHJvbGUgPT0gIEFjY2Vzc2liaWxpdHlSb2xlOjpGb3JtCisgICAgICAg IHx8IHJvbGUgPT0gQWNjZXNzaWJpbGl0eVJvbGU6OkxpbmsgfHwgcm9sZSA9PSBBY2Nlc3NpYmls aXR5Um9sZTo6TGlzdCB8fCByb2xlID09IEFjY2Vzc2liaWxpdHlSb2xlOjpMaXN0Qm94IHx8IHJv bGUgPT0gQWNjZXNzaWJpbGl0eVJvbGU6Okxpc3RCb3hPcHRpb24gfHwgcm9sZSA9PSBBY2Nlc3Np YmlsaXR5Um9sZTo6TGlzdEl0ZW0gCisgICAgICAgIHx8IHJvbGUgPT0gQWNjZXNzaWJpbGl0eVJv bGU6Ok1lbnVJdGVtQ2hlY2tib3ggfHwgcm9sZSA9PSBBY2Nlc3NpYmlsaXR5Um9sZTo6TWVudUl0 ZW1SYWRpbyB8fCByb2xlID09IEFjY2Vzc2liaWxpdHlSb2xlOjpNZW51TGlzdFBvcHVwIHx8IHJv bGUgPT0gQWNjZXNzaWJpbGl0eVJvbGU6Ok1lbnVMaXN0T3B0aW9uCisgICAgICAgIHx8IHJvbGUg PT0gQWNjZXNzaWJpbGl0eVJvbGU6OlBvcFVwQnV0dG9uIHx8IHJvbGUgPT0gQWNjZXNzaWJpbGl0 eVJvbGU6OlJhZGlvQnV0dG9uIHx8IHJvbGUgPT1BY2Nlc3NpYmlsaXR5Um9sZTo6UmFkaW9Hcm91 cCB8fCByb2xlID09IEFjY2Vzc2liaWxpdHlSb2xlOjpTY3JvbGxCYXIKKyAgICAgICAgfHwgcm9s ZSA9PSBBY2Nlc3NpYmlsaXR5Um9sZTo6U2VhcmNoRmllbGQgfHwgcm9sZSA9PSBBY2Nlc3NpYmls aXR5Um9sZTo6U2xpZGVyIHx8IHJvbGUgPT0gQWNjZXNzaWJpbGl0eVJvbGU6OlNsaWRlclRodW1i IHx8IHJvbGUgPT1BY2Nlc3NpYmlsaXR5Um9sZTo6U3BpbkJ1dHRvbiB8fCByb2xlID09IEFjY2Vz c2liaWxpdHlSb2xlOjpTcGluQnV0dG9uUGFydAorICAgICAgICB8fCByb2xlID09IEFjY2Vzc2li aWxpdHlSb2xlOjpUZXh0QXJlYSB8fCByb2xlID09IEFjY2Vzc2liaWxpdHlSb2xlOjpUZXh0Rmll bGQgfHwgcm9sZSA9PSBBY2Nlc3NpYmlsaXR5Um9sZTo6VG9nZ2xlQnV0dG9uOworfQorCitzdGF0 aWMgYm9vbCBub2RlQWx3YXlzVHJpZ2dlcnNDbGljayhjb25zdCBOb2RlJiB0YXJnZXROb2RlKQor eworICAgIGlmICghaXM8RWxlbWVudD4odGFyZ2V0Tm9kZSkpCisgICAgICAgIHJldHVybiBmYWxz ZTsKKworICAgIGlmIChpczxIVE1MRm9ybUNvbnRyb2xFbGVtZW50Pih0YXJnZXROb2RlKSkKKyAg ICAgICAgcmV0dXJuIHRydWU7CisKKyAgICBhdXRvIGFyaWFSb2xlU3RyaW5nID0gZG93bmNhc3Q8 RWxlbWVudD4odGFyZ2V0Tm9kZSkuZ2V0QXR0cmlidXRlKEhUTUxOYW1lczo6cm9sZUF0dHIpOwor ICAgIGlmIChhcmlhUm9sZVN0cmluZy5pc051bGwoKSB8fCBhcmlhUm9sZVN0cmluZy5pc0VtcHR5 KCkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICByZXR1cm4gaXNBcmlhUm9sZUZvckltbWVk aWF0ZUNsaWNrKEFjY2Vzc2liaWxpdHlPYmplY3Q6OmFyaWFSb2xlVG9XZWJDb3JlUm9sZShhcmlh Um9sZVN0cmluZykpOworfQorCiB2b2lkIFdlYlBhZ2U6OmhhbmRsZVN5bnRoZXRpY0NsaWNrKE5v ZGUmIG5vZGVSZXNwb25kaW5nVG9DbGljaywgY29uc3QgV2ViQ29yZTo6RmxvYXRQb2ludCYgbG9j YXRpb24sIE9wdGlvblNldDxXZWJFdmVudDo6TW9kaWZpZXI+IG1vZGlmaWVycykKIHsKICAgICBp ZiAoIW5vZGVSZXNwb25kaW5nVG9DbGljay5kb2N1bWVudCgpLnNldHRpbmdzKCkuY29udGVudENo YW5nZU9ic2VydmVyRW5hYmxlZCgpKSB7CkBAIC01ODcsOCArNjExLDkgQEAgdm9pZCBXZWJQYWdl OjpoYW5kbGVTeW50aGV0aWNDbGljayhOb2RlJiBub2RlUmVzcG9uZGluZ1RvQ2xpY2ssIGNvbnN0 IFdlYkNvcmU6OkYKIAogICAgIGF1dG8mIGNvbnRlbnRDaGFuZ2VPYnNlcnZlciA9IHJlc3BvbmRp bmdEb2N1bWVudC5jb250ZW50Q2hhbmdlT2JzZXJ2ZXIoKTsKICAgICBhdXRvIG9ic2VydmVkQ29u dGVudENoYW5nZSA9IGNvbnRlbnRDaGFuZ2VPYnNlcnZlci5vYnNlcnZlZENvbnRlbnRDaGFuZ2Uo KTsKKyAgICBhdXRvIHRhcmdldE5vZGVUcmlnZ2Vyc0NsaWNrID0gbm9kZUFsd2F5c1RyaWdnZXJz Q2xpY2sobm9kZVJlc3BvbmRpbmdUb0NsaWNrKTsKIAotICAgIGF1dG8gY29udGludWVDb250ZW50 T2JzZXJ2YXRpb24gPSAhKG9ic2VydmVkQ29udGVudENoYW5nZSA9PSBXS0NvbnRlbnRWaXNpYmls aXR5Q2hhbmdlIHx8IGlzPEhUTUxGb3JtQ29udHJvbEVsZW1lbnQ+KG5vZGVSZXNwb25kaW5nVG9D bGljaykpOworICAgIGF1dG8gY29udGludWVDb250ZW50T2JzZXJ2YXRpb24gPSAhKG9ic2VydmVk Q29udGVudENoYW5nZSA9PSBXS0NvbnRlbnRWaXNpYmlsaXR5Q2hhbmdlIHx8IHRhcmdldE5vZGVU cmlnZ2Vyc0NsaWNrKTsKICAgICBpZiAoY29udGludWVDb250ZW50T2JzZXJ2YXRpb24pIHsKICAg ICAgICAgLy8gV2FpdCBmb3IgY2FsbGJhY2sgdG8gY29tcGxldGVQZW5kaW5nU3ludGhldGljQ2xp Y2tGb3JDb250ZW50Q2hhbmdlT2JzZXJ2ZXIoKSB0byBkZWNpZGUgd2hldGhlciB0byBzZW5kIHRo ZSBjbGljayBldmVudC4KICAgICAgICAgY29uc3QgU2Vjb25kcyBvYnNlcnZhdGlvbkR1cmF0aW9u ID0gMzJfbXM7CkBAIC02MDAsMTEgKzYyNSwxMSBAQCB2b2lkIFdlYlBhZ2U6OmhhbmRsZVN5bnRo ZXRpY0NsaWNrKE5vZGUmIG5vZGVSZXNwb25kaW5nVG9DbGljaywgY29uc3QgV2ViQ29yZTo6Rgog ICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgY2FsbE9uTWFpblRocmVhZChbcHJvdGVjdGVk VGhpcyA9IG1ha2VSZWZQdHIodGhpcyksIHRhcmdldE5vZGUgPSBSZWY8Tm9kZT4obm9kZVJlc3Bv bmRpbmdUb0NsaWNrKSwgbG9jYXRpb24sIG1vZGlmaWVycywgb2JzZXJ2ZWRDb250ZW50Q2hhbmdl XSB7CisgICAgY2FsbE9uTWFpblRocmVhZChbcHJvdGVjdGVkVGhpcyA9IG1ha2VSZWZQdHIodGhp cyksIHRhcmdldE5vZGUgPSBSZWY8Tm9kZT4obm9kZVJlc3BvbmRpbmdUb0NsaWNrKSwgbG9jYXRp b24sIG1vZGlmaWVycywgb2JzZXJ2ZWRDb250ZW50Q2hhbmdlLCB0YXJnZXROb2RlVHJpZ2dlcnND bGlja10gewogICAgICAgICBpZiAocHJvdGVjdGVkVGhpcy0+bV9pc0Nsb3NlZCB8fCAhcHJvdGVj dGVkVGhpcy0+Y29yZVBhZ2UoKSkKICAgICAgICAgICAgIHJldHVybjsKIAotICAgICAgICBhdXRv IHNob3VsZFN0YXlBdEhvdmVyU3RhdGUgPSBvYnNlcnZlZENvbnRlbnRDaGFuZ2UgPT0gV0tDb250 ZW50VmlzaWJpbGl0eUNoYW5nZSAmJiAhaXM8SFRNTEZvcm1Db250cm9sRWxlbWVudD4odGFyZ2V0 Tm9kZSk7CisgICAgICAgIGF1dG8gc2hvdWxkU3RheUF0SG92ZXJTdGF0ZSA9IG9ic2VydmVkQ29u dGVudENoYW5nZSA9PSBXS0NvbnRlbnRWaXNpYmlsaXR5Q2hhbmdlICYmICF0YXJnZXROb2RlVHJp Z2dlcnNDbGljazsKICAgICAgICAgaWYgKHNob3VsZFN0YXlBdEhvdmVyU3RhdGUpIHsKICAgICAg ICAgICAgIC8vIFRoZSBtb3ZlIGV2ZW50IGNhdXNlZCBuZXcgY29udGVudHMgdG8gYXBwZWFyLiBE b24ndCBzZW5kIHN5bnRoZXRpYyBjbGljayBldmVudCwgYnV0IGp1c3QgZW5zdXJlIHRoYXQgdGhl IG1vdXNlIGlzIG9uIHRoZSBtb3N0IHJlY2VudCBjb250ZW50LgogICAgICAgICAgICAgZGlzcGF0 Y2hTeW50aGV0aWNNb3VzZU1vdmUocHJvdGVjdGVkVGhpcy0+Y29yZVBhZ2UoKS0+bWFpbkZyYW1l KCksIGxvY2F0aW9uLCBtb2RpZmllcnMpOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdl TG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDM2ODRmODMwOGIyMmFlMGQ3ZWJlOGJh YzNlNzMwZjBmOThlYTgyMDcuLjMyZGNjMzMwMDg0NjUzZWVlNWVkM2ZjNzE0OWJjNTQyM2VhNmQ3 NjkgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9D aGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAxOS0wNC0xNiAgWmFsYW4gQnVqdGFzICA8emFs YW5AYXBwbGUuY29tPgorCisgICAgICAgIFtDb250ZW50Q2hhbmdlT2JzZXJ2ZXJdIFVzZSBhcmlh IHJvbGUgYXMgYSBoaW50IHdoZXRoZXIgYSB0YXAgc2hvdWxkIHJlc3VsdCBpbiBhIHN5bnRoZXRp YyBjbGljaworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTk2OTg4CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80OTk1NTMyOD4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGZhc3QvZXZlbnRzL3RvdWNoL2lv cy9jb250ZW50LW9ic2VydmF0aW9uL3RhcC1vbi1pbnB1dC1sb29raW5nLWRpdi13aXRoLXJvbGUt ZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2V2ZW50cy90b3VjaC9pb3MvY29u dGVudC1vYnNlcnZhdGlvbi90YXAtb24taW5wdXQtbG9va2luZy1kaXYtd2l0aC1yb2xlLmh0bWw6 IEFkZGVkLgorCiAyMDE5LTA0LTE2ICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4K IAogICAgICAgICBVbnByZWZpeCAtd2Via2l0LXN0aWNreQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz dHMvZmFzdC9ldmVudHMvdG91Y2gvaW9zL2NvbnRlbnQtb2JzZXJ2YXRpb24vdGFwLW9uLWlucHV0 LWxvb2tpbmctZGl2LXdpdGgtcm9sZS1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9mYXN0L2V2 ZW50cy90b3VjaC9pb3MvY29udGVudC1vYnNlcnZhdGlvbi90YXAtb24taW5wdXQtbG9va2luZy1k aXYtd2l0aC1yb2xlLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4xNjAxNWFjMTU1YjVlMDBmY2Mz NjI2OGU5NTgwYTQyMjllZmVmYTdhCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFz dC9ldmVudHMvdG91Y2gvaW9zL2NvbnRlbnQtb2JzZXJ2YXRpb24vdGFwLW9uLWlucHV0LWxvb2tp bmctZGl2LXdpdGgtcm9sZS1leHBlY3RlZC50eHQKQEAgLTAsMCArMSwyIEBACitQQVNTIGlmICdj bGlja2VkJyB0ZXh0IGlzIG5vdCBzaG93biBiZWxvdy4KK2NsaWNrZWQKZGlmZiAtLWdpdCBhL0xh eW91dFRlc3RzL2Zhc3QvZXZlbnRzL3RvdWNoL2lvcy9jb250ZW50LW9ic2VydmF0aW9uL3RhcC1v bi1pbnB1dC1sb29raW5nLWRpdi13aXRoLXJvbGUuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvZXZl bnRzL3RvdWNoL2lvcy9jb250ZW50LW9ic2VydmF0aW9uL3RhcC1vbi1pbnB1dC1sb29raW5nLWRp di13aXRoLXJvbGUuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5jNzI4YzUxMTZjNGFhMGFiYWQ1ZjVkYmFiMmQ2 MWM2MmFlNjE2YmQwCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9ldmVudHMv dG91Y2gvaW9zL2NvbnRlbnQtb2JzZXJ2YXRpb24vdGFwLW9uLWlucHV0LWxvb2tpbmctZGl2LXdp dGgtcm9sZS5odG1sCkBAIC0wLDAgKzEsNTcgQEAKKzxodG1sPgorPGhlYWQ+Cis8dGl0bGU+VGhp cyB0ZXN0cyB0aGUgY2FzZSB3aGVuIHRoZSB0YXAgdGFyZ2V0IG5vZGUgaXMgYSBmb3JtIGNvbnRy b2wgZWxlbWVudC48L3RpdGxlPgorPHNjcmlwdCBzcmM9Ii4uLy4uLy4uLy4uLy4uL3Jlc291cmNl cy9iYXNpYy1nZXN0dXJlcy5qcyI+PC9zY3JpcHQ+Cis8c3R5bGU+CisjdGFwdGhpcyB7CisgICAg d2lkdGg6IDQwMHB4OworICAgIGhlaWdodDogNDAwcHg7CisgICAgYm9yZGVyOiAxcHggc29saWQg Z3JlZW47Cit9CisKKyNiZWNvbWVzVmlzaWJsZSB7CisgICAgdmlzaWJpbGl0eTogaGlkZGVuOwor ICAgIHdpZHRoOiAxMDBweDsKKyAgICBoZWlnaHQ6IDEwMHB4OworICAgIGJhY2tncm91bmQtY29s b3I6IGdyZWVuOworfQorPC9zdHlsZT4KKzxzY3JpcHQ+Cithc3luYyBmdW5jdGlvbiB0ZXN0KCkg eworICAgIGlmICghd2luZG93LnRlc3RSdW5uZXIgfHwgIXRlc3RSdW5uZXIucnVuVUlTY3JpcHQp CisgICAgICAgIHJldHVybjsKKyAgICBpZiAod2luZG93LmludGVybmFscykKKyAgICAgICAgaW50 ZXJuYWxzLnNldHRpbmdzLnNldENvbnRlbnRDaGFuZ2VPYnNlcnZlckVuYWJsZWQodHJ1ZSk7CisK KyAgICB0ZXN0UnVubmVyLndhaXRVbnRpbERvbmUoKTsKKyAgICB0ZXN0UnVubmVyLmR1bXBBc1Rl eHQoKTsKKworICAgIGxldCByZWN0ID0gdGFwdGhpcy5nZXRCb3VuZGluZ0NsaWVudFJlY3QoKTsK KyAgICBsZXQgeCA9IHJlY3QubGVmdCArIHJlY3Qud2lkdGggLyAyOworICAgIGxldCB5ID0gcmVj dC50b3AgKyByZWN0LmhlaWdodCAvIDI7CisKKyAgICBhd2FpdCB0YXBBdFBvaW50KHgsIHkpOwor fQorPC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keSBvbmxvYWQ9InRlc3QoKSI+Cis8ZGl2IGlkPXRh cHRoaXMgcm9sZT0iYnV0dG9uIj5QQVNTIGlmICdjbGlja2VkJyB0ZXh0IGlzIG5vdCBzaG93biBi ZWxvdy48L2Rpdj4KKzxkaXYgaWQ9YmVjb21lc1Zpc2libGU+PC9kaXY+Cis8cHJlIGlkPXJlc3Vs dD48L3ByZT4KKzxzY3JpcHQ+Cit0YXB0aGlzLmFkZEV2ZW50TGlzdGVuZXIoIm1vdXNlbW92ZSIs IGZ1bmN0aW9uKCBldmVudCApIHsKKyAgICBiZWNvbWVzVmlzaWJsZS5zdHlsZS52aXNpYmlsaXR5 ID0gInZpc2libGUiOworfSwgZmFsc2UpOworCitiZWNvbWVzVmlzaWJsZS5hZGRFdmVudExpc3Rl bmVyKCJjbGljayIsIGZ1bmN0aW9uKCBldmVudCApIHsgICAKKyAgICByZXN1bHQuaW5uZXJIVE1M ID0gImNsaWNrZWQgaGlkZGVuIjsKK30sIGZhbHNlKTsKKwordGFwdGhpcy5hZGRFdmVudExpc3Rl bmVyKCJjbGljayIsIGZ1bmN0aW9uKCBldmVudCApIHsgICAKKyAgICByZXN1bHQuaW5uZXJIVE1M ID0gImNsaWNrZWQiOworICAgIGlmICh3aW5kb3cudGVzdFJ1bm5lcikKKyAgICAgICAgdGVzdFJ1 bm5lci5ub3RpZnlEb25lKCk7Cit9LCBmYWxzZSk7Cis8L3NjcmlwdD4KKzwvYm9keT4KKzwvaHRt bD4K 367641 2019-04-17 10:08:59 -0700 2019-04-17 11:57:57 -0700 Patch bug-196988-20190417100858.patch text/plain 10265 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ0Mzc5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDRlNGJkYjE3ZGEyMzgz OThkMmJiMjE2NzFjY2VhOGRmNGJmYzRhOC4uZDI3MzkzZGVhZGUxOTlkNTZlMGU0NDYxYTNjYjRh YjRhMTkzNjE3MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE5LTA0LTE3ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0NvbnRlbnRDaGFuZ2VPYnNl cnZlcl0gVXNlIGFyaWEgcm9sZSBhcyBhIGhpbnQgd2hldGhlciBhIHRhcCBzaG91bGQgcmVzdWx0 IGluIGEgc3ludGhldGljIGNsaWNrCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xOTY5ODgKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzQ5OTU1MzI4Pgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRlc3Q6IGZh c3QvZXZlbnRzL3RvdWNoL2lvcy9jb250ZW50LW9ic2VydmF0aW9uL3RhcC1vbi1pbnB1dC1sb29r aW5nLWRpdi13aXRoLXJvbGUuaHRtbAorCisgICAgICAgICogYWNjZXNzaWJpbGl0eS9BY2Nlc3Np YmlsaXR5T2JqZWN0Lmg6CisKIDIwMTktMDQtMTcgIFJvYiBCdWlzICA8cmJ1aXNAaWdhbGlhLmNv bT4KIAogICAgICAgICBYTUxIdHRwUmVxdWVzdCBoYXMgdGhlIHdyb25nIGZhbGxiYWNrIGVuY29k aW5nCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQv Q2hhbmdlTG9nCmluZGV4IDc1MGM3NGViNzhkMzg5ZDM0ZWFmODYyMzQ3YTZlOGM0NjJlYzg1Nzcu LmU2OWIzMzQ2ZmFjYTA1ZjQ3Yzg2NGRkMTIyMzk1NDVjNWQwZjllOWUgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMTggQEAKKzIwMTktMDQtMTcgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4K KworICAgICAgICBbQ29udGVudENoYW5nZU9ic2VydmVyXSBVc2UgYXJpYSByb2xlIGFzIGEgaGlu dCB3aGV0aGVyIGEgdGFwIHNob3VsZCByZXN1bHQgaW4gYSBzeW50aGV0aWMgY2xpY2sKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5Njk4OAorICAgICAg ICA8cmRhcjovL3Byb2JsZW0vNDk5NTUzMjg+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgVGFwcGluZyBvbiBlbGVtZW50cyB3aXRoIGNyZXRhaW4gYXJp YSByb2xlIGF0dHJpYnV0ZXMgc2hvdWxkIHRyaWdnZXIgc3ludGhldGljIGNsaWNrIHRoZSBzYW1l IHdheSBpdCBkb2VzIG9uIGZvcm0gY29udHJvbCBlbGVtZW50cy4gCisKKyAgICAgICAgKiBXZWJQ cm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW06CisgICAgICAgIChXZWJLaXQ6OmlzQXJp YVJvbGVGb3JJbW1lZGlhdGVDbGljayk6CisgICAgICAgIChXZWJLaXQ6Om5vZGVBbHdheXNSZXF1 aXJlc0NsaWNrKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6aGFuZGxlU3ludGhldGljQ2xp Y2spOgorCiAyMDE5LTA0LTE2ICBBbmR5IEVzdGVzICA8YWVzdGVzQGFwcGxlLmNvbT4KIAogICAg ICAgICBbaU9TTWFjXSBVc2UgVUlEb2N1bWVudFBpY2tlclZpZXdDb250cm9sbGVyIGZvciBwaWNr aW5nIGZpbGVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vz c2liaWxpdHlPYmplY3QuY3BwIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3Np YmlsaXR5T2JqZWN0LmNwcAppbmRleCA5NGNjYTA0ZjU2ZDZkMzRjYmM2OWQ3MzFhODk1ZDk3YTBl ZDA4MmZjLi5jMDA1NTdlNTk2OTBhMTZhYjZmNjAwNzA1OTFhZTc4MWUxYjE2YjNkIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdC5j cHAKQEAgLTI1MTQsNyArMjUxNCw5IEBAIHN0YXRpYyBBUklBUmV2ZXJzZVJvbGVNYXAmIHJldmVy c2VBcmlhUm9sZU1hcCgpCiAKIEFjY2Vzc2liaWxpdHlSb2xlIEFjY2Vzc2liaWxpdHlPYmplY3Q6 OmFyaWFSb2xlVG9XZWJDb3JlUm9sZShjb25zdCBTdHJpbmcmIHZhbHVlKQogewotICAgIEFTU0VS VCghdmFsdWUuaXNFbXB0eSgpKTsKKyAgICBpZiAodmFsdWUuaXNOdWxsKCkgfHwgdmFsdWUuaXNF bXB0eSgpKQorICAgICAgICByZXR1cm4gQWNjZXNzaWJpbGl0eVJvbGU6OlVua25vd247CisKICAg ICBmb3IgKGF1dG8gcm9sZU5hbWUgOiBTdHJpbmdWaWV3KHZhbHVlKS5zcGxpdCgnICcpKSB7CiAg ICAgICAgIEFjY2Vzc2liaWxpdHlSb2xlIHJvbGUgPSBhcmlhUm9sZU1hcCgpLmdldDxBU0NJSUNh c2VJbnNlbnNpdGl2ZVN0cmluZ1ZpZXdIYXNoVHJhbnNsYXRvcj4ocm9sZU5hbWUpOwogICAgICAg ICBpZiAoc3RhdGljX2Nhc3Q8aW50Pihyb2xlKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdC5oIGIvU291cmNlL1dlYkNvcmUvYWNj ZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmgKaW5kZXggZDRmNzU2YTcyYTEzZTAyNGNj OTZiN2Y4NDIyYmEyMTQ4NjIxMDA2Yy4uYjc0OTM2ODgxOWY4OTM4ZTdhOWQ5ZDQxYTUyODM2ZTFl NzU5ZTdjNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3Np YmlsaXR5T2JqZWN0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3Np YmlsaXR5T2JqZWN0LmgKQEAgLTUyNSw4ICs1MjUsOCBAQCBwdWJsaWM6CiAgICAgQWNjZXNzaWJp bGl0eU9iamVjdCogc2VsZWN0ZWRMaXN0SXRlbSgpOwogICAgIHZpcnR1YWwgaW50IGxheW91dENv dW50KCkgY29uc3QgeyByZXR1cm4gMDsgfQogICAgIHZpcnR1YWwgZG91YmxlIGVzdGltYXRlZExv YWRpbmdQcm9ncmVzcygpIGNvbnN0IHsgcmV0dXJuIDA7IH0KLSAgICBzdGF0aWMgYm9vbCBpc0FS SUFDb250cm9sKEFjY2Vzc2liaWxpdHlSb2xlKTsKLSAgICBzdGF0aWMgYm9vbCBpc0FSSUFJbnB1 dChBY2Nlc3NpYmlsaXR5Um9sZSk7CisgICAgV0VCQ09SRV9FWFBPUlQgc3RhdGljIGJvb2wgaXNB UklBQ29udHJvbChBY2Nlc3NpYmlsaXR5Um9sZSk7CisgICAgV0VCQ09SRV9FWFBPUlQgc3RhdGlj IGJvb2wgaXNBUklBSW5wdXQoQWNjZXNzaWJpbGl0eVJvbGUpOwogCiAgICAgdmlydHVhbCBib29s IHN1cHBvcnRzQVJJQU93bnMoKSBjb25zdCB7IHJldHVybiBmYWxzZTsgfQogICAgIGJvb2wgaXNB Y3RpdmVEZXNjZW5kYW50T2ZGb2N1c2VkQ29udGFpbmVyKCkgY29uc3Q7CkBAIC03NTUsNyArNzU1 LDcgQEAgcHVibGljOgogICAgIGJvb2wgaXNBbmNlc3Rvck9mT2JqZWN0KGNvbnN0IEFjY2Vzc2li aWxpdHlPYmplY3QqKSBjb25zdDsKICAgICBBY2Nlc3NpYmlsaXR5T2JqZWN0KiBmaXJzdEFub255 bW91c0Jsb2NrQ2hpbGQoKSBjb25zdDsKIAotICAgIHN0YXRpYyBBY2Nlc3NpYmlsaXR5Um9sZSBh cmlhUm9sZVRvV2ViQ29yZVJvbGUoY29uc3QgU3RyaW5nJik7CisgICAgV0VCQ09SRV9FWFBPUlQg c3RhdGljIEFjY2Vzc2liaWxpdHlSb2xlIGFyaWFSb2xlVG9XZWJDb3JlUm9sZShjb25zdCBTdHJp bmcmKTsKICAgICBib29sIGhhc0F0dHJpYnV0ZShjb25zdCBRdWFsaWZpZWROYW1lJikgY29uc3Q7 CiAgICAgY29uc3QgQXRvbWljU3RyaW5nJiBnZXRBdHRyaWJ1dGUoY29uc3QgUXVhbGlmaWVkTmFt ZSYpIGNvbnN0OwogICAgIGJvb2wgaGFzVGFnTmFtZShjb25zdCBRdWFsaWZpZWROYW1lJikgY29u c3Q7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2Vi UGFnZUlPUy5tbSBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdl SU9TLm1tCmluZGV4IDkwZDdiNzM4ZDllNDA5ZGI5ODFjOTYwM2MzM2MzYmVlNTI2ZjEyYTcuLjg2 YWU0Y2FhZDI4MmVhZGU0NmY1MzBhMDZhNjRiNjdjNTYxYTAxNGUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdlSU9TLm1tCisrKyBiL1NvdXJj ZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdlSU9TLm1tCkBAIC01NjYsNiAr NTY2LDE4IEBAIHN0YXRpYyB2b2lkIGRpc3BhdGNoU3ludGhldGljTW91c2VNb3ZlKEZyYW1lJiBt YWluRnJhbWUsIGNvbnN0IFdlYkNvcmU6OkZsb2F0UG9pCiAgICAgbWFpbkZyYW1lLmV2ZW50SGFu ZGxlcigpLmRpc3BhdGNoU3ludGhldGljTW91c2VNb3ZlKG1vdXNlRXZlbnQpOwogfQogCitzdGF0 aWMgYm9vbCBub2RlQWx3YXlzVHJpZ2dlcnNDbGljayhjb25zdCBOb2RlJiB0YXJnZXROb2RlKQor eworICAgIGlmICghaXM8RWxlbWVudD4odGFyZ2V0Tm9kZSkpCisgICAgICAgIHJldHVybiBmYWxz ZTsKKworICAgIGlmIChpczxIVE1MRm9ybUNvbnRyb2xFbGVtZW50Pih0YXJnZXROb2RlKSkKKyAg ICAgICAgcmV0dXJuIHRydWU7CisKKyAgICBhdXRvIGFyaWFSb2xlID0gQWNjZXNzaWJpbGl0eU9i amVjdDo6YXJpYVJvbGVUb1dlYkNvcmVSb2xlKGRvd25jYXN0PEVsZW1lbnQ+KHRhcmdldE5vZGUp LmdldEF0dHJpYnV0ZShIVE1MTmFtZXM6OnJvbGVBdHRyKSk7CisgICAgcmV0dXJuIEFjY2Vzc2li aWxpdHlPYmplY3Q6OmlzQVJJQUNvbnRyb2woYXJpYVJvbGUpIHx8IEFjY2Vzc2liaWxpdHlPYmpl Y3Q6OmlzQVJJQUlucHV0KGFyaWFSb2xlKTsKK30KKwogdm9pZCBXZWJQYWdlOjpoYW5kbGVTeW50 aGV0aWNDbGljayhOb2RlJiBub2RlUmVzcG9uZGluZ1RvQ2xpY2ssIGNvbnN0IFdlYkNvcmU6OkZs b2F0UG9pbnQmIGxvY2F0aW9uLCBPcHRpb25TZXQ8V2ViRXZlbnQ6Ok1vZGlmaWVyPiBtb2RpZmll cnMpCiB7CiAgICAgaWYgKCFub2RlUmVzcG9uZGluZ1RvQ2xpY2suZG9jdW1lbnQoKS5zZXR0aW5n cygpLmNvbnRlbnRDaGFuZ2VPYnNlcnZlckVuYWJsZWQoKSkgewpAQCAtNTg3LDggKzU5OSw5IEBA IHZvaWQgV2ViUGFnZTo6aGFuZGxlU3ludGhldGljQ2xpY2soTm9kZSYgbm9kZVJlc3BvbmRpbmdU b0NsaWNrLCBjb25zdCBXZWJDb3JlOjpGCiAKICAgICBhdXRvJiBjb250ZW50Q2hhbmdlT2JzZXJ2 ZXIgPSByZXNwb25kaW5nRG9jdW1lbnQuY29udGVudENoYW5nZU9ic2VydmVyKCk7CiAgICAgYXV0 byBvYnNlcnZlZENvbnRlbnRDaGFuZ2UgPSBjb250ZW50Q2hhbmdlT2JzZXJ2ZXIub2JzZXJ2ZWRD b250ZW50Q2hhbmdlKCk7CisgICAgYXV0byB0YXJnZXROb2RlVHJpZ2dlcnNDbGljayA9IG5vZGVB bHdheXNUcmlnZ2Vyc0NsaWNrKG5vZGVSZXNwb25kaW5nVG9DbGljayk7CiAKLSAgICBhdXRvIGNv bnRpbnVlQ29udGVudE9ic2VydmF0aW9uID0gIShvYnNlcnZlZENvbnRlbnRDaGFuZ2UgPT0gV0tD b250ZW50VmlzaWJpbGl0eUNoYW5nZSB8fCBpczxIVE1MRm9ybUNvbnRyb2xFbGVtZW50Pihub2Rl UmVzcG9uZGluZ1RvQ2xpY2spKTsKKyAgICBhdXRvIGNvbnRpbnVlQ29udGVudE9ic2VydmF0aW9u ID0gIShvYnNlcnZlZENvbnRlbnRDaGFuZ2UgPT0gV0tDb250ZW50VmlzaWJpbGl0eUNoYW5nZSB8 fCB0YXJnZXROb2RlVHJpZ2dlcnNDbGljayk7CiAgICAgaWYgKGNvbnRpbnVlQ29udGVudE9ic2Vy dmF0aW9uKSB7CiAgICAgICAgIC8vIFdhaXQgZm9yIGNhbGxiYWNrIHRvIGNvbXBsZXRlUGVuZGlu Z1N5bnRoZXRpY0NsaWNrRm9yQ29udGVudENoYW5nZU9ic2VydmVyKCkgdG8gZGVjaWRlIHdoZXRo ZXIgdG8gc2VuZCB0aGUgY2xpY2sgZXZlbnQuCiAgICAgICAgIGNvbnN0IFNlY29uZHMgb2JzZXJ2 YXRpb25EdXJhdGlvbiA9IDMyX21zOwpAQCAtNjAwLDExICs2MTMsMTEgQEAgdm9pZCBXZWJQYWdl OjpoYW5kbGVTeW50aGV0aWNDbGljayhOb2RlJiBub2RlUmVzcG9uZGluZ1RvQ2xpY2ssIGNvbnN0 IFdlYkNvcmU6OkYKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAotICAgIGNhbGxPbk1haW5UaHJl YWQoW3Byb3RlY3RlZFRoaXMgPSBtYWtlUmVmUHRyKHRoaXMpLCB0YXJnZXROb2RlID0gUmVmPE5v ZGU+KG5vZGVSZXNwb25kaW5nVG9DbGljayksIGxvY2F0aW9uLCBtb2RpZmllcnMsIG9ic2VydmVk Q29udGVudENoYW5nZV0geworICAgIGNhbGxPbk1haW5UaHJlYWQoW3Byb3RlY3RlZFRoaXMgPSBt YWtlUmVmUHRyKHRoaXMpLCB0YXJnZXROb2RlID0gUmVmPE5vZGU+KG5vZGVSZXNwb25kaW5nVG9D bGljayksIGxvY2F0aW9uLCBtb2RpZmllcnMsIG9ic2VydmVkQ29udGVudENoYW5nZSwgdGFyZ2V0 Tm9kZVRyaWdnZXJzQ2xpY2tdIHsKICAgICAgICAgaWYgKHByb3RlY3RlZFRoaXMtPm1faXNDbG9z ZWQgfHwgIXByb3RlY3RlZFRoaXMtPmNvcmVQYWdlKCkpCiAgICAgICAgICAgICByZXR1cm47CiAK LSAgICAgICAgYXV0byBzaG91bGRTdGF5QXRIb3ZlclN0YXRlID0gb2JzZXJ2ZWRDb250ZW50Q2hh bmdlID09IFdLQ29udGVudFZpc2liaWxpdHlDaGFuZ2UgJiYgIWlzPEhUTUxGb3JtQ29udHJvbEVs ZW1lbnQ+KHRhcmdldE5vZGUpOworICAgICAgICBhdXRvIHNob3VsZFN0YXlBdEhvdmVyU3RhdGUg PSBvYnNlcnZlZENvbnRlbnRDaGFuZ2UgPT0gV0tDb250ZW50VmlzaWJpbGl0eUNoYW5nZSAmJiAh dGFyZ2V0Tm9kZVRyaWdnZXJzQ2xpY2s7CiAgICAgICAgIGlmIChzaG91bGRTdGF5QXRIb3ZlclN0 YXRlKSB7CiAgICAgICAgICAgICAvLyBUaGUgbW92ZSBldmVudCBjYXVzZWQgbmV3IGNvbnRlbnRz IHRvIGFwcGVhci4gRG9uJ3Qgc2VuZCBzeW50aGV0aWMgY2xpY2sgZXZlbnQsIGJ1dCBqdXN0IGVu c3VyZSB0aGF0IHRoZSBtb3VzZSBpcyBvbiB0aGUgbW9zdCByZWNlbnQgY29udGVudC4KICAgICAg ICAgICAgIGRpc3BhdGNoU3ludGhldGljTW91c2VNb3ZlKHByb3RlY3RlZFRoaXMtPmNvcmVQYWdl KCktPm1haW5GcmFtZSgpLCBsb2NhdGlvbiwgbW9kaWZpZXJzKTsKZGlmZiAtLWdpdCBhL0xheW91 dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBmZjg1ODI5ZjZi MGEyNzgzOTU2ZmQ3ZWMwNjY4MTZhZTE4MjcxMTdhLi5lYTM0NzJlZjg5MDQ3ZWE0M2QxZDcyOTJl NThhYzMyMmQ3NzUwNWE1IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIv TGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTktMDQtMTcgIFphbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbQ29udGVudENoYW5nZU9ic2Vy dmVyXSBVc2UgYXJpYSByb2xlIGFzIGEgaGludCB3aGV0aGVyIGEgdGFwIHNob3VsZCByZXN1bHQg aW4gYSBzeW50aGV0aWMgY2xpY2sKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE5Njk4OAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDk5NTUzMjg+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBmYXN0L2V2 ZW50cy90b3VjaC9pb3MvY29udGVudC1vYnNlcnZhdGlvbi90YXAtb24taW5wdXQtbG9va2luZy1k aXYtd2l0aC1yb2xlLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogZmFzdC9ldmVudHMv dG91Y2gvaW9zL2NvbnRlbnQtb2JzZXJ2YXRpb24vdGFwLW9uLWlucHV0LWxvb2tpbmctZGl2LXdp dGgtcm9sZS5odG1sOiBBZGRlZC4KKwogMjAxOS0wNC0xNyAgWmFsYW4gQnVqdGFzICA8emFsYW5A YXBwbGUuY29tPgogCiAJCVtpT1NdIFVucmV2aWV3ZWQgZ2FyZGVuaW5nLgpkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvZmFzdC9ldmVudHMvdG91Y2gvaW9zL2NvbnRlbnQtb2JzZXJ2YXRpb24vdGFw LW9uLWlucHV0LWxvb2tpbmctZGl2LXdpdGgtcm9sZS1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0 cy9mYXN0L2V2ZW50cy90b3VjaC9pb3MvY29udGVudC1vYnNlcnZhdGlvbi90YXAtb24taW5wdXQt bG9va2luZy1kaXYtd2l0aC1yb2xlLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NApp bmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi42NzdlM2EzMWU0 ZDI3NTkzYWE5NGRiZDYzN2E0NTNhZjhjZWRkZDc4Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0 VGVzdHMvZmFzdC9ldmVudHMvdG91Y2gvaW9zL2NvbnRlbnQtb2JzZXJ2YXRpb24vdGFwLW9uLWlu cHV0LWxvb2tpbmctZGl2LXdpdGgtcm9sZS1leHBlY3RlZC50eHQKQEAgLTAsMCArMSwyIEBACitQ QVNTIGlmICdjbGlja2VkJyB0ZXh0IGlzIHNob3duIGJlbG93LgorY2xpY2tlZApkaWZmIC0tZ2l0 IGEvTGF5b3V0VGVzdHMvZmFzdC9ldmVudHMvdG91Y2gvaW9zL2NvbnRlbnQtb2JzZXJ2YXRpb24v dGFwLW9uLWlucHV0LWxvb2tpbmctZGl2LXdpdGgtcm9sZS5odG1sIGIvTGF5b3V0VGVzdHMvZmFz dC9ldmVudHMvdG91Y2gvaW9zL2NvbnRlbnQtb2JzZXJ2YXRpb24vdGFwLW9uLWlucHV0LWxvb2tp bmctZGl2LXdpdGgtcm9sZS5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmFkMzk3ZmJjYzIwYWI5ZmVlZGE5ZTFj NWM1MmRmM2MzMDNkZWM5N2IKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2V2 ZW50cy90b3VjaC9pb3MvY29udGVudC1vYnNlcnZhdGlvbi90YXAtb24taW5wdXQtbG9va2luZy1k aXYtd2l0aC1yb2xlLmh0bWwKQEAgLTAsMCArMSw1NyBAQAorPGh0bWw+Cis8aGVhZD4KKzx0aXRs ZT5UaGlzIHRlc3RzIHRoZSBjYXNlIHdoZW4gdGhlIHRhcCB0YXJnZXQgbm9kZSBoYXMgZm9ybSBj b250cm9sIGFyaWEgcm9sZS48L3RpdGxlPgorPHNjcmlwdCBzcmM9Ii4uLy4uLy4uLy4uLy4uL3Jl c291cmNlcy9iYXNpYy1nZXN0dXJlcy5qcyI+PC9zY3JpcHQ+Cis8c3R5bGU+CisjdGFwdGhpcyB7 CisgICAgd2lkdGg6IDQwMHB4OworICAgIGhlaWdodDogNDAwcHg7CisgICAgYm9yZGVyOiAxcHgg c29saWQgZ3JlZW47Cit9CisKKyNiZWNvbWVzVmlzaWJsZSB7CisgICAgdmlzaWJpbGl0eTogaGlk ZGVuOworICAgIHdpZHRoOiAxMDBweDsKKyAgICBoZWlnaHQ6IDEwMHB4OworICAgIGJhY2tncm91 bmQtY29sb3I6IGdyZWVuOworfQorPC9zdHlsZT4KKzxzY3JpcHQ+Cithc3luYyBmdW5jdGlvbiB0 ZXN0KCkgeworICAgIGlmICghd2luZG93LnRlc3RSdW5uZXIgfHwgIXRlc3RSdW5uZXIucnVuVUlT Y3JpcHQpCisgICAgICAgIHJldHVybjsKKyAgICBpZiAod2luZG93LmludGVybmFscykKKyAgICAg ICAgaW50ZXJuYWxzLnNldHRpbmdzLnNldENvbnRlbnRDaGFuZ2VPYnNlcnZlckVuYWJsZWQodHJ1 ZSk7CisKKyAgICB0ZXN0UnVubmVyLndhaXRVbnRpbERvbmUoKTsKKyAgICB0ZXN0UnVubmVyLmR1 bXBBc1RleHQoKTsKKworICAgIGxldCByZWN0ID0gdGFwdGhpcy5nZXRCb3VuZGluZ0NsaWVudFJl Y3QoKTsKKyAgICBsZXQgeCA9IHJlY3QubGVmdCArIHJlY3Qud2lkdGggLyAyOworICAgIGxldCB5 ID0gcmVjdC50b3AgKyByZWN0LmhlaWdodCAvIDI7CisKKyAgICBhd2FpdCB0YXBBdFBvaW50KHgs IHkpOworfQorPC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keSBvbmxvYWQ9InRlc3QoKSI+Cis8ZGl2 IGlkPXRhcHRoaXMgcm9sZT0iYnV0dG9uIj5QQVNTIGlmICdjbGlja2VkJyB0ZXh0IGlzIHNob3du IGJlbG93LjwvZGl2PgorPGRpdiBpZD1iZWNvbWVzVmlzaWJsZT48L2Rpdj4KKzxwcmUgaWQ9cmVz dWx0PjwvcHJlPgorPHNjcmlwdD4KK3RhcHRoaXMuYWRkRXZlbnRMaXN0ZW5lcigibW91c2Vtb3Zl IiwgZnVuY3Rpb24oIGV2ZW50ICkgeworICAgIGJlY29tZXNWaXNpYmxlLnN0eWxlLnZpc2liaWxp dHkgPSAidmlzaWJsZSI7Cit9LCBmYWxzZSk7CisKK2JlY29tZXNWaXNpYmxlLmFkZEV2ZW50TGlz dGVuZXIoImNsaWNrIiwgZnVuY3Rpb24oIGV2ZW50ICkgeyAgIAorICAgIHJlc3VsdC5pbm5lckhU TUwgPSAiY2xpY2tlZCBoaWRkZW4iOworfSwgZmFsc2UpOworCit0YXB0aGlzLmFkZEV2ZW50TGlz dGVuZXIoImNsaWNrIiwgZnVuY3Rpb24oIGV2ZW50ICkgeyAgIAorICAgIHJlc3VsdC5pbm5lckhU TUwgPSAiY2xpY2tlZCI7CisgICAgaWYgKHdpbmRvdy50ZXN0UnVubmVyKQorICAgICAgICB0ZXN0 UnVubmVyLm5vdGlmeURvbmUoKTsKK30sIGZhbHNlKTsKKzwvc2NyaXB0PgorPC9ib2R5PgorPC9o dG1sPgo=