171175 2017-04-22 16:22:02 -0700 [ATK] Expose value of aria-keyshortcuts as object attribute 2017-10-11 10:04:48 -0700 1 1 1 Unclassified WebKit Accessibility WebKit Nightly Build All Linux RESOLVED FIXED InRadar P2 Normal --- 1 jdiggs jdiggs aboxhall apinheiro buildbot cdumez cfleizach commit-queue dmazzoni esprehn+autocc gyuyoung.kim jcraig samuel_white webkit-bug-importer oldest_to_newest 1300241 0 jdiggs 2017-04-22 16:22:02 -0700 https://rawgit.com/w3c/aria/master/core-aam/core-aam.html#ariaKeyshortcuts 1300242 1 webkit-bug-importer 2017-04-22 16:22:16 -0700 <rdar://problem/31775615> 1359041 2 323384 jdiggs 2017-10-10 21:43:39 -0700 Created attachment 323384 Patch 1359062 3 323384 cfleizach 2017-10-10 23:15:21 -0700 Comment on attachment 323384 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=323384&action=review > Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp:605 > + String keyShortcuts = coreObject->getAttribute(HTMLNames::aria_keyshortcutsAttr); can we plumb this through AccessibilityObject? 1359063 4 jdiggs 2017-10-10 23:30:00 -0700 (In reply to chris fleizach from comment #3) > Comment on attachment 323384 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=323384&action=review > > > Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp:605 > > + String keyShortcuts = coreObject->getAttribute(HTMLNames::aria_keyshortcutsAttr); > > can we plumb this through AccessibilityObject? We could. But I was going for the minimal amount of change given what was stated in bug 159215 (i.e. doubts about what support for this new ARIA feature would entail). If we do add support in AccessibilityObject, should we just return the value as-is, or convert it to a Vector as was done for AccessibilityRenderObject::determineARIADropEffects()? 1359066 5 323384 cfleizach 2017-10-10 23:39:31 -0700 Comment on attachment 323384 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=323384&action=review >>> Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp:605 >>> + String keyShortcuts = coreObject->getAttribute(HTMLNames::aria_keyshortcutsAttr); >> >> can we plumb this through AccessibilityObject? > > We could. But I was going for the minimal amount of change given what was stated in bug 159215 (i.e. doubts about what support for this new ARIA feature would entail). > > If we do add support in AccessibilityObject, should we just return the value as-is, or convert it to a Vector as was done for AccessibilityRenderObject::determineARIADropEffects()? I think probably just a pass through for the time being 1359089 6 323397 jdiggs 2017-10-11 01:37:03 -0700 Created attachment 323397 Patch 1359225 7 323397 commit-queue 2017-10-11 10:04:46 -0700 Comment on attachment 323397 Patch Clearing flags on attachment: 323397 Committed r223190: <https://trac.webkit.org/changeset/223190> 1359226 8 commit-queue 2017-10-11 10:04:48 -0700 All reviewed patches have been landed. Closing bug. 323384 2017-10-10 21:43:39 -0700 2017-10-11 01:36:58 -0700 Patch bug-171175-20171011064337.patch text/plain 5782 jdiggs U3VidmVyc2lvbiBSZXZpc2lvbjogMjIzMTQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTU1ZGVmZjMwYjRhNWEx Njk1YmFiNzg1ZjA2MzMzMGNjYzZiZjdlYy4uODE1OGZmZDhiZmU4ZGM2Y2I1OGVjZDA3NTQ5YjM2 NmZlMmU5MGM1NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE3LTEwLTEwICBKb2Fu bWFyaWUgRGlnZ3MgIDxqZGlnZ3NAaWdhbGlhLmNvbT4KKworICAgICAgICBbQVRLXSBFeHBvc2Ug dmFsdWUgb2YgYXJpYS1rZXlzaG9ydGN1dHMgYXMgb2JqZWN0IGF0dHJpYnV0ZQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTcxMTc1CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRXhwb3NlIHRoZSBhdXRob3It cHJvdmlkZWQgc3RyaW5nIHRocm91Z2ggdGhlICJrZXlzaG9ydGN1dHMiIG9iamVjdCBhdHRyaWJ1 dGUuCisKKyAgICAgICAgVGVzdDogYWNjZXNzaWJpbGl0eS9ndGsvYXJpYS1rZXlzaG9ydGN1dHMu aHRtbAorCisgICAgICAgICogYWNjZXNzaWJpbGl0eS9hdGsvV2ViS2l0QWNjZXNzaWJsZVdyYXBw ZXJBdGsuY3BwOgorICAgICAgICAod2Via2l0QWNjZXNzaWJsZUdldEF0dHJpYnV0ZXMpOgorICAg ICAgICAqIGh0bWwvSFRNTEF0dHJpYnV0ZU5hbWVzLmluOgorCiAyMDE3LTEwLTEwICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgogCiAgICAgICAgIExvYWRpbmcgc2hvdWxkIGJlIGRp c2FibGVkIHdoaWxlIGNvbnN0cnVjdGluZyB0aGUgZnJhZ21lbnQgaW4gV2ViQ29udGVudFJlYWRl cjo6cmVhZFdlYkFyY2hpdmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxp dHkvYXRrL1dlYktpdEFjY2Vzc2libGVXcmFwcGVyQXRrLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Fj Y2Vzc2liaWxpdHkvYXRrL1dlYktpdEFjY2Vzc2libGVXcmFwcGVyQXRrLmNwcAppbmRleCBjNTM2 ZGI2OTExMzIwZjgyYzFmNGY2MGVkODc5NGFhNWE3ZGExNzVlLi5mYzk5OWZjODBjYjk1ZDQwMDY1 MjFhY2FhMmNiZmQ2NDkxNjY0NGViIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3Np YmlsaXR5L2F0ay9XZWJLaXRBY2Nlc3NpYmxlV3JhcHBlckF0ay5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvYWNjZXNzaWJpbGl0eS9hdGsvV2ViS2l0QWNjZXNzaWJsZVdyYXBwZXJBdGsuY3BwCkBA IC02MDEsNiArNjAxLDExIEBAIHN0YXRpYyBBdGtBdHRyaWJ1dGVTZXQqIHdlYmtpdEFjY2Vzc2li bGVHZXRBdHRyaWJ1dGVzKEF0a09iamVjdCogb2JqZWN0KQogICAgIGVsc2UgaWYgKGNvcmVPYmpl Y3QtPnN1cHBvcnRzQVJJQURyYWdnaW5nKCkpCiAgICAgICAgIGF0dHJpYnV0ZVNldCA9IGFkZFRv QXRrQXR0cmlidXRlU2V0KGF0dHJpYnV0ZVNldCwgImdyYWJiZWQiLCAiZmFsc2UiKTsKIAorICAg IC8vIFRoZSBDb3JlIEFBTSBzdGF0ZXMgdGhlIGF1dGhvci1wcm92aWRlZCB2YWx1ZSBzaG91bGQg YmUgZXhwb3NlZCBhcy1pcy4KKyAgICBTdHJpbmcga2V5U2hvcnRjdXRzID0gY29yZU9iamVjdC0+ Z2V0QXR0cmlidXRlKEhUTUxOYW1lczo6YXJpYV9rZXlzaG9ydGN1dHNBdHRyKTsKKyAgICBpZiAo IWtleVNob3J0Y3V0cy5pc0VtcHR5KCkpCisgICAgICAgIGF0dHJpYnV0ZVNldCA9IGFkZFRvQXRr QXR0cmlidXRlU2V0KGF0dHJpYnV0ZVNldCwgImtleXNob3J0Y3V0cyIsIGtleVNob3J0Y3V0cy51 dGY4KCkuZGF0YSgpKTsKKwogICAgIHJldHVybiBhdHRyaWJ1dGVTZXQ7CiB9CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEF0dHJpYnV0ZU5hbWVzLmluIGIvU291cmNlL1dl YkNvcmUvaHRtbC9IVE1MQXR0cmlidXRlTmFtZXMuaW4KaW5kZXggMzE4YzhlZWExZmEwZGE1NGQ1 MTI3MGQxYzU0ZTI5M2Y1NjVkMzM4NC4uOTdiNjc0MjczMmExYzZlMWViMGEyNjk4ZDZmOTIzMWQ2 NTRhZDAxMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MQXR0cmlidXRlTmFt ZXMuaW4KKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MQXR0cmlidXRlTmFtZXMuaW4KQEAg LTM1LDYgKzM1LDcgQEAgYXJpYS1oYXNwb3B1cAogYXJpYS1oZWxwCiBhcmlhLWhpZGRlbgogYXJp YS1pbnZhbGlkCithcmlhLWtleXNob3J0Y3V0cwogYXJpYS1sYWJlbAogYXJpYS1sYWJlbGVkYnkK IGFyaWEtbGFiZWxsZWRieQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5 b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDg1NjQ2ZDllZGE3YWFjMjk5NjcwZWFjYmVkYTQ5NmUz MjYwOGRhODcuLjEwOWJjZjhlODIwMWY5MjVlOTE3ZGViZDE5Nzc5OGU1NjRlNzJmYjAgMTAwNjQ0 Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cK QEAgLTEsMyArMSwxMyBAQAorMjAxNy0xMC0xMCAgSm9hbm1hcmllIERpZ2dzICA8amRpZ2dzQGln YWxpYS5jb20+CisKKyAgICAgICAgW0FUS10gRXhwb3NlIHZhbHVlIG9mIGFyaWEta2V5c2hvcnRj dXRzIGFzIG9iamVjdCBhdHRyaWJ1dGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE3MTE3NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogYWNjZXNzaWJpbGl0eS9ndGsvYXJpYS1rZXlzaG9ydGN1dHMtZXhw ZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L2d0ay9hcmlhLWtleXNo b3J0Y3V0cy5odG1sOiBBZGRlZC4KKwogMjAxNy0xMC0xMCAgUnlvc3VrZSBOaXdhICA8cm5pd2FA d2Via2l0Lm9yZz4KIAogICAgICAgICBMb2FkaW5nIHNob3VsZCBiZSBkaXNhYmxlZCB3aGlsZSBj b25zdHJ1Y3RpbmcgdGhlIGZyYWdtZW50IGluIFdlYkNvbnRlbnRSZWFkZXI6OnJlYWRXZWJBcmNo aXZlCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L2d0ay9hcmlhLWtleXNo b3J0Y3V0cy1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L2d0ay9hcmlh LWtleXNob3J0Y3V0cy1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uZWE3NzA1NDhjODBlYTdlYTNi ZjBiMjEwMDEyMjExYzYzNDQyYjUzNgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Fj Y2Vzc2liaWxpdHkvZ3RrL2FyaWEta2V5c2hvcnRjdXRzLWV4cGVjdGVkLnR4dApAQCAtMCwwICsx LDEzIEBACitUaGlzIHRlc3RzIHRoZSBleHBvc3VyZSBvZiB0aGUgdmFsdWUgb2YgYXJpYS1rZXlz aG9ydGN1dHMuCisKK09uIHN1Y2Nlc3MsIHlvdSB3aWxsIHNlZSBhIHNlcmllcyBvZiAiUEFTUyIg bWVzc2FnZXMsIGZvbGxvd2VkIGJ5ICJURVNUIENPTVBMRVRFIi4KKworCitBWFBsYXRmb3JtQXR0 cmlidXRlczogY29tcHV0ZWQtcm9sZTpidXR0b24sIHhtbC1yb2xlczpidXR0b24sIGh0bWwtaWQ6 dGVzdDEsIHRhZzpkaXYsIHRvb2xraXQ6V2ViS2l0R3RrCitBWFBsYXRmb3JtQXR0cmlidXRlczog Y29tcHV0ZWQtcm9sZTpidXR0b24sIHhtbC1yb2xlczpidXR0b24sIGh0bWwtaWQ6dGVzdDIsIHRh ZzpkaXYsIHRvb2xraXQ6V2ViS2l0R3RrCitBWFBsYXRmb3JtQXR0cmlidXRlczoga2V5c2hvcnRj dXRzOlNoaWZ0K1NwYWNlLCBjb21wdXRlZC1yb2xlOmJ1dHRvbiwgeG1sLXJvbGVzOmJ1dHRvbiwg aHRtbC1pZDp0ZXN0MywgdGFnOmRpdiwgdG9vbGtpdDpXZWJLaXRHdGsKK0FYUGxhdGZvcm1BdHRy aWJ1dGVzOiBrZXlzaG9ydGN1dHM6U2hpZnQrU3BhY2UgQWx0K1NwYWNlLCBjb21wdXRlZC1yb2xl OmJ1dHRvbiwgeG1sLXJvbGVzOmJ1dHRvbiwgaHRtbC1pZDp0ZXN0NCwgdGFnOmRpdiwgdG9vbGtp dDpXZWJLaXRHdGsKK1BBU1Mgc3VjY2Vzc2Z1bGx5UGFyc2VkIGlzIHRydWUKKworVEVTVCBDT01Q TEVURQorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L2d0ay9hcmlhLWtl eXNob3J0Y3V0cy5odG1sIGIvTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9ndGsvYXJpYS1rZXlz aG9ydGN1dHMuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4xNTVlM2Q3OWUwYWFkNWY4NGNiYWY2NGFjMzViZjZh NzUxOThhYzdmCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9n dGsvYXJpYS1rZXlzaG9ydGN1dHMuaHRtbApAQCAtMCwwICsxLDM5IEBACis8IURPQ1RZUEUgSFRN TCBQVUJMSUMgIi0vL0lFVEYvL0RURCBIVE1MLy9FTiI+Cis8aHRtbD4KKzxoZWFkPgorPHNjcmlw dCBzcmM9Ii4uLy4uL3Jlc291cmNlcy9qcy10ZXN0LXByZS5qcyI+PC9zY3JpcHQ+Cis8L2hlYWQ+ Cis8Ym9keSBpZD0iYm9keSI+Cis8ZGl2IGlkPSJjb250ZW50Ij4KKyAgPGRpdiBpZD0idGVzdDEi IHJvbGU9ImJ1dHRvbiIgdGFiaW5kZXg9IjAiPlg8L2Rpdj4KKyAgPGRpdiBpZD0idGVzdDIiIHJv bGU9ImJ1dHRvbiIgdGFiaW5kZXg9IjAiIGFyaWEta2V5c2hvcnRjdXRzPSIiPlg8L2Rpdj4KKyAg PGRpdiBpZD0idGVzdDMiIHJvbGU9ImJ1dHRvbiIgdGFiaW5kZXg9IjAiIGFyaWEta2V5c2hvcnRj dXRzPSJTaGlmdCtTcGFjZSI+WDwvZGl2PgorICA8ZGl2IGlkPSJ0ZXN0NCIgcm9sZT0iYnV0dG9u IiB0YWJpbmRleD0iMCIgYXJpYS1rZXlzaG9ydGN1dHM9IlNoaWZ0K1NwYWNlIEFsdCtTcGFjZSI+ WDwvZGl2PgorPC9kaXY+Cis8cCBpZD0iZGVzY3JpcHRpb24iPjwvcD4KKzxkaXYgaWQ9ImNvbnNv bGUiPjwvZGl2PgorPHNjcmlwdD4KKyAgICBmdW5jdGlvbiBwbGF0Zm9ybUF0dHJpYnV0ZXMoYXhF bGVtZW50KSB7CisgICAgICAgIHZhciBhbGxBdHRyaWJ1dGVzID0gYXhFbGVtZW50LmFsbEF0dHJp YnV0ZXMoKS5zcGxpdCgiXG4iKTsKKyAgICAgICAgdmFyIGxlbmd0aCA9IGFsbEF0dHJpYnV0ZXMu bGVuZ3RoOworICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IGxlbmd0aDsgaSsrKSB7CisgICAg ICAgICAgICB2YXIgc3RyaW5nID0gYWxsQXR0cmlidXRlc1tpXTsKKyAgICAgICAgICAgIGlmIChz dHJpbmcuc3RhcnRzV2l0aCgiQVhQbGF0Zm9ybUF0dHJpYnV0ZXMiKSkKKyAgICAgICAgICAgICAg ICByZXR1cm4gc3RyaW5nOworICAgICAgICB9CisgICAgICAgIHJldHVybiAiIjsKKyAgICB9CisK KyAgICBkZXNjcmlwdGlvbigiVGhpcyB0ZXN0cyB0aGUgZXhwb3N1cmUgb2YgdGhlIHZhbHVlIG9m IGFyaWEta2V5c2hvcnRjdXRzLiIpOworICAgIGlmICh3aW5kb3cuYWNjZXNzaWJpbGl0eUNvbnRy b2xsZXIpIHsKKyAgICAgICAgZm9yICh2YXIgaSA9IDE7IGkgPD0gNDsgaSsrKSB7CisgICAgICAg ICAgICB2YXIgYXhFbGVtZW50ID0gYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIuYWNjZXNzaWJsZUVs ZW1lbnRCeUlkKCJ0ZXN0IiArIGkpOworICAgICAgICAgICAgZGVidWcocGxhdGZvcm1BdHRyaWJ1 dGVzKGF4RWxlbWVudCkpOworICAgICAgICB9CisKKyAgICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVu dEJ5SWQoImNvbnRlbnQiKS5zdHlsZS52aXNpYmlsaXR5ID0gImhpZGRlbiI7CisgICAgfQorPC9z Y3JpcHQ+Cis8c2NyaXB0IHNyYz0iLi4vLi4vcmVzb3VyY2VzL2pzLXRlc3QtcG9zdC5qcyI+PC9z Y3JpcHQ+Cis8L2JvZHk+Cis8L2h0bWw+Cg== 323397 2017-10-11 01:37:03 -0700 2017-10-11 10:04:46 -0700 Patch bug-171175-20171011103701.patch text/plain 7290 jdiggs U3VidmVyc2lvbiBSZXZpc2lvbjogMjIzMTY3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDcxMjYwMGU4NTA2NDkz ZjU4ZWJhODAzMzgwOWI1NWQ4Yzk4ZTEwYi4uNjM1ZTQ4MTRjZmE0ZWNjNjA2YTRkMjE4MmIzMjI4 MTgyODA0NjM1NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE3LTEwLTExICBKb2Fu bWFyaWUgRGlnZ3MgIDxqZGlnZ3NAaWdhbGlhLmNvbT4KKworICAgICAgICBbQVRLXSBFeHBvc2Ug dmFsdWUgb2YgYXJpYS1rZXlzaG9ydGN1dHMgYXMgb2JqZWN0IGF0dHJpYnV0ZQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTcxMTc1CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRXhwb3NlIHRoZSBhdXRob3It cHJvdmlkZWQgc3RyaW5nIHRocm91Z2ggdGhlICJrZXlzaG9ydGN1dHMiIG9iamVjdCBhdHRyaWJ1 dGUuCisKKyAgICAgICAgVGVzdDogYWNjZXNzaWJpbGl0eS9ndGsvYXJpYS1rZXlzaG9ydGN1dHMu aHRtbAorCisgICAgICAgICogYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlPYmplY3Q6OmFyaWFLZXlTaG9ydGN1dHNW YWx1ZSBjb25zdCk6CisgICAgICAgICogYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0 Lmg6CisgICAgICAgICogYWNjZXNzaWJpbGl0eS9hdGsvV2ViS2l0QWNjZXNzaWJsZVdyYXBwZXJB dGsuY3BwOgorICAgICAgICAod2Via2l0QWNjZXNzaWJsZUdldEF0dHJpYnV0ZXMpOgorICAgICAg ICAqIGh0bWwvSFRNTEF0dHJpYnV0ZU5hbWVzLmluOgorCiAyMDE3LTEwLTEwICBSeW9zdWtlIE5p d2EgIDxybml3YUB3ZWJraXQub3JnPgogCiAgICAgICAgIEVuYWJsZSBjdXN0b20gcGFzdGVib2Fy ZCBkYXRhIGluIER1bXBSZW5kZXJUcmVlIGFuZCBXZWJLaXRUZXN0UnVubmVyCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuY3BwIGIv U291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmNwcAppbmRl eCBjYTRhYzBjYjk0OGViNWZiODdhMTcwY2YwZDg2ZGNlY2JkYTNhNzUxLi5lNWFkZWY4MjhhYjFi YWE2NDI3Mjk0N2FiYWVjMjkzNGI3NDQ0MjlhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9h Y2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdC5jcHAKQEAgLTI0NDUsNiArMjQ0NSwx MSBAQCBjb25zdCBBdG9taWNTdHJpbmcmIEFjY2Vzc2liaWxpdHlPYmplY3Q6OmRhdGV0aW1lQXR0 cmlidXRlVmFsdWUoKSBjb25zdAogICAgIHJldHVybiBnZXRBdHRyaWJ1dGUoZGF0ZXRpbWVBdHRy KTsKIH0KICAgICAKK2NvbnN0IEF0b21pY1N0cmluZyYgQWNjZXNzaWJpbGl0eU9iamVjdDo6YXJp YUtleVNob3J0Y3V0c1ZhbHVlKCkgY29uc3QKK3sKKyAgICByZXR1cm4gZ2V0QXR0cmlidXRlKGFy aWFfa2V5c2hvcnRjdXRzQXR0cik7Cit9CisKIEVsZW1lbnQqIEFjY2Vzc2liaWxpdHlPYmplY3Q6 OmVsZW1lbnQoKSBjb25zdAogewogICAgIE5vZGUqIG5vZGUgPSB0aGlzLT5ub2RlKCk7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3Qu aCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdC5oCmlu ZGV4IDJiYzJhMDIyYzM4NzY2OGM1YTYyY2I4NjhhYzNhZjUwYTRkYjQ4OTEuLjlkNzI5OWY5NDEy ODUxMmMzNWU5Mjk3YTRmYjc4NGNiNDJhOTZjZTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdC5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdC5oCkBAIC03MDMsNiArNzAzLDcgQEAg cHVibGljOgogICAgIEFjY2Vzc2liaWxpdHlBUklBQ3VycmVudFN0YXRlIGFyaWFDdXJyZW50U3Rh dGUoKSBjb25zdDsKICAgICBTdHJpbmcgYXJpYUN1cnJlbnRWYWx1ZSgpIGNvbnN0OwogICAgIGJv b2wgc3VwcG9ydHNBUklBQ3VycmVudCgpIGNvbnN0OworICAgIGNvbnN0IEF0b21pY1N0cmluZyYg YXJpYUtleVNob3J0Y3V0c1ZhbHVlKCkgY29uc3Q7CiAgICAgCiAgICAgLy8gVGhpcyBmdW5jdGlv biBjaGVja3MgaWYgdGhlIG9iamVjdCBzaG91bGQgYmUgaWdub3JlZCB3aGVuIHRoZXJlJ3MgYSBt b2RhbCBkaWFsb2cgZGlzcGxheWVkLgogICAgIGJvb2wgaWdub3JlZEZyb21BUklBTW9kYWxQcmVz ZW5jZSgpIGNvbnN0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9h dGsvV2ViS2l0QWNjZXNzaWJsZVdyYXBwZXJBdGsuY3BwIGIvU291cmNlL1dlYkNvcmUvYWNjZXNz aWJpbGl0eS9hdGsvV2ViS2l0QWNjZXNzaWJsZVdyYXBwZXJBdGsuY3BwCmluZGV4IGJkYzkxYzM5 Njc3MGE4NDZiZDdhYzZkMjliNTQwYmM2YzE2MDI2NDYuLjdmMmY0ZmIwNjljYzBhZjYxOWZjODg1 OTUyMDAwYjNjOWEzMGU3MjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxp dHkvYXRrL1dlYktpdEFjY2Vzc2libGVXcmFwcGVyQXRrLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9hY2Nlc3NpYmlsaXR5L2F0ay9XZWJLaXRBY2Nlc3NpYmxlV3JhcHBlckF0ay5jcHAKQEAgLTYw MSw2ICs2MDEsMTEgQEAgc3RhdGljIEF0a0F0dHJpYnV0ZVNldCogd2Via2l0QWNjZXNzaWJsZUdl dEF0dHJpYnV0ZXMoQXRrT2JqZWN0KiBvYmplY3QpCiAgICAgZWxzZSBpZiAoY29yZU9iamVjdC0+ c3VwcG9ydHNBUklBRHJhZ2dpbmcoKSkKICAgICAgICAgYXR0cmlidXRlU2V0ID0gYWRkVG9BdGtB dHRyaWJ1dGVTZXQoYXR0cmlidXRlU2V0LCAiZ3JhYmJlZCIsICJmYWxzZSIpOwogCisgICAgLy8g VGhlIENvcmUgQUFNIHN0YXRlcyB0aGUgYXV0aG9yLXByb3ZpZGVkIHZhbHVlIHNob3VsZCBiZSBl eHBvc2VkIGFzLWlzLgorICAgIGNvbnN0IEF0b21pY1N0cmluZyYga2V5U2hvcnRjdXRzID0gY29y ZU9iamVjdC0+YXJpYUtleVNob3J0Y3V0c1ZhbHVlKCk7CisgICAgaWYgKCFrZXlTaG9ydGN1dHMu aXNFbXB0eSgpKQorICAgICAgICBhdHRyaWJ1dGVTZXQgPSBhZGRUb0F0a0F0dHJpYnV0ZVNldChh dHRyaWJ1dGVTZXQsICJrZXlzaG9ydGN1dHMiLCBrZXlTaG9ydGN1dHMuc3RyaW5nKCkudXRmOCgp LmRhdGEoKSk7CisKICAgICByZXR1cm4gYXR0cmlidXRlU2V0OwogfQogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9odG1sL0hUTUxBdHRyaWJ1dGVOYW1lcy5pbiBiL1NvdXJjZS9XZWJDb3Jl L2h0bWwvSFRNTEF0dHJpYnV0ZU5hbWVzLmluCmluZGV4IDMxOGM4ZWVhMWZhMGRhNTRkNTEyNzBk MWM1NGUyOTNmNTY1ZDMzODQuLjk3YjY3NDI3MzJhMWM2ZTFlYjBhMjY5OGQ2ZjkyMzFkNjU0YWQw MTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEF0dHJpYnV0ZU5hbWVzLmlu CisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEF0dHJpYnV0ZU5hbWVzLmluCkBAIC0zNSw2 ICszNSw3IEBAIGFyaWEtaGFzcG9wdXAKIGFyaWEtaGVscAogYXJpYS1oaWRkZW4KIGFyaWEtaW52 YWxpZAorYXJpYS1rZXlzaG9ydGN1dHMKIGFyaWEtbGFiZWwKIGFyaWEtbGFiZWxlZGJ5CiBhcmlh LWxhYmVsbGVkYnkKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRl c3RzL0NoYW5nZUxvZwppbmRleCA0MGU4NWE1OWRjNzhmZjcwZDY5OWZiYjAxNWMwMGRiYzMwNTY1 NjQ0Li5lNDJhMDgxZjA0ODYzZjc2NmNiN2E4YmZkZWQxZDMwZjllZjUxMjYyIDEwMDY0NAotLS0g YS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMTMgQEAKKzIwMTctMTAtMTEgIEpvYW5tYXJpZSBEaWdncyAgPGpkaWdnc0BpZ2FsaWEu Y29tPgorCisgICAgICAgIFtBVEtdIEV4cG9zZSB2YWx1ZSBvZiBhcmlhLWtleXNob3J0Y3V0cyBh cyBvYmplY3QgYXR0cmlidXRlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xNzExNzUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIGFjY2Vzc2liaWxpdHkvZ3RrL2FyaWEta2V5c2hvcnRjdXRzLWV4cGVjdGVk LnR4dDogQWRkZWQuCisgICAgICAgICogYWNjZXNzaWJpbGl0eS9ndGsvYXJpYS1rZXlzaG9ydGN1 dHMuaHRtbDogQWRkZWQuCisKIDIwMTctMTAtMTAgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtp dC5vcmc+CiAKICAgICAgICAgRW5hYmxlIGN1c3RvbSBwYXN0ZWJvYXJkIGRhdGEgaW4gRHVtcFJl bmRlclRyZWUgYW5kIFdlYktpdFRlc3RSdW5uZXIKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Fj Y2Vzc2liaWxpdHkvZ3RrL2FyaWEta2V5c2hvcnRjdXRzLWV4cGVjdGVkLnR4dCBiL0xheW91dFRl c3RzL2FjY2Vzc2liaWxpdHkvZ3RrL2FyaWEta2V5c2hvcnRjdXRzLWV4cGVjdGVkLnR4dApuZXcg ZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwLi5lYTc3MDU0OGM4MGVhN2VhM2JmMGIyMTAwMTIyMTFjNjM0NDJiNTM2Ci0tLSAvZGV2 L251bGwKKysrIGIvTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9ndGsvYXJpYS1rZXlzaG9ydGN1 dHMtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsMTMgQEAKK1RoaXMgdGVzdHMgdGhlIGV4cG9zdXJl IG9mIHRoZSB2YWx1ZSBvZiBhcmlhLWtleXNob3J0Y3V0cy4KKworT24gc3VjY2VzcywgeW91IHdp bGwgc2VlIGEgc2VyaWVzIG9mICJQQVNTIiBtZXNzYWdlcywgZm9sbG93ZWQgYnkgIlRFU1QgQ09N UExFVEUiLgorCisKK0FYUGxhdGZvcm1BdHRyaWJ1dGVzOiBjb21wdXRlZC1yb2xlOmJ1dHRvbiwg eG1sLXJvbGVzOmJ1dHRvbiwgaHRtbC1pZDp0ZXN0MSwgdGFnOmRpdiwgdG9vbGtpdDpXZWJLaXRH dGsKK0FYUGxhdGZvcm1BdHRyaWJ1dGVzOiBjb21wdXRlZC1yb2xlOmJ1dHRvbiwgeG1sLXJvbGVz OmJ1dHRvbiwgaHRtbC1pZDp0ZXN0MiwgdGFnOmRpdiwgdG9vbGtpdDpXZWJLaXRHdGsKK0FYUGxh dGZvcm1BdHRyaWJ1dGVzOiBrZXlzaG9ydGN1dHM6U2hpZnQrU3BhY2UsIGNvbXB1dGVkLXJvbGU6 YnV0dG9uLCB4bWwtcm9sZXM6YnV0dG9uLCBodG1sLWlkOnRlc3QzLCB0YWc6ZGl2LCB0b29sa2l0 OldlYktpdEd0aworQVhQbGF0Zm9ybUF0dHJpYnV0ZXM6IGtleXNob3J0Y3V0czpTaGlmdCtTcGFj ZSBBbHQrU3BhY2UsIGNvbXB1dGVkLXJvbGU6YnV0dG9uLCB4bWwtcm9sZXM6YnV0dG9uLCBodG1s LWlkOnRlc3Q0LCB0YWc6ZGl2LCB0b29sa2l0OldlYktpdEd0aworUEFTUyBzdWNjZXNzZnVsbHlQ YXJzZWQgaXMgdHJ1ZQorCitURVNUIENPTVBMRVRFCisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz L2FjY2Vzc2liaWxpdHkvZ3RrL2FyaWEta2V5c2hvcnRjdXRzLmh0bWwgYi9MYXlvdXRUZXN0cy9h Y2Nlc3NpYmlsaXR5L2d0ay9hcmlhLWtleXNob3J0Y3V0cy5odG1sCm5ldyBmaWxlIG1vZGUgMTAw NjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjE1NWUz ZDc5ZTBhYWQ1Zjg0Y2JhZjY0YWMzNWJmNmE3NTE5OGFjN2YKLS0tIC9kZXYvbnVsbAorKysgYi9M YXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L2d0ay9hcmlhLWtleXNob3J0Y3V0cy5odG1sCkBAIC0w LDAgKzEsMzkgQEAKKzwhRE9DVFlQRSBIVE1MIFBVQkxJQyAiLS8vSUVURi8vRFREIEhUTUwvL0VO Ij4KKzxodG1sPgorPGhlYWQ+Cis8c2NyaXB0IHNyYz0iLi4vLi4vcmVzb3VyY2VzL2pzLXRlc3Qt cHJlLmpzIj48L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5IGlkPSJib2R5Ij4KKzxkaXYgaWQ9ImNv bnRlbnQiPgorICA8ZGl2IGlkPSJ0ZXN0MSIgcm9sZT0iYnV0dG9uIiB0YWJpbmRleD0iMCI+WDwv ZGl2PgorICA8ZGl2IGlkPSJ0ZXN0MiIgcm9sZT0iYnV0dG9uIiB0YWJpbmRleD0iMCIgYXJpYS1r ZXlzaG9ydGN1dHM9IiI+WDwvZGl2PgorICA8ZGl2IGlkPSJ0ZXN0MyIgcm9sZT0iYnV0dG9uIiB0 YWJpbmRleD0iMCIgYXJpYS1rZXlzaG9ydGN1dHM9IlNoaWZ0K1NwYWNlIj5YPC9kaXY+CisgIDxk aXYgaWQ9InRlc3Q0IiByb2xlPSJidXR0b24iIHRhYmluZGV4PSIwIiBhcmlhLWtleXNob3J0Y3V0 cz0iU2hpZnQrU3BhY2UgQWx0K1NwYWNlIj5YPC9kaXY+Cis8L2Rpdj4KKzxwIGlkPSJkZXNjcmlw dGlvbiI+PC9wPgorPGRpdiBpZD0iY29uc29sZSI+PC9kaXY+Cis8c2NyaXB0PgorICAgIGZ1bmN0 aW9uIHBsYXRmb3JtQXR0cmlidXRlcyhheEVsZW1lbnQpIHsKKyAgICAgICAgdmFyIGFsbEF0dHJp YnV0ZXMgPSBheEVsZW1lbnQuYWxsQXR0cmlidXRlcygpLnNwbGl0KCJcbiIpOworICAgICAgICB2 YXIgbGVuZ3RoID0gYWxsQXR0cmlidXRlcy5sZW5ndGg7CisgICAgICAgIGZvciAodmFyIGkgPSAw OyBpIDwgbGVuZ3RoOyBpKyspIHsKKyAgICAgICAgICAgIHZhciBzdHJpbmcgPSBhbGxBdHRyaWJ1 dGVzW2ldOworICAgICAgICAgICAgaWYgKHN0cmluZy5zdGFydHNXaXRoKCJBWFBsYXRmb3JtQXR0 cmlidXRlcyIpKQorICAgICAgICAgICAgICAgIHJldHVybiBzdHJpbmc7CisgICAgICAgIH0KKyAg ICAgICAgcmV0dXJuICIiOworICAgIH0KKworICAgIGRlc2NyaXB0aW9uKCJUaGlzIHRlc3RzIHRo ZSBleHBvc3VyZSBvZiB0aGUgdmFsdWUgb2YgYXJpYS1rZXlzaG9ydGN1dHMuIik7CisgICAgaWYg KHdpbmRvdy5hY2Nlc3NpYmlsaXR5Q29udHJvbGxlcikgeworICAgICAgICBmb3IgKHZhciBpID0g MTsgaSA8PSA0OyBpKyspIHsKKyAgICAgICAgICAgIHZhciBheEVsZW1lbnQgPSBhY2Nlc3NpYmls aXR5Q29udHJvbGxlci5hY2Nlc3NpYmxlRWxlbWVudEJ5SWQoInRlc3QiICsgaSk7CisgICAgICAg ICAgICBkZWJ1ZyhwbGF0Zm9ybUF0dHJpYnV0ZXMoYXhFbGVtZW50KSk7CisgICAgICAgIH0KKwor ICAgICAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiY29udGVudCIpLnN0eWxlLnZpc2liaWxp dHkgPSAiaGlkZGVuIjsKKyAgICB9Cis8L3NjcmlwdD4KKzxzY3JpcHQgc3JjPSIuLi8uLi9yZXNv dXJjZXMvanMtdGVzdC1wb3N0LmpzIj48L3NjcmlwdD4KKzwvYm9keT4KKzwvaHRtbD4K