113975 2013-04-04 16:27:25 -0700 WebKit should not expose AXSubrole:AXDescriptionList on Mountain Lion as it causes a regression in VoiceOver behavior 2013-04-15 18:33:04 -0700 1 1 1 Unclassified WebKit Accessibility 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jcraig jcraig aboxhall apinheiro cfleizach commit-queue dmazzoni jcraig jdiggs webkit-bug-importer oldest_to_newest 869444 0 jcraig 2013-04-04 16:27:25 -0700 WebKit should not expose AXSubrole:AXDescriptionList on Mountain Lion as it causes a regression in VoiceOver behavior. Should just use the old AXDefinitionList. 869445 1 webkit-bug-importer 2013-04-04 16:28:54 -0700 <rdar://problem/13582264> 874926 2 197879 jcraig 2013-04-12 13:24:04 -0700 Created attachment 197879 patch 874993 3 197879 cfleizach 2013-04-12 15:22:50 -0700 Comment on attachment 197879 patch View in context: https://bugs.webkit.org/attachment.cgi?id=197879&action=review > Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm:1759 > + // fall back to NSAccessibilityDefinitionListSubrole in 10.8 and earlier you can remove this comment. it is self-evident by reading the code > Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm:1760 > + #if __MAC_OS_X_VERSION_MIN_REQUIRED < 1090 these macros should start at the beginning of the line 875024 4 197903 jcraig 2013-04-12 16:10:06 -0700 Created attachment 197903 patch with review feedback 876200 5 197903 commit-queue 2013-04-15 18:33:02 -0700 Comment on attachment 197903 patch with review feedback Clearing flags on attachment: 197903 Committed r148484: <http://trac.webkit.org/changeset/148484> 876201 6 commit-queue 2013-04-15 18:33:04 -0700 All reviewed patches have been landed. Closing bug. 197879 2013-04-12 13:24:04 -0700 2013-04-12 16:10:06 -0700 patch 113975.patch text/plain 7014 jcraig SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE0ODMwMCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDEzLTA0LTEyICBKYW1lcyBD cmFpZyAgPGphbWVzQGNvb2tpZWNyb29rLmNvbT4KKworICAgICAgICBXZWJLaXQgc2hvdWxkIG5v dCBleHBvc2UgQVhTdWJyb2xlOkFYRGVzY3JpcHRpb25MaXN0IG9uIE1vdW50YWluIExpb24gYXMg aXQgY2F1c2VzIGEgcmVncmVzc2lvbiBpbiBWb2ljZU92ZXIgYmVoYXZpb3IKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMzk3NQorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFNlcnZlIE5TQWNjZXNzaWJpbGl0 eURlc2NyaXB0aW9uTGlzdFN1YnJvbGUgb3IgTlNBY2Nlc3NpYmlsaXR5RGVmaW5pdGlvbkxpc3RT dWJyb2xlCisgICAgICAgIGRlcGVuZGluZyBvbiBwbGF0Zm9ybS4gVXBkYXRlZCBleGlzdGluZyB0 ZXN0IGNvdmVyYWdlLgorCisgICAgICAgICogYWNjZXNzaWJpbGl0eS9tYWMvV2ViQWNjZXNzaWJp bGl0eU9iamVjdFdyYXBwZXJNYWMubW06CisgICAgICAgICgtW1dlYkFjY2Vzc2liaWxpdHlPYmpl Y3RXcmFwcGVyIHN1YnJvbGVdKToKKwogMjAxMy0wNC0xMiAgVGltIEhvcnRvbiAgPHRpbW90aHlf aG9ydG9uQGFwcGxlLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9OIChyMTM4ODU4KTogR0lGcyBk b24ndCBzdGFydCBwbGF5aW5nIHdoZW4gdGhleSBjb21lIG91dCBvZiBiYWNrZ3JvdW5kIHRhYnMK SW5kZXg6IFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvbWFjL1dlYkFjY2Vzc2liaWxpdHlP YmplY3RXcmFwcGVyTWFjLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2li aWxpdHkvbWFjL1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyTWFjLm1tCShyZXZpc2lvbiAx NDgyMjEpCisrKyBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9XZWJBY2Nlc3NpYmls aXR5T2JqZWN0V3JhcHBlck1hYy5tbQkod29ya2luZyBjb3B5KQpAQCAtMTExLDYgKzExMSwxMCBA QCB1c2luZyBuYW1lc3BhY2Ugc3RkOwogI2RlZmluZSBOU0FjY2Vzc2liaWxpdHlDb250ZW50TGlz dFN1YnJvbGUgQCJBWENvbnRlbnRMaXN0IgogI2VuZGlmCiAKKyNpZm5kZWYgTlNBY2Nlc3NpYmls aXR5RGVmaW5pdGlvbkxpc3RTdWJyb2xlCisjZGVmaW5lIE5TQWNjZXNzaWJpbGl0eURlZmluaXRp b25MaXN0U3Vicm9sZSBAIkFYRGVmaW5pdGlvbkxpc3QiCisjZW5kaWYKKwogI2lmbmRlZiBOU0Fj Y2Vzc2liaWxpdHlEZXNjcmlwdGlvbkxpc3RTdWJyb2xlCiAjZGVmaW5lIE5TQWNjZXNzaWJpbGl0 eURlc2NyaXB0aW9uTGlzdFN1YnJvbGUgQCJBWERlc2NyaXB0aW9uTGlzdCIKICNlbmRpZgpAQCAt MTc1MSw4ICsxNzU1LDE0IEBAIC0gKE5TU3RyaW5nKilzdWJyb2xlCiAgICAgICAgIEFjY2Vzc2li aWxpdHlMaXN0KiBsaXN0T2JqZWN0ID0gdG9BY2Nlc3NpYmlsaXR5TGlzdChtX29iamVjdCk7CiAg ICAgICAgIGlmIChsaXN0T2JqZWN0LT5pc1Vub3JkZXJlZExpc3QoKSB8fCBsaXN0T2JqZWN0LT5p c09yZGVyZWRMaXN0KCkpCiAgICAgICAgICAgICByZXR1cm4gTlNBY2Nlc3NpYmlsaXR5Q29udGVu dExpc3RTdWJyb2xlOwotICAgICAgICBpZiAobGlzdE9iamVjdC0+aXNEZXNjcmlwdGlvbkxpc3Qo KSkKLSAgICAgICAgICAgIHJldHVybiBOU0FjY2Vzc2liaWxpdHlEZXNjcmlwdGlvbkxpc3RTdWJy b2xlOworICAgICAgICBpZiAobGlzdE9iamVjdC0+aXNEZXNjcmlwdGlvbkxpc3QoKSkgeworICAg ICAgICAgICAgLy8gZmFsbCBiYWNrIHRvIE5TQWNjZXNzaWJpbGl0eURlZmluaXRpb25MaXN0U3Vi cm9sZSBpbiAxMC44IGFuZCBlYXJsaWVyCisgICAgICAgICAgICAjaWYgX19NQUNfT1NfWF9WRVJT SU9OX01JTl9SRVFVSVJFRCA8IDEwOTAKKyAgICAgICAgICAgICAgICByZXR1cm4gTlNBY2Nlc3Np YmlsaXR5RGVmaW5pdGlvbkxpc3RTdWJyb2xlOworICAgICAgICAgICAgI2Vsc2UKKyAgICAgICAg ICAgICAgICByZXR1cm4gTlNBY2Nlc3NpYmlsaXR5RGVzY3JpcHRpb25MaXN0U3Vicm9sZTsKKyAg ICAgICAgICAgICNlbmRpZgorICAgICAgICB9CiAgICAgfQogICAgIAogICAgIC8vIEFSSUEgY29u dGVudCBzdWJyb2xlcy4KQEAgLTE4MDMsOCArMTgxMyw2IEBAIC0gKE5TU3RyaW5nKilzdWJyb2xl CiAgICAgICAgICAgICByZXR1cm4gQCJBWFRhYlBhbmVsIjsKICAgICAgICAgY2FzZSBEZWZpbml0 aW9uUm9sZToKICAgICAgICAgICAgIHJldHVybiBAIkFYRGVmaW5pdGlvbiI7Ci0gICAgICAgIGNh c2UgRGVzY3JpcHRpb25MaXN0Um9sZToKLSAgICAgICAgICAgIHJldHVybiBAIkFYRGVzY3JpcHRp b25MaXN0IjsKICAgICAgICAgY2FzZSBEZXNjcmlwdGlvbkxpc3RUZXJtUm9sZToKICAgICAgICAg ICAgIHJldHVybiBAIkFYVGVybSI7CiAgICAgICAgIGNhc2UgRGVzY3JpcHRpb25MaXN0RGV0YWls Um9sZToKSW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRU ZXN0cy9DaGFuZ2VMb2cJKHJldmlzaW9uIDE0ODMwMCkKKysrIExheW91dFRlc3RzL0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDEzLTA0LTEyICBKYW1lcyBDcmFp ZyAgPGphbWVzQGNvb2tpZWNyb29rLmNvbT4KKworICAgICAgICBXZWJLaXQgc2hvdWxkIG5vdCBl eHBvc2UgQVhTdWJyb2xlOkFYRGVzY3JpcHRpb25MaXN0IG9uIE1vdW50YWluIExpb24gYXMgaXQg Y2F1c2VzIGEgcmVncmVzc2lvbiBpbiBWb2ljZU92ZXIgYmVoYXZpb3IKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMzk3NQorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFNlcnZlIE5TQWNjZXNzaWJpbGl0eURl c2NyaXB0aW9uTGlzdFN1YnJvbGUgb3IgTlNBY2Nlc3NpYmlsaXR5RGVmaW5pdGlvbkxpc3RTdWJy b2xlCisgICAgICAgIGRlcGVuZGluZyBvbiBwbGF0Zm9ybS4gVXBkYXRlZCBleGlzdGluZyB0ZXN0 IGNvdmVyYWdlLgorCisgICAgICAgICogcGxhdGZvcm0vbWFjL2FjY2Vzc2liaWxpdHkvbGlzdHMt ZXhwZWN0ZWQudHh0OgorICAgICAgICAqIHBsYXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5L3JvbGUt c3Vicm9sZS1yb2xlZGVzY3JpcHRpb24tZXhwZWN0ZWQudHh0OgorICAgICAgICAqIHBsYXRmb3Jt L21hYy9hY2Nlc3NpYmlsaXR5L3JvbGUtc3Vicm9sZS1yb2xlZGVzY3JpcHRpb24uaHRtbDoKKwog MjAxMy0wNC0xMiAgQ29tbWl0IFF1ZXVlICA8cm5pd2FAd2Via2l0Lm9yZz4KIAogICAgICAgICBV bnJldmlld2VkLCByb2xsaW5nIG91dCByMTQ3OTQyLCByMTQ4MDI2LCBhbmQgcjE0ODA5Mi4KSW5k ZXg6IExheW91dFRlc3RzL3BsYXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5L2xpc3RzLWV4cGVjdGVk LnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvYWNjZXNzaWJpbGl0 eS9saXN0cy1leHBlY3RlZC50eHQJKHJldmlzaW9uIDE0ODIyMSkKKysrIExheW91dFRlc3RzL3Bs YXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5L2xpc3RzLWV4cGVjdGVkLnR4dAkod29ya2luZyBjb3B5 KQpAQCAtNjgsNyArNjgsNyBAQCBBWEFSSUFCdXN5OiAwCiAKIC0tLS0tLS0tLS0tLQogQVhSb2xl OiBBWExpc3QKLUFYU3Vicm9sZTogQVhEZXNjcmlwdGlvbkxpc3QKK0FYU3Vicm9sZTogQVhEZWZp bml0aW9uTGlzdAogQVhSb2xlRGVzY3JpcHRpb246IGRlc2NyaXB0aW9uIGxpc3QKIEFYQ2hpbGRy ZW46IDxhcnJheSBvZiBzaXplIDU+CiBBWEhlbHA6IApJbmRleDogTGF5b3V0VGVzdHMvcGxhdGZv cm0vbWFjL2FjY2Vzc2liaWxpdHkvcm9sZS1zdWJyb2xlLXJvbGVkZXNjcmlwdGlvbi1leHBlY3Rl ZC50eHQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2FjY2Vzc2liaWxp dHkvcm9sZS1zdWJyb2xlLXJvbGVkZXNjcmlwdGlvbi1leHBlY3RlZC50eHQJKHJldmlzaW9uIDE0 ODIyMSkKKysrIExheW91dFRlc3RzL3BsYXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5L3JvbGUtc3Vi cm9sZS1yb2xlZGVzY3JpcHRpb24tZXhwZWN0ZWQudHh0CSh3b3JraW5nIGNvcHkpCkBAIC04Niw3 ICs4Niw3IEBAIFBBU1M6IGRmbgogICAgICAgCiBQQVNTOiBkbAogICAgICAgQVhSb2xlOiBBWExp c3QKLSAgICAgIEFYU3Vicm9sZTogQVhEZXNjcmlwdGlvbkxpc3QKKyAgICAgIEFYU3Vicm9sZTog QVhEZWZpbml0aW9uTGlzdAogICAgICAgQVhSb2xlRGVzY3JpcHRpb246IGRlc2NyaXB0aW9uIGxp c3QKICAgICAgIAogUEFTUzogZHQKSW5kZXg6IExheW91dFRlc3RzL3BsYXRmb3JtL21hYy9hY2Nl c3NpYmlsaXR5L3JvbGUtc3Vicm9sZS1yb2xlZGVzY3JpcHRpb24uaHRtbAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvYWNjZXNzaWJpbGl0eS9yb2xlLXN1YnJvbGUtcm9s ZWRlc2NyaXB0aW9uLmh0bWwJKHJldmlzaW9uIDE0ODIyMSkKKysrIExheW91dFRlc3RzL3BsYXRm b3JtL21hYy9hY2Nlc3NpYmlsaXR5L3JvbGUtc3Vicm9sZS1yb2xlZGVzY3JpcHRpb24uaHRtbAko d29ya2luZyBjb3B5KQpAQCAtMjcsNyArMjcsNyBAQAogPGRlbCBkYXRhLXJvbGU9IiIgZGF0YS1z dWJyb2xlPSIiIGRhdGEtcm9sZWRlc2NyaXB0aW9uPSIiIGNsYXNzPSJleCI+WDwvZGVsPgogPCEt LSBza2lwcGVkIDxkZXRhaWxzL3N1bW1hcnk+IGh0dHA6Ly93ZWJraXQub3JnL2IvMTA4OTc5IC0t PgogPCEtLSA8ZGZuPiBodHRwOi8vd2Via2l0Lm9yZy9iLzEwODk4MCAtLT48ZGZuIGRhdGEtcm9s ZT0iIiBkYXRhLXN1YnJvbGU9IiIgZGF0YS1yb2xlZGVzY3JpcHRpb249IiIgY2xhc3M9ImV4Ij5Y PC9kZm4+Ci08ZGwgZGF0YS1yb2xlPSJBWExpc3QiIGRhdGEtc3Vicm9sZT0iQVhEZXNjcmlwdGlv bkxpc3QiIGRhdGEtcm9sZWRlc2NyaXB0aW9uPSJkZXNjcmlwdGlvbiBsaXN0IiBjbGFzcz0iZXgi PgorPGRsIGRhdGEtcm9sZT0iQVhMaXN0IiBkYXRhLXN1YnJvbGU9IkFYRGVzY3JpcHRpb25MaXN0 IiBkYXRhLWFsdGVybmF0ZXN1YnJvbGU9IkFYRGVmaW5pdGlvbkxpc3QiIGRhdGEtcm9sZWRlc2Ny aXB0aW9uPSJkZXNjcmlwdGlvbiBsaXN0IiBjbGFzcz0iZXgiPgogICAgIDxkdCBkYXRhLXJvbGU9 IkFYR3JvdXAiIGRhdGEtc3Vicm9sZT0iQVhUZXJtIiBkYXRhLXJvbGVkZXNjcmlwdGlvbj0idGVy bSIgY2xhc3M9ImV4Ij5YPC9kdD4KICAgICA8ZGQgZGF0YS1yb2xlPSJBWEdyb3VwIiBkYXRhLXN1 YnJvbGU9IkFYRGVzY3JpcHRpb24iIGRhdGEtcm9sZWRlc2NyaXB0aW9uPSJkZXNjcmlwdGlvbiIg Y2xhc3M9ImV4Ij5YPC9kZD4KIDwvZGw+CkBAIC0zMTAsMTMgKzMxMCwxNiBAQCBpZiAod2luZG93 LnRlc3RSdW5uZXIgJiYgd2luZG93LmFjY2Vzc2liCiAgICAgICAgIG91dHB1dCArPSBzdWJyb2xl ICsgaW5kZW50OwogICAgICAgICBvdXRwdXQgKz0gcm9sZURlc2NyaXB0aW9uICsgaW5kZW50Owog Ci0gICAgICAgIGV4cGVjdGF0aW9uID0gZWwuZ2V0QXR0cmlidXRlKCdkYXRhLXJvbGUnKSArIi8i KyBlbC5nZXRBdHRyaWJ1dGUoJ2RhdGEtc3Vicm9sZScpICsiLyIrIGVsLmdldEF0dHJpYnV0ZSgn ZGF0YS1yb2xlZGVzY3JpcHRpb24nKTsKKyAgICAgICAgZXhwZWN0YXRpb24gPSBlbC5nZXRBdHRy aWJ1dGUoJ2RhdGEtcm9sZScpICsgIi8iOworICAgICAgICBleHBlY3RhdGlvbiArPSBlbC5nZXRB dHRyaWJ1dGUoJ2RhdGEtc3Vicm9sZScpOworICAgICAgICBpZiAoZWwuZ2V0QXR0cmlidXRlKCdk YXRhLWFsdGVybmF0ZXN1YnJvbGUnKSkgZXhwZWN0YXRpb24gKz0gIiBvciAiICsgZWwuZ2V0QXR0 cmlidXRlKCdkYXRhLWFsdGVybmF0ZXN1YnJvbGUnKTsKKyAgICAgICAgZXhwZWN0YXRpb24gKz0g Ii8iICsgZWwuZ2V0QXR0cmlidXRlKCdkYXRhLXJvbGVkZXNjcmlwdGlvbicpOwogCiAgICAgICAg IHJlc3VsdCA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdjb25zb2xlJyk7CiAgICAgICAgIAog ICAgICAgICAvLyBUZXN0IEFYUm9sZSwgQVhTdWJyb2xlLCBhbmQgQVhSb2xlRGVzY3JpcHRpb24u CiAgICAgICAgIGlmIChyb2xlLnJlcGxhY2UoJ0FYUm9sZTogJywnJykgPT0gZWwuZ2V0QXR0cmli dXRlKCdkYXRhLXJvbGUnKQotICAgICAgICAgICAgJiYgc3Vicm9sZS5yZXBsYWNlKCdBWFN1YnJv bGU6ICcsJycpID09IGVsLmdldEF0dHJpYnV0ZSgnZGF0YS1zdWJyb2xlJykKKyAgICAgICAgICAg ICYmIChzdWJyb2xlLnJlcGxhY2UoJ0FYU3Vicm9sZTogJywnJykgPT0gZWwuZ2V0QXR0cmlidXRl KCdkYXRhLXN1YnJvbGUnKSB8fCBzdWJyb2xlLnJlcGxhY2UoJ0FYU3Vicm9sZTogJywnJykgPT0g ZWwuZ2V0QXR0cmlidXRlKCdkYXRhLWFsdGVybmF0ZXN1YnJvbGUnKSkKICAgICAgICAgICAgICYm IHJvbGVEZXNjcmlwdGlvbi5yZXBsYWNlKCdBWFJvbGVEZXNjcmlwdGlvbjogJywnJykgPT0gZWwu Z2V0QXR0cmlidXRlKCdkYXRhLXJvbGVkZXNjcmlwdGlvbicpKSB7CiAgICAgICAgICAgICByZXN1 bHQuaW5uZXJUZXh0ICs9ICJQQVNTOiAiICsgb3V0cHV0ICsgIlxuIjsKICAgICAgICAgfSBlbHNl IHsK 197903 2013-04-12 16:10:06 -0700 2013-04-15 18:33:02 -0700 patch with review feedback 113975.patch text/plain 6825 jcraig SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE0ODMwMCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDEzLTA0LTEyICBKYW1lcyBD cmFpZyAgPGphbWVzQGNvb2tpZWNyb29rLmNvbT4KKworICAgICAgICBXZWJLaXQgc2hvdWxkIG5v dCBleHBvc2UgQVhTdWJyb2xlOkFYRGVzY3JpcHRpb25MaXN0IG9uIE1vdW50YWluIExpb24gYXMg aXQgY2F1c2VzIGEgcmVncmVzc2lvbiBpbiBWb2ljZU92ZXIgYmVoYXZpb3IKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMzk3NQorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFNlcnZlIE5TQWNjZXNzaWJpbGl0 eURlc2NyaXB0aW9uTGlzdFN1YnJvbGUgb3IgTlNBY2Nlc3NpYmlsaXR5RGVmaW5pdGlvbkxpc3RT dWJyb2xlCisgICAgICAgIGRlcGVuZGluZyBvbiBwbGF0Zm9ybS4gVXBkYXRlZCBleGlzdGluZyB0 ZXN0IGNvdmVyYWdlLgorCisgICAgICAgICogYWNjZXNzaWJpbGl0eS9tYWMvV2ViQWNjZXNzaWJp bGl0eU9iamVjdFdyYXBwZXJNYWMubW06CisgICAgICAgICgtW1dlYkFjY2Vzc2liaWxpdHlPYmpl Y3RXcmFwcGVyIHN1YnJvbGVdKToKKwogMjAxMy0wNC0xMiAgVGltIEhvcnRvbiAgPHRpbW90aHlf aG9ydG9uQGFwcGxlLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9OIChyMTM4ODU4KTogR0lGcyBk b24ndCBzdGFydCBwbGF5aW5nIHdoZW4gdGhleSBjb21lIG91dCBvZiBiYWNrZ3JvdW5kIHRhYnMK SW5kZXg6IFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvbWFjL1dlYkFjY2Vzc2liaWxpdHlP YmplY3RXcmFwcGVyTWFjLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2li aWxpdHkvbWFjL1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyTWFjLm1tCShyZXZpc2lvbiAx NDgyMjEpCisrKyBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9XZWJBY2Nlc3NpYmls aXR5T2JqZWN0V3JhcHBlck1hYy5tbQkod29ya2luZyBjb3B5KQpAQCAtMTExLDYgKzExMSwxMCBA QCB1c2luZyBuYW1lc3BhY2Ugc3RkOwogI2RlZmluZSBOU0FjY2Vzc2liaWxpdHlDb250ZW50TGlz dFN1YnJvbGUgQCJBWENvbnRlbnRMaXN0IgogI2VuZGlmCiAKKyNpZm5kZWYgTlNBY2Nlc3NpYmls aXR5RGVmaW5pdGlvbkxpc3RTdWJyb2xlCisjZGVmaW5lIE5TQWNjZXNzaWJpbGl0eURlZmluaXRp b25MaXN0U3Vicm9sZSBAIkFYRGVmaW5pdGlvbkxpc3QiCisjZW5kaWYKKwogI2lmbmRlZiBOU0Fj Y2Vzc2liaWxpdHlEZXNjcmlwdGlvbkxpc3RTdWJyb2xlCiAjZGVmaW5lIE5TQWNjZXNzaWJpbGl0 eURlc2NyaXB0aW9uTGlzdFN1YnJvbGUgQCJBWERlc2NyaXB0aW9uTGlzdCIKICNlbmRpZgpAQCAt MTc1MSw4ICsxNzU1LDEzIEBAIC0gKE5TU3RyaW5nKilzdWJyb2xlCiAgICAgICAgIEFjY2Vzc2li aWxpdHlMaXN0KiBsaXN0T2JqZWN0ID0gdG9BY2Nlc3NpYmlsaXR5TGlzdChtX29iamVjdCk7CiAg ICAgICAgIGlmIChsaXN0T2JqZWN0LT5pc1Vub3JkZXJlZExpc3QoKSB8fCBsaXN0T2JqZWN0LT5p c09yZGVyZWRMaXN0KCkpCiAgICAgICAgICAgICByZXR1cm4gTlNBY2Nlc3NpYmlsaXR5Q29udGVu dExpc3RTdWJyb2xlOwotICAgICAgICBpZiAobGlzdE9iamVjdC0+aXNEZXNjcmlwdGlvbkxpc3Qo KSkKKyAgICAgICAgaWYgKGxpc3RPYmplY3QtPmlzRGVzY3JpcHRpb25MaXN0KCkpIHsKKyNpZiBf X01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEIDwgMTA5MAorICAgICAgICAgICAgcmV0dXJu IE5TQWNjZXNzaWJpbGl0eURlZmluaXRpb25MaXN0U3Vicm9sZTsKKyNlbHNlCiAgICAgICAgICAg ICByZXR1cm4gTlNBY2Nlc3NpYmlsaXR5RGVzY3JpcHRpb25MaXN0U3Vicm9sZTsKKyNlbmRpZgor ICAgICAgICB9CiAgICAgfQogICAgIAogICAgIC8vIEFSSUEgY29udGVudCBzdWJyb2xlcy4KQEAg LTE4MDMsOCArMTgxMiw2IEBAIC0gKE5TU3RyaW5nKilzdWJyb2xlCiAgICAgICAgICAgICByZXR1 cm4gQCJBWFRhYlBhbmVsIjsKICAgICAgICAgY2FzZSBEZWZpbml0aW9uUm9sZToKICAgICAgICAg ICAgIHJldHVybiBAIkFYRGVmaW5pdGlvbiI7Ci0gICAgICAgIGNhc2UgRGVzY3JpcHRpb25MaXN0 Um9sZToKLSAgICAgICAgICAgIHJldHVybiBAIkFYRGVzY3JpcHRpb25MaXN0IjsKICAgICAgICAg Y2FzZSBEZXNjcmlwdGlvbkxpc3RUZXJtUm9sZToKICAgICAgICAgICAgIHJldHVybiBAIkFYVGVy bSI7CiAgICAgICAgIGNhc2UgRGVzY3JpcHRpb25MaXN0RGV0YWlsUm9sZToKSW5kZXg6IExheW91 dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE0ODMwMCkKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpA QCAtMSwzICsxLDE3IEBACisyMDEzLTA0LTEyICBKYW1lcyBDcmFpZyAgPGphbWVzQGNvb2tpZWNy b29rLmNvbT4KKworICAgICAgICBXZWJLaXQgc2hvdWxkIG5vdCBleHBvc2UgQVhTdWJyb2xlOkFY RGVzY3JpcHRpb25MaXN0IG9uIE1vdW50YWluIExpb24gYXMgaXQgY2F1c2VzIGEgcmVncmVzc2lv biBpbiBWb2ljZU92ZXIgYmVoYXZpb3IKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTExMzk3NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFNlcnZlIE5TQWNjZXNzaWJpbGl0eURlc2NyaXB0aW9uTGlzdFN1YnJv bGUgb3IgTlNBY2Nlc3NpYmlsaXR5RGVmaW5pdGlvbkxpc3RTdWJyb2xlCisgICAgICAgIGRlcGVu ZGluZyBvbiBwbGF0Zm9ybS4gVXBkYXRlZCBleGlzdGluZyB0ZXN0IGNvdmVyYWdlLgorCisgICAg ICAgICogcGxhdGZvcm0vbWFjL2FjY2Vzc2liaWxpdHkvbGlzdHMtZXhwZWN0ZWQudHh0OgorICAg ICAgICAqIHBsYXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5L3JvbGUtc3Vicm9sZS1yb2xlZGVzY3Jp cHRpb24tZXhwZWN0ZWQudHh0OgorICAgICAgICAqIHBsYXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5 L3JvbGUtc3Vicm9sZS1yb2xlZGVzY3JpcHRpb24uaHRtbDoKKwogMjAxMy0wNC0xMiAgQ29tbWl0 IFF1ZXVlICA8cm5pd2FAd2Via2l0Lm9yZz4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5n IG91dCByMTQ3OTQyLCByMTQ4MDI2LCBhbmQgcjE0ODA5Mi4KSW5kZXg6IExheW91dFRlc3RzL3Bs YXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5L2xpc3RzLWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvYWNjZXNzaWJpbGl0eS9saXN0cy1leHBlY3RlZC50 eHQJKHJldmlzaW9uIDE0ODIyMSkKKysrIExheW91dFRlc3RzL3BsYXRmb3JtL21hYy9hY2Nlc3Np YmlsaXR5L2xpc3RzLWV4cGVjdGVkLnR4dAkod29ya2luZyBjb3B5KQpAQCAtNjgsNyArNjgsNyBA QCBBWEFSSUFCdXN5OiAwCiAKIC0tLS0tLS0tLS0tLQogQVhSb2xlOiBBWExpc3QKLUFYU3Vicm9s ZTogQVhEZXNjcmlwdGlvbkxpc3QKK0FYU3Vicm9sZTogQVhEZWZpbml0aW9uTGlzdAogQVhSb2xl RGVzY3JpcHRpb246IGRlc2NyaXB0aW9uIGxpc3QKIEFYQ2hpbGRyZW46IDxhcnJheSBvZiBzaXpl IDU+CiBBWEhlbHA6IApJbmRleDogTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2FjY2Vzc2liaWxp dHkvcm9sZS1zdWJyb2xlLXJvbGVkZXNjcmlwdGlvbi1leHBlY3RlZC50eHQKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2FjY2Vzc2liaWxpdHkvcm9sZS1zdWJyb2xlLXJv bGVkZXNjcmlwdGlvbi1leHBlY3RlZC50eHQJKHJldmlzaW9uIDE0ODIyMSkKKysrIExheW91dFRl c3RzL3BsYXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5L3JvbGUtc3Vicm9sZS1yb2xlZGVzY3JpcHRp b24tZXhwZWN0ZWQudHh0CSh3b3JraW5nIGNvcHkpCkBAIC04Niw3ICs4Niw3IEBAIFBBU1M6IGRm bgogICAgICAgCiBQQVNTOiBkbAogICAgICAgQVhSb2xlOiBBWExpc3QKLSAgICAgIEFYU3Vicm9s ZTogQVhEZXNjcmlwdGlvbkxpc3QKKyAgICAgIEFYU3Vicm9sZTogQVhEZWZpbml0aW9uTGlzdAog ICAgICAgQVhSb2xlRGVzY3JpcHRpb246IGRlc2NyaXB0aW9uIGxpc3QKICAgICAgIAogUEFTUzog ZHQKSW5kZXg6IExheW91dFRlc3RzL3BsYXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5L3JvbGUtc3Vi cm9sZS1yb2xlZGVzY3JpcHRpb24uaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9wbGF0 Zm9ybS9tYWMvYWNjZXNzaWJpbGl0eS9yb2xlLXN1YnJvbGUtcm9sZWRlc2NyaXB0aW9uLmh0bWwJ KHJldmlzaW9uIDE0ODIyMSkKKysrIExheW91dFRlc3RzL3BsYXRmb3JtL21hYy9hY2Nlc3NpYmls aXR5L3JvbGUtc3Vicm9sZS1yb2xlZGVzY3JpcHRpb24uaHRtbAkod29ya2luZyBjb3B5KQpAQCAt MjcsNyArMjcsNyBAQAogPGRlbCBkYXRhLXJvbGU9IiIgZGF0YS1zdWJyb2xlPSIiIGRhdGEtcm9s ZWRlc2NyaXB0aW9uPSIiIGNsYXNzPSJleCI+WDwvZGVsPgogPCEtLSBza2lwcGVkIDxkZXRhaWxz L3N1bW1hcnk+IGh0dHA6Ly93ZWJraXQub3JnL2IvMTA4OTc5IC0tPgogPCEtLSA8ZGZuPiBodHRw Oi8vd2Via2l0Lm9yZy9iLzEwODk4MCAtLT48ZGZuIGRhdGEtcm9sZT0iIiBkYXRhLXN1YnJvbGU9 IiIgZGF0YS1yb2xlZGVzY3JpcHRpb249IiIgY2xhc3M9ImV4Ij5YPC9kZm4+Ci08ZGwgZGF0YS1y b2xlPSJBWExpc3QiIGRhdGEtc3Vicm9sZT0iQVhEZXNjcmlwdGlvbkxpc3QiIGRhdGEtcm9sZWRl c2NyaXB0aW9uPSJkZXNjcmlwdGlvbiBsaXN0IiBjbGFzcz0iZXgiPgorPGRsIGRhdGEtcm9sZT0i QVhMaXN0IiBkYXRhLXN1YnJvbGU9IkFYRGVzY3JpcHRpb25MaXN0IiBkYXRhLWFsdGVybmF0ZXN1 YnJvbGU9IkFYRGVmaW5pdGlvbkxpc3QiIGRhdGEtcm9sZWRlc2NyaXB0aW9uPSJkZXNjcmlwdGlv biBsaXN0IiBjbGFzcz0iZXgiPgogICAgIDxkdCBkYXRhLXJvbGU9IkFYR3JvdXAiIGRhdGEtc3Vi cm9sZT0iQVhUZXJtIiBkYXRhLXJvbGVkZXNjcmlwdGlvbj0idGVybSIgY2xhc3M9ImV4Ij5YPC9k dD4KICAgICA8ZGQgZGF0YS1yb2xlPSJBWEdyb3VwIiBkYXRhLXN1YnJvbGU9IkFYRGVzY3JpcHRp b24iIGRhdGEtcm9sZWRlc2NyaXB0aW9uPSJkZXNjcmlwdGlvbiIgY2xhc3M9ImV4Ij5YPC9kZD4K IDwvZGw+CkBAIC0zMTAsMTMgKzMxMCwxNiBAQCBpZiAod2luZG93LnRlc3RSdW5uZXIgJiYgd2lu ZG93LmFjY2Vzc2liCiAgICAgICAgIG91dHB1dCArPSBzdWJyb2xlICsgaW5kZW50OwogICAgICAg ICBvdXRwdXQgKz0gcm9sZURlc2NyaXB0aW9uICsgaW5kZW50OwogCi0gICAgICAgIGV4cGVjdGF0 aW9uID0gZWwuZ2V0QXR0cmlidXRlKCdkYXRhLXJvbGUnKSArIi8iKyBlbC5nZXRBdHRyaWJ1dGUo J2RhdGEtc3Vicm9sZScpICsiLyIrIGVsLmdldEF0dHJpYnV0ZSgnZGF0YS1yb2xlZGVzY3JpcHRp b24nKTsKKyAgICAgICAgZXhwZWN0YXRpb24gPSBlbC5nZXRBdHRyaWJ1dGUoJ2RhdGEtcm9sZScp ICsgIi8iOworICAgICAgICBleHBlY3RhdGlvbiArPSBlbC5nZXRBdHRyaWJ1dGUoJ2RhdGEtc3Vi cm9sZScpOworICAgICAgICBpZiAoZWwuZ2V0QXR0cmlidXRlKCdkYXRhLWFsdGVybmF0ZXN1YnJv bGUnKSkgZXhwZWN0YXRpb24gKz0gIiBvciAiICsgZWwuZ2V0QXR0cmlidXRlKCdkYXRhLWFsdGVy bmF0ZXN1YnJvbGUnKTsKKyAgICAgICAgZXhwZWN0YXRpb24gKz0gIi8iICsgZWwuZ2V0QXR0cmli dXRlKCdkYXRhLXJvbGVkZXNjcmlwdGlvbicpOwogCiAgICAgICAgIHJlc3VsdCA9IGRvY3VtZW50 LmdldEVsZW1lbnRCeUlkKCdjb25zb2xlJyk7CiAgICAgICAgIAogICAgICAgICAvLyBUZXN0IEFY Um9sZSwgQVhTdWJyb2xlLCBhbmQgQVhSb2xlRGVzY3JpcHRpb24uCiAgICAgICAgIGlmIChyb2xl LnJlcGxhY2UoJ0FYUm9sZTogJywnJykgPT0gZWwuZ2V0QXR0cmlidXRlKCdkYXRhLXJvbGUnKQot ICAgICAgICAgICAgJiYgc3Vicm9sZS5yZXBsYWNlKCdBWFN1YnJvbGU6ICcsJycpID09IGVsLmdl dEF0dHJpYnV0ZSgnZGF0YS1zdWJyb2xlJykKKyAgICAgICAgICAgICYmIChzdWJyb2xlLnJlcGxh Y2UoJ0FYU3Vicm9sZTogJywnJykgPT0gZWwuZ2V0QXR0cmlidXRlKCdkYXRhLXN1YnJvbGUnKSB8 fCBzdWJyb2xlLnJlcGxhY2UoJ0FYU3Vicm9sZTogJywnJykgPT0gZWwuZ2V0QXR0cmlidXRlKCdk YXRhLWFsdGVybmF0ZXN1YnJvbGUnKSkKICAgICAgICAgICAgICYmIHJvbGVEZXNjcmlwdGlvbi5y ZXBsYWNlKCdBWFJvbGVEZXNjcmlwdGlvbjogJywnJykgPT0gZWwuZ2V0QXR0cmlidXRlKCdkYXRh LXJvbGVkZXNjcmlwdGlvbicpKSB7CiAgICAgICAgICAgICByZXN1bHQuaW5uZXJUZXh0ICs9ICJQ QVNTOiAiICsgb3V0cHV0ICsgIlxuIjsKICAgICAgICAgfSBlbHNlIHsK