32631 2009-12-16 13:45:08 -0800 MSAA: Accessibility role of text nodes is wrong 2009-12-16 21:58:25 -0800 1 1 1 Unclassified WebKit Accessibility 528+ (Nightly build) PC Windows XP RESOLVED FIXED InRadar P2 Normal --- 1 jhoneycutt jhoneycutt webkit.review.bot oldest_to_newest 172517 0 jhoneycutt 2009-12-16 13:45:08 -0800 The accessibility role of text nodes should be ROLE_SYSTEM_TEXT, not ROLE_SYSTEM_STATICTEXT, to match IE and Firefox. <rdar://problem/7369084> 172568 1 45022 jhoneycutt 2009-12-16 16:35:56 -0800 Created attachment 45022 patch 172572 2 webkit.review.bot 2009-12-16 16:39:20 -0800 style-queue ran check-webkit-style on attachment 45022 without any errors. 172639 3 jhoneycutt 2009-12-16 21:58:25 -0800 Committed in r52233. 45022 2009-12-16 16:35:56 -0800 2009-12-16 17:02:51 -0800 patch 0001-MSAA-Accessibility-role-of-text-nodes-is-wrong.patch text/plain 10649 jhoneycutt RnJvbSBiOTUyZmZlMjg3OTZlMjFkOGE5YTExNTBmYmEwMGY5NmMxYjE5OGIyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKb24gSG9uZXljdXR0IDxqaG9uZXljdXR0QGFwcGxlLmNvbT4K RGF0ZTogV2VkLCAxNiBEZWMgMjAwOSAxNjozMzo1OSAtMDgwMApTdWJqZWN0OiBbUEFUQ0hdIE1T QUE6IEFjY2Vzc2liaWxpdHkgcm9sZSBvZiB0ZXh0IG5vZGVzIGlzIHdyb25nCgpodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzI2MzEKPHJkYXI6Ly9wcm9ibGVtLzczNjkw ODQ+CgpSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KCldlYkNvcmU6CgpUZXN0OiBwbGF0Zm9y bS93aW4vYWNjZXNzaWJpbGl0eS90ZXh0LXJvbGUuaHRtbAoKKiBhY2Nlc3NpYmlsaXR5L0FjY2Vz c2liaWxpdHlPYmplY3QuaDoKKFdlYkNvcmU6Oik6CkFkZCBhIG5ldyByb2xlIHRvIHRoZSBlbnVt LgooV2ViQ29yZTo6QWNjZXNzaWJpbGl0eU9iamVjdDo6cm9sZVZhbHVlRm9yTVNBQSk6CkRlY2xh cmUgYSBmdW5jdGlvbiB0byByZXR1cm4gdGhlIGFjY2Vzc2liaWxpdHkgcm9sZSBmb3IgTVNBQTsg dGhlIGJhc2UKaW1wbGVtZW50YXRpb24gcmV0dXJucyB0aGUgb2xkIHJvbGUgdmFsdWUuCgoqIGFj Y2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5jcHA6CihXZWJDb3JlOjpBY2Nl c3NpYmlsaXR5UmVuZGVyT2JqZWN0OjpBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0KToKSW5pdGlh bGl6ZSBtX3JvbGVGb3JNU0FBLgooV2ViQ29yZTo6QWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6 cm9sZVZhbHVlRm9yTVNBQSk6CklmIG1fcm9sZUZvck1TQUEgaGFzIGJlZW4gc2V0LCByZXR1cm4g aXQuIElmIHRoZSByZW5kZXJlciBpcyBhClJlbmRlclRleHQsIHNldCB0aGUgcm9sZSB0byBFZGl0 YWJsZVRleHRSb2xlIHRvIG1hdGNoIElFIGFuZCBGaXJlZm94LgpPdGhlcndpc2UsIHNldCB0aGUg cm9sZSBmb3IgTVNBQSB0byB0aGUgb2xkIHJvbGUgdmFsdWUuCgoqIGFjY2Vzc2liaWxpdHkvQWNj ZXNzaWJpbGl0eVJlbmRlck9iamVjdC5oOgpBZGQgYSBtZW1iZXIgdG8gaG9sZCB0aGUgcm9sZSBm b3IgTVNBQSwgYW5kIGRlY2xhcmUgYW4gb3ZlcnJpZGUgb2YKcm9sZVZhbHVlRm9yTVNBQSgpLgoK V2ViS2l0L3dpbjoKCiogQWNjZXNzaWJsZUJhc2UuY3BwOgooTVNBQVJvbGUpOgpJZiB0aGUgcm9s ZSBpcyBXZWJDb3JlOjpFZGl0YWJsZVRleHRSb2xlLCByZXR1cm4gUk9MRV9TWVNURU1fVEVYVC4K KEFjY2Vzc2libGVCYXNlOjpyb2xlKToKQ2FsbCByb2xlVmFsdWVGb3JNU0FBKCkuCgpMYXlvdXRU ZXN0czoKCiogcGxhdGZvcm0vd2luL2FjY2Vzc2liaWxpdHkvdGV4dC1yb2xlLWV4cGVjdGVkLnR4 dDogQWRkZWQuCiogcGxhdGZvcm0vd2luL2FjY2Vzc2liaWxpdHkvdGV4dC1yb2xlLmh0bWw6IEFk ZGVkLgpDaGVjayB0aGF0IHRoZSByb2xlIG9mIHRoZSB0ZXh0IG5vZGUgdGhhdCBpcyB0aGUgZmly c3QgY2hpbGQgb2YgdGhlCjxhPiB0YWcgaGFzIHRoZSAiZWRpdGFibGUgdGV4dCIgcm9sZS4KLS0t CiBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAg MTQgKysrKysrKysrCiAuLi4vd2luL2FjY2Vzc2liaWxpdHkvdGV4dC1yb2xlLWV4cGVjdGVkLnR4 dCAgICAgICB8ICAgIDYgKysrKwogLi4uL3BsYXRmb3JtL3dpbi9hY2Nlc3NpYmlsaXR5L3RleHQt cm9sZS5odG1sICAgICAgfCAgIDMxICsrKysrKysrKysrKysrKysrKysrCiBXZWJDb3JlL0NoYW5n ZUxvZyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAgMzAgKysrKysrKysrKysr KysrKysrKwogV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuaCAgICAg ICAgfCAgICA0ICsrLQogLi4uL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVj dC5jcHAgICAgfCAgIDE0ICsrKysrKysrKwogV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2li aWxpdHlSZW5kZXJPYmplY3QuaCAgfCAgICAzICsrCiBXZWJLaXQvd2luL0FjY2Vzc2libGVCYXNl LmNwcCAgICAgICAgICAgICAgICAgICAgICB8ICAgIDMgKy0KIFdlYktpdC93aW4vQ2hhbmdlTG9n ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgICAxNSArKysrKysrKysKIDkgZmlsZXMg Y2hhbmdlZCwgMTE4IGluc2VydGlvbnMoKyksIDIgZGVsZXRpb25zKC0pCiBjcmVhdGUgbW9kZSAx MDA2NDQgTGF5b3V0VGVzdHMvcGxhdGZvcm0vd2luL2FjY2Vzc2liaWxpdHkvdGV4dC1yb2xlLWV4 cGVjdGVkLnR4dAogY3JlYXRlIG1vZGUgMTAwNjQ0IExheW91dFRlc3RzL3BsYXRmb3JtL3dpbi9h Y2Nlc3NpYmlsaXR5L3RleHQtcm9sZS5odG1sCgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hh bmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDI2MzZiY2YuLjA1MjUyZGUgMTAw NjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKQEAgLTEsMyArMSwxNyBAQAorMjAwOS0xMi0xNiAgSm9uIEhvbmV5Y3V0dCAgPGpob25leWN1 dHRAYXBwbGUuY29tPgorCisgICAgICAgIE1TQUE6IEFjY2Vzc2liaWxpdHkgcm9sZSBvZiB0ZXh0 IG5vZGVzIGlzIHdyb25nCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTMyNjMxCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS83MzY5MDg0PgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcGxhdGZvcm0vd2lu L2FjY2Vzc2liaWxpdHkvdGV4dC1yb2xlLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICog cGxhdGZvcm0vd2luL2FjY2Vzc2liaWxpdHkvdGV4dC1yb2xlLmh0bWw6IEFkZGVkLgorICAgICAg ICBDaGVjayB0aGF0IHRoZSByb2xlIG9mIHRoZSB0ZXh0IG5vZGUgdGhhdCBpcyB0aGUgZmlyc3Qg Y2hpbGQgb2YgdGhlCisgICAgICAgIDxhPiB0YWcgaGFzIHRoZSAiZWRpdGFibGUgdGV4dCIgcm9s ZS4KKwogMjAwOS0xMi0xMCAgUGF0cmlrIFBlcnNzb24gIDxwYXRyaWsuai5wZXJzc29uQGVyaWNz c29uLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBBZGFtIEJhcnRoLgpkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvcGxhdGZvcm0vd2luL2FjY2Vzc2liaWxpdHkvdGV4dC1yb2xlLWV4cGVjdGVk LnR4dCBiL0xheW91dFRlc3RzL3BsYXRmb3JtL3dpbi9hY2Nlc3NpYmlsaXR5L3RleHQtcm9sZS1l eHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uN2ZhZTIzZQot LS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL3dpbi9hY2Nlc3NpYmlsaXR5 L3RleHQtcm9sZS1leHBlY3RlZC50eHQKQEAgLTAsMCArMSw2IEBACitUaGlzIHRlc3QgdmVyaWZp ZXMgdGhhdCwgb24gV2luZG93cywgdGV4dCBub2RlcyByZXR1cm4gImVkaXRhYmxlIHRleHQiIGZv ciB0aGVpciByb2xlIHZhbHVlLiAKKworQnVnIDMyNjMxIC0gTVNBQTogQWNjZXNzaWJpbGl0eSBy b2xlIG9mIHRleHQgbm9kZXMgaXMgd3JvbmcKKworUEFTUyBlLnJvbGUgaXMgImVkaXRhYmxlIHRl eHQiCisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL3dpbi9hY2Nlc3NpYmlsaXR5 L3RleHQtcm9sZS5odG1sIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vd2luL2FjY2Vzc2liaWxpdHkv dGV4dC1yb2xlLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNTczODA1 MgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL3dpbi9hY2Nlc3NpYmls aXR5L3RleHQtcm9sZS5odG1sCkBAIC0wLDAgKzEsMzEgQEAKKzxodG1sPgorICAgIDxoZWFkPgor ICAgICAgICA8bGluayByZWw9InN0eWxlc2hlZXQiIGhyZWY9Ii4uLy4uLy4uL2Zhc3QvanMvcmVz b3VyY2VzL2pzLXRlc3Qtc3R5bGUuY3NzIj4KKyAgICAgICAgPHNjcmlwdCBzcmM9Ii4uLy4uLy4u L2Zhc3QvanMvcmVzb3VyY2VzL2pzLXRlc3QtcHJlLmpzIj48L3NjcmlwdD4KKworICAgICAgICA8 c2NyaXB0PgorICAgICAgICAgICAgaWYgKHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlcikKKyAg ICAgICAgICAgICAgICBsYXlvdXRUZXN0Q29udHJvbGxlci5kdW1wQXNUZXh0KCk7CisgICAgICAg IDwvc2NyaXB0PgorICAgIDwvaGVhZD4KKyAgICA8Ym9keSBpZD0iYm9keSI+CisgICAgICAgIDxw PgorICAgICAgICAgICAgVGhpcyB0ZXN0IHZlcmlmaWVzIHRoYXQsIG9uIFdpbmRvd3MsIHRleHQg bm9kZXMgcmV0dXJuICJlZGl0YWJsZQorICAgICAgICAgICAgdGV4dCIgZm9yIHRoZWlyIHJvbGUg dmFsdWUuCisgICAgICAgICAgICA8YnI+PGJyPgorICAgICAgICAgICAgPGEgaWQ9ImxpbmsiIGhy ZWY9Imh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMjYzMSI+QnVnIDMy NjMxIC0KKyAgICAgICAgICAgIE1TQUE6IEFjY2Vzc2liaWxpdHkgcm9sZSBvZiB0ZXh0IG5vZGVz IGlzIHdyb25nPC9hPgorICAgICAgICA8L3A+CisKKyAgICAgICAgPHAgaWQ9ImNvbnNvbGUiPjwv cD4KKworICAgICAgICA8c2NyaXB0PgorICAgICAgICAgICAgaWYgKHdpbmRvdy5hY2Nlc3NpYmls aXR5Q29udHJvbGxlcikgeworICAgICAgICAgICAgICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlk KCJsaW5rIikuZm9jdXMoKTsKKworICAgICAgICAgICAgICAgIHZhciBlID0gYWNjZXNzaWJpbGl0 eUNvbnRyb2xsZXIuZm9jdXNlZEVsZW1lbnQuY2hpbGRBdEluZGV4KDApOworICAgICAgICAgICAg ICAgIHNob3VsZEJlKCdlLnJvbGUnLCAnImVkaXRhYmxlIHRleHQiJyk7CisgICAgICAgICAgICB9 CisgICAgICAgIDwvc2NyaXB0PgorICAgIDwvYm9keT4KKzwvaHRtbD4KZGlmZiAtLWdpdCBhL1dl YkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDk0NzEwYS4uM2U3NWEw NCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cK QEAgLTEsMyArMSwzMyBAQAorMjAwOS0xMi0xNiAgSm9uIEhvbmV5Y3V0dCAgPGpob25leWN1dHRA YXBwbGUuY29tPgorCisgICAgICAgIE1TQUE6IEFjY2Vzc2liaWxpdHkgcm9sZSBvZiB0ZXh0IG5v ZGVzIGlzIHdyb25nCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTMyNjMxCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS83MzY5MDg0PgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRlc3Q6IHBsYXRmb3JtL3dp bi9hY2Nlc3NpYmlsaXR5L3RleHQtcm9sZS5odG1sCisKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5 L0FjY2Vzc2liaWxpdHlPYmplY3QuaDoKKyAgICAgICAgKFdlYkNvcmU6Oik6CisgICAgICAgIEFk ZCBhIG5ldyByb2xlIHRvIHRoZSBlbnVtLgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0 eU9iamVjdDo6cm9sZVZhbHVlRm9yTVNBQSk6CisgICAgICAgIERlY2xhcmUgYSBmdW5jdGlvbiB0 byByZXR1cm4gdGhlIGFjY2Vzc2liaWxpdHkgcm9sZSBmb3IgTVNBQTsgdGhlIGJhc2UKKyAgICAg ICAgaW1wbGVtZW50YXRpb24gcmV0dXJucyB0aGUgb2xkIHJvbGUgdmFsdWUuCisKKyAgICAgICAg KiBhY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuY3BwOgorICAgICAgICAo V2ViQ29yZTo6QWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6QWNjZXNzaWJpbGl0eVJlbmRlck9i amVjdCk6CisgICAgICAgIEluaXRpYWxpemUgbV9yb2xlRm9yTVNBQS4KKyAgICAgICAgKFdlYkNv cmU6OkFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OnJvbGVWYWx1ZUZvck1TQUEpOgorICAgICAg ICBJZiBtX3JvbGVGb3JNU0FBIGhhcyBiZWVuIHNldCwgcmV0dXJuIGl0LiBJZiB0aGUgcmVuZGVy ZXIgaXMgYQorICAgICAgICBSZW5kZXJUZXh0LCBzZXQgdGhlIHJvbGUgdG8gRWRpdGFibGVUZXh0 Um9sZSB0byBtYXRjaCBJRSBhbmQgRmlyZWZveC4KKyAgICAgICAgT3RoZXJ3aXNlLCBzZXQgdGhl IHJvbGUgZm9yIE1TQUEgdG8gdGhlIG9sZCByb2xlIHZhbHVlLgorCisgICAgICAgICogYWNjZXNz aWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0Lmg6CisgICAgICAgIEFkZCBhIG1lbWJl ciB0byBob2xkIHRoZSByb2xlIGZvciBNU0FBLCBhbmQgZGVjbGFyZSBhbiBvdmVycmlkZSBvZgor ICAgICAgICByb2xlVmFsdWVGb3JNU0FBKCkuCisKIDIwMDktMTItMTAgIEpvbiBIb25leWN1dHQg IDxqaG9uZXljdXR0QGFwcGxlLmNvbT4KIAogICAgICAgICBQYXNzIG1vcmUgaW5mb3JtYXRpb24g YWJvdXQgYSBwbHVnLWluIHRvIHRoZSBQbHVnaW5IYWx0ZXJEZWxlZ2F0ZQpkaWZmIC0tZ2l0IGEv V2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuaCBiL1dlYkNvcmUvYWNj ZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmgKaW5kZXggOGU0NjMxMS4uMWRjNjBjMyAx MDA2NDQKLS0tIGEvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuaAor KysgYi9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdC5oCkBAIC0xNjcs NiArMTY3LDcgQEAgZW51bSBBY2Nlc3NpYmlsaXR5Um9sZSB7CiAgICAgVHJlZVJvbGUsCiAgICAg VHJlZUl0ZW1Sb2xlLAogICAgIERpcmVjdG9yeVJvbGUsCisgICAgRWRpdGFibGVUZXh0Um9sZSwK ICAgICAKICAgICAvLyBBUklBIEdyb3VwaW5nIHJvbGVzCiAgICAgTGFuZG1hcmtBcHBsaWNhdGlv blJvbGUsCkBAIC00ODcsNyArNDg4LDggQEAgcHVibGljOgogICAgIHZpcnR1YWwgU3RyaW5nIHN0 cmluZ1JvbGVGb3JNU0FBKCkgY29uc3QgeyByZXR1cm4gU3RyaW5nKCk7IH0KICAgICB2aXJ0dWFs IFN0cmluZyBuYW1lRm9yTVNBQSgpIGNvbnN0IHsgcmV0dXJuIFN0cmluZygpOyB9CiAgICAgdmly dHVhbCBTdHJpbmcgZGVzY3JpcHRpb25Gb3JNU0FBKCkgY29uc3QgeyByZXR1cm4gU3RyaW5nKCk7 IH0KLSAgICAKKyAgICB2aXJ0dWFsIEFjY2Vzc2liaWxpdHlSb2xlIHJvbGVWYWx1ZUZvck1TQUEo KSBjb25zdCB7IHJldHVybiBtX3JvbGU7IH0KKwogICAgIC8vIFVzZWQgYnkgYW4gQVJJQSB0cmVl IHRvIGdldCBhbGwgaXRzIHJvd3MuCiAgICAgdm9pZCBhcmlhVHJlZVJvd3MoQWNjZXNzaWJpbGl0 eUNoaWxkcmVuVmVjdG9yJik7CiAgICAgLy8gVXNlZCBieSBhbiBBUklBIHRyZWUgaXRlbSB0byBn ZXQgYWxsIG9mIGl0cyBkaXJlY3Qgcm93cyB0aGF0IGl0IGNhbiBkaXNjbG9zZS4KZGlmZiAtLWdp dCBhL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmNwcCBi L1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmNwcAppbmRl eCBjNTdkZDkyLi43NDZiNDQ0IDEwMDY0NAotLS0gYS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNj ZXNzaWJpbGl0eVJlbmRlck9iamVjdC5jcHAKKysrIGIvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0Fj Y2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuY3BwCkBAIC04NSw2ICs4NSw3IEBAIEFjY2Vzc2liaWxp dHlSZW5kZXJPYmplY3Q6OkFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QoUmVuZGVyT2JqZWN0KiBy ZW5kZXJlcikKICAgICAsIG1fcmVuZGVyZXIocmVuZGVyZXIpCiAgICAgLCBtX2FyaWFSb2xlKFVu a25vd25Sb2xlKQogICAgICwgbV9jaGlsZHJlbkRpcnR5KGZhbHNlKQorICAgICwgbV9yb2xlRm9y TVNBQShVbmtub3duUm9sZSkKIHsKICAgICB1cGRhdGVBY2Nlc3NpYmlsaXR5Um9sZSgpOwogI2lm bmRlZiBOREVCVUcKQEAgLTMwNzQsNCArMzA3NSwxNyBAQCBTdHJpbmcgQWNjZXNzaWJpbGl0eVJl bmRlck9iamVjdDo6ZGVzY3JpcHRpb25Gb3JNU0FBKCkgY29uc3QKICAgICByZXR1cm4gU3RyaW5n KCk7CiB9CiAKK0FjY2Vzc2liaWxpdHlSb2xlIEFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OnJv bGVWYWx1ZUZvck1TQUEoKSBjb25zdAoreworICAgIGlmIChtX3JvbGVGb3JNU0FBICE9IFVua25v d25Sb2xlKQorICAgICAgICByZXR1cm4gbV9yb2xlRm9yTVNBQTsKKworICAgIGlmIChtX3JlbmRl cmVyICYmIG1fcmVuZGVyZXItPmlzVGV4dCgpKQorICAgICAgICBtX3JvbGVGb3JNU0FBID0gRWRp dGFibGVUZXh0Um9sZTsKKyAgICBlbHNlCisgICAgICAgIG1fcm9sZUZvck1TQUEgPSBtX3JvbGU7 CisKKyAgICByZXR1cm4gbV9yb2xlRm9yTVNBQTsKK30KKwogfSAvLyBuYW1lc3BhY2UgV2ViQ29y ZQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJP YmplY3QuaCBiL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0 LmgKaW5kZXggZDUzNzg4MS4uOTRhZTNlMCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9hY2Nlc3NpYmls aXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuaAorKysgYi9XZWJDb3JlL2FjY2Vzc2liaWxp dHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5oCkBAIC0yNDgsNiArMjQ4LDcgQEAgcHVibGlj OgogICAgIHZpcnR1YWwgU3RyaW5nIHN0cmluZ1JvbGVGb3JNU0FBKCkgY29uc3Q7CiAgICAgdmly dHVhbCBTdHJpbmcgbmFtZUZvck1TQUEoKSBjb25zdDsKICAgICB2aXJ0dWFsIFN0cmluZyBkZXNj cmlwdGlvbkZvck1TQUEoKSBjb25zdDsKKyAgICB2aXJ0dWFsIEFjY2Vzc2liaWxpdHlSb2xlIHJv bGVWYWx1ZUZvck1TQUEoKSBjb25zdDsKIAogcHJvdGVjdGVkOgogICAgIFJlbmRlck9iamVjdCog bV9yZW5kZXJlcjsKQEAgLTI4OCw2ICsyODksOCBAQCBwcml2YXRlOgogICAgIHZvaWQgZWxlbWVu dHNGcm9tQXR0cmlidXRlKFZlY3RvcjxFbGVtZW50Kj4mIGVsZW1lbnRzLCBjb25zdCBRdWFsaWZp ZWROYW1lJiBuYW1lKSBjb25zdDsKICAgICAKICAgICB2b2lkIG1hcmtDaGlsZHJlbkRpcnR5KCkg Y29uc3QgeyBtX2NoaWxkcmVuRGlydHkgPSB0cnVlOyB9CisKKyAgICBtdXRhYmxlIEFjY2Vzc2li aWxpdHlSb2xlIG1fcm9sZUZvck1TQUE7CiB9OwogICAgIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29y ZQpkaWZmIC0tZ2l0IGEvV2ViS2l0L3dpbi9BY2Nlc3NpYmxlQmFzZS5jcHAgYi9XZWJLaXQvd2lu L0FjY2Vzc2libGVCYXNlLmNwcAppbmRleCA0N2I4MzY5Li40MmIzYjExIDEwMDY0NAotLS0gYS9X ZWJLaXQvd2luL0FjY2Vzc2libGVCYXNlLmNwcAorKysgYi9XZWJLaXQvd2luL0FjY2Vzc2libGVC YXNlLmNwcApAQCAtNTQzLDYgKzU0Myw3IEBAIHN0YXRpYyBsb25nIE1TQUFSb2xlKEFjY2Vzc2li aWxpdHlSb2xlIHJvbGUpCiAgICAgICAgIGNhc2UgV2ViQ29yZTo6VGV4dEZpZWxkUm9sZToKICAg ICAgICAgY2FzZSBXZWJDb3JlOjpUZXh0QXJlYVJvbGU6CiAgICAgICAgIGNhc2UgV2ViQ29yZTo6 TGlzdE1hcmtlclJvbGU6CisgICAgICAgIGNhc2UgV2ViQ29yZTo6RWRpdGFibGVUZXh0Um9sZToK ICAgICAgICAgICAgIHJldHVybiBST0xFX1NZU1RFTV9URVhUOwogICAgICAgICBjYXNlIFdlYkNv cmU6OlN0YXRpY1RleHRSb2xlOgogICAgICAgICAgICAgcmV0dXJuIFJPTEVfU1lTVEVNX1NUQVRJ Q1RFWFQ7CkBAIC01NzIsNyArNTczLDcgQEAgc3RhdGljIGxvbmcgTVNBQVJvbGUoQWNjZXNzaWJp bGl0eVJvbGUgcm9sZSkKIAogbG9uZyBBY2Nlc3NpYmxlQmFzZTo6cm9sZSgpIGNvbnN0CiB7Ci0g ICAgcmV0dXJuIE1TQUFSb2xlKG1fb2JqZWN0LT5yb2xlVmFsdWUoKSk7CisgICAgcmV0dXJuIE1T QUFSb2xlKG1fb2JqZWN0LT5yb2xlVmFsdWVGb3JNU0FBKCkpOwogfQogCiBIUkVTVUxUIEFjY2Vz c2libGVCYXNlOjpnZXRBY2Nlc3NpYmlsaXR5T2JqZWN0Rm9yQ2hpbGQoVkFSSUFOVCB2Q2hpbGQs IEFjY2Vzc2liaWxpdHlPYmplY3QqJiBjaGlsZE9iaikgY29uc3QKZGlmZiAtLWdpdCBhL1dlYktp dC93aW4vQ2hhbmdlTG9nIGIvV2ViS2l0L3dpbi9DaGFuZ2VMb2cKaW5kZXggOTU3MDVhOS4uYjNl MWYwYSAxMDA2NDQKLS0tIGEvV2ViS2l0L3dpbi9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L3dpbi9D aGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAwOS0xMi0xNiAgSm9uIEhvbmV5Y3V0dCAgPGpo b25leWN1dHRAYXBwbGUuY29tPgorCisgICAgICAgIE1TQUE6IEFjY2Vzc2liaWxpdHkgcm9sZSBv ZiB0ZXh0IG5vZGVzIGlzIHdyb25nCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTMyNjMxCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS83MzY5MDg0Pgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogQWNjZXNz aWJsZUJhc2UuY3BwOgorICAgICAgICAoTVNBQVJvbGUpOgorICAgICAgICBJZiB0aGUgcm9sZSBp cyBXZWJDb3JlOjpFZGl0YWJsZVRleHRSb2xlLCByZXR1cm4gUk9MRV9TWVNURU1fVEVYVC4KKyAg ICAgICAgKEFjY2Vzc2libGVCYXNlOjpyb2xlKToKKyAgICAgICAgQ2FsbCByb2xlVmFsdWVGb3JN U0FBKCkuCisKIDIwMDktMTItMTAgIEpvbiBIb25leWN1dHQgIDxqaG9uZXljdXR0QGFwcGxlLmNv bT4KIAogICAgICAgICBQYXNzIG1vcmUgaW5mb3JtYXRpb24gYWJvdXQgYSBwbHVnLWluIHRvIHRo ZSBQbHVnaW5IYWx0ZXJEZWxlZ2F0ZQotLSAKMS42LjUuMi4xNDMuZzhjYzYyCgo=