66180 2011-08-12 18:03:02 -0700 AccessibilityObject levels are inconsistent 2011-08-17 11:28:20 -0700 1 1 1 Unclassified WebKit Accessibility 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 0 samuel.white webkit-unassigned cfleizach samuel.white webkit.review.bot oldest_to_newest 450775 0 samuel.white 2011-08-12 18:03:02 -0700 Currently, three types of AccessibilityObjects return a level value. That is, AccessibilityObjects that represent headings, blockquotes, or tables can have a level associated with them. At the moment, both the headingLevel and blockquoteLevel functions return 0 only when called on an object of the wrong type which makes 1 the smallest valid level each supports. However, tableLevel returns a value of 0 both when called on non-table AccessibilityObjects AND when called on a table that is not inside any other table. Because some of these level values are not part of any W3C HTML draft and are currently only used by various screen readers I think WebKit should enforce some consistency via additional layout tests so this problem does not grow. This means that tableLevel should be fixed so that it reports a value of 0 only when it is called on a non-table object. Also, this would ensure that these level values remain consistant moving forward and if other levels become useful a central layout test would be available to ensure they too remain consistant. 452263 1 104174 samuel.white 2011-08-17 08:15:07 -0700 Created attachment 104174 Level patch. This patch makes the level values returned by AccessibilityObjects consistent and adds a layout test to ensure that they stay that way moving forward. 452289 2 104174 cfleizach 2011-08-17 09:22:37 -0700 Comment on attachment 104174 Level patch. r=me 452404 3 104174 webkit.review.bot 2011-08-17 11:28:15 -0700 Comment on attachment 104174 Level patch. Clearing flags on attachment: 104174 Committed r93226: <http://trac.webkit.org/changeset/93226> 452405 4 webkit.review.bot 2011-08-17 11:28:20 -0700 All reviewed patches have been landed. Closing bug. 104174 2011-08-17 08:15:07 -0700 2011-08-17 11:28:15 -0700 Level patch. patch.txt text/plain 14968 samuel.white SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDkzMjA2KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTEtMDgtMTcgIFNhbSBXaGl0 ZSAgPHNhbXVlbC53aGl0ZUByb2NoZXN0ZXIuZWR1PgorCisgICAgICAgIEFjY2Vzc2liaWxpdHlP YmplY3QgbGV2ZWxzIGFyZSBpbmNvbnNpc3RlbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTY2MTgwCisgICAgICAgIAorICAgICAgICBVcGRhdGVkIGFj Y2Vzc2liaWxpdHlUYWJsZSB0byByZXR1cm4gbGV2ZWwgdmFsdWVzIGNvbnNpc3RlbnQgd2l0aCBv dGhlciBhY2Nlc3NpYmlsaXR5T2JqZWN0cyB0aGF0CisgICAgICAgIHJldHVybiBsZXZlbCB2YWx1 ZXMuIFRoaXMgbWVhbnMgYSB2YWx1ZSBvZiAwIGlzIG5vdyBvbmx5IHJldHVybmVkIHdoZW4gdGFi bGVMZXZlbCgpIGlzIGNhbGxlZCBvbiBhCisgICAgICAgIG5vbi10YWJsZSBlbGVtZW50LgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRlc3Q6IHBsYXRm b3JtL21hYy9hY2Nlc3NpYmlsaXR5L2VsZW1lbnQtbGV2ZWwuaHRtbAorCisgICAgICAgICogYWNj ZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5VGFibGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QWNj ZXNzaWJpbGl0eVRhYmxlOjp0YWJsZUxldmVsKToKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L21h Yy9BY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlci5tbToKKyAgICAgICAgKC1bQWNjZXNzaWJpbGl0 eU9iamVjdFdyYXBwZXIgYWNjZXNzaWJpbGl0eUF0dHJpYnV0ZVZhbHVlOl0pOgorCiAyMDExLTA4 LTE3ICBTYWlsZXNoIEFncmF3YWwgIDxzYWlsQGNocm9taXVtLm9yZz4KIAogICAgICAgICBDaHJv bWl1bSBNYWM6IEZpeCBpbXBsZW1lbnRhdGlvbiBvZiB3a1Njcm9sbGJhck1pbmltdW1Ub3RhbExl bmd0aE5lZWRlZEZvclRodW1iIHRvIG1hdGNoIFdlYktpdFN5c3RlbUludGVyZmFjZQpJbmRleDog U291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5VGFibGUuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVRhYmxl LmNwcAkocmV2aXNpb24gOTMxOTMpCisrKyBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0Fj Y2Vzc2liaWxpdHlUYWJsZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ1MCw3ICs0NTAsNyBAQCB1 bnNpZ25lZCBBY2Nlc3NpYmlsaXR5VGFibGU6OnJvd0NvdW50KCkKIGludCBBY2Nlc3NpYmlsaXR5 VGFibGU6OnRhYmxlTGV2ZWwoKSBjb25zdAogewogICAgIGludCBsZXZlbCA9IDA7Ci0gICAgZm9y IChBY2Nlc3NpYmlsaXR5T2JqZWN0KiBvYmogPSBwYXJlbnRPYmplY3QoKTsgb2JqOyBvYmogPSBv YmotPnBhcmVudE9iamVjdCgpKSB7CisgICAgZm9yIChBY2Nlc3NpYmlsaXR5T2JqZWN0KiBvYmog PSBzdGF0aWNfY2FzdDxBY2Nlc3NpYmlsaXR5T2JqZWN0Kj4oY29uc3RfY2FzdDxBY2Nlc3NpYmls aXR5VGFibGUqPih0aGlzKSk7IG9iajsgb2JqID0gb2JqLT5wYXJlbnRPYmplY3QoKSkgewogICAg ICAgICBpZiAob2JqLT5pc0FjY2Vzc2liaWxpdHlUYWJsZSgpKQogICAgICAgICAgICAgKytsZXZl bDsKICAgICB9CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9BY2Nlc3Np YmlsaXR5T2JqZWN0V3JhcHBlci5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9hY2Nl c3NpYmlsaXR5L21hYy9BY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlci5tbQkocmV2aXNpb24gOTMx OTMpCisrKyBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9BY2Nlc3NpYmlsaXR5T2Jq ZWN0V3JhcHBlci5tbQkod29ya2luZyBjb3B5KQpAQCAtMjE5OCwxMyArMjE5OCwxNyBAQCAtIChp ZClhY2Nlc3NpYmlsaXR5QXR0cmlidXRlVmFsdWU6KE5TU3RyCiAKICAgICAgICAgaWYgKFthdHRy aWJ1dGVOYW1lIGlzRXF1YWxUb1N0cmluZzpOU0FjY2Vzc2liaWxpdHlCbG9ja1F1b3RlTGV2ZWxB dHRyaWJ1dGVdKQogICAgICAgICAgICAgcmV0dXJuIFtOU051bWJlciBudW1iZXJXaXRoSW50Om1f b2JqZWN0LT5ibG9ja3F1b3RlTGV2ZWwoKV07CisgICAgICAgIGlmIChbYXR0cmlidXRlTmFtZSBp c0VxdWFsVG9TdHJpbmc6QCJBWFRhYmxlTGV2ZWwiXSkKKyAgICAgICAgICAgIHJldHVybiBbTlNO dW1iZXIgbnVtYmVyV2l0aEludDptX29iamVjdC0+dGFibGVMZXZlbCgpXTsKICAgICB9IGVsc2Ug ewotICAgICAgICBpZiAoW2F0dHJpYnV0ZU5hbWUgaXNFcXVhbFRvU3RyaW5nOk5TQWNjZXNzaWJp bGl0eUJsb2NrUXVvdGVMZXZlbEF0dHJpYnV0ZV0pIHsKLSAgICAgICAgICAgIEFjY2Vzc2liaWxp dHlPYmplY3QqIHBhcmVudCA9IG1fb2JqZWN0LT5wYXJlbnRPYmplY3RVbmlnbm9yZWQoKTsKLSAg ICAgICAgICAgIGlmICghcGFyZW50KQotICAgICAgICAgICAgICAgIHJldHVybiBbTlNOdW1iZXIg bnVtYmVyV2l0aEludDowXTsKLSAgICAgICAgICAgIHJldHVybiBbcGFyZW50LT53cmFwcGVyKCkg YWNjZXNzaWJpbGl0eUF0dHJpYnV0ZVZhbHVlOk5TQWNjZXNzaWJpbGl0eUJsb2NrUXVvdGVMZXZl bEF0dHJpYnV0ZV07ICAgICAgICAKLSAgICAgICAgfQorICAgICAgICBBY2Nlc3NpYmlsaXR5T2Jq ZWN0KiBwYXJlbnQgPSBtX29iamVjdC0+cGFyZW50T2JqZWN0VW5pZ25vcmVkKCk7CisgICAgICAg IGlmICghcGFyZW50KQorICAgICAgICAgICAgcmV0dXJuIFtOU051bWJlciBudW1iZXJXaXRoSW50 OjBdOworICAgICAgICAKKyAgICAgICAgaWYgKFthdHRyaWJ1dGVOYW1lIGlzRXF1YWxUb1N0cmlu ZzpOU0FjY2Vzc2liaWxpdHlCbG9ja1F1b3RlTGV2ZWxBdHRyaWJ1dGVdKQorICAgICAgICAgICAg cmV0dXJuIFtwYXJlbnQtPndyYXBwZXIoKSBhY2Nlc3NpYmlsaXR5QXR0cmlidXRlVmFsdWU6TlNB Y2Nlc3NpYmlsaXR5QmxvY2tRdW90ZUxldmVsQXR0cmlidXRlXTsKKyAgICAgICAgaWYgKFthdHRy aWJ1dGVOYW1lIGlzRXF1YWxUb1N0cmluZzpAIkFYVGFibGVMZXZlbCJdKQorICAgICAgICAgICAg cmV0dXJuIFtwYXJlbnQtPndyYXBwZXIoKSBhY2Nlc3NpYmlsaXR5QXR0cmlidXRlVmFsdWU6QCJB WFRhYmxlTGV2ZWwiXTsKICAgICB9CiAgICAgCiAgICAgaWYgKFthdHRyaWJ1dGVOYW1lIGlzRXF1 YWxUb1N0cmluZzogTlNBY2Nlc3NpYmlsaXR5TGlua2VkVUlFbGVtZW50c0F0dHJpYnV0ZV0pIHsK SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDkzMjA2KQorKysgVG9vbHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMg KzEsMjcgQEAKKzIwMTEtMDgtMTcgIFNhbSBXaGl0ZSAgPHNhbXVlbC53aGl0ZUByb2NoZXN0ZXIu ZWR1PgorCisgICAgICAgIEFjY2Vzc2liaWxpdHlPYmplY3QgbGV2ZWxzIGFyZSBpbmNvbnNpc3Rl bnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY2MTgw CisgICAgICAgIAorICAgICAgICBBZGRlZCB0aGUgYWJpbGl0eSB0byBnZXQgbnVtZXJpYyBhdHRy aWJ1dGUgdmFsdWVzIHVzaW5nIG51bWJlckF0dHJpYnV0ZVZhbHVlLiBUaGlzCisgICAgICAgIGZ1 bmN0aW9uIGNvbXBsZW1lbnRzIHRoZSBleGlzdGluZyBzdHJpbmdBdHRyaWJ1dGVWYWx1ZSBhbmQg Ym9vbEF0dHJpYnV0ZVZhbHVlIGZ1bmN0aW9ucy4KKyAgICAgICAgVGhlIGFkZGl0aW9uIG9mIG51 bWJlckF0dHJpYnV0ZVZhbHVlIHdhcyBuZWNlc3NhcnkgYmVjYXVzZSB0aGUgc3RyaW5nQXR0cmli dXRlVmFsdWUKKyAgICAgICAgZnVuY3Rpb24gZG9lcyBhIHR5cGUgY2hlY2sgYW5kIHdpbGwgb25s eSByZXR1cm4gc3RyaW5ncy4gVGhpcyBsaW1pdGF0aW9uIG1hZGUgaXQKKyAgICAgICAgaW1wb3Nz aWJsZSB0byBnZXQgdmFsdWVzIGZvciBhdHRyaWJ1dGVzIHRoYXQgcmV0dXJuZWQgYW4gTlNOdW1i ZXIuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBE dW1wUmVuZGVyVHJlZS9BY2Nlc3NpYmlsaXR5VUlFbGVtZW50LmNwcDoKKyAgICAgICAgKG51bWJl ckF0dHJpYnV0ZVZhbHVlQ2FsbGJhY2spOgorICAgICAgICAoQWNjZXNzaWJpbGl0eVVJRWxlbWVu dDo6Z2V0SlNDbGFzcyk6CisgICAgICAgICogRHVtcFJlbmRlclRyZWUvQWNjZXNzaWJpbGl0eVVJ RWxlbWVudC5oOgorICAgICAgICAqIER1bXBSZW5kZXJUcmVlL2d0ay9BY2Nlc3NpYmlsaXR5VUlF bGVtZW50R3RrLmNwcDoKKyAgICAgICAgKEFjY2Vzc2liaWxpdHlVSUVsZW1lbnQ6Om51bWJlckF0 dHJpYnV0ZVZhbHVlKToKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9tYWMvQWNjZXNzaWJpbGl0 eVVJRWxlbWVudE1hYy5tbToKKyAgICAgICAgKEFjY2Vzc2liaWxpdHlVSUVsZW1lbnQ6Om51bWJl ckF0dHJpYnV0ZVZhbHVlKToKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS93aW4vQWNjZXNzaWJp bGl0eVVJRWxlbWVudFdpbi5jcHA6CisgICAgICAgIChBY2Nlc3NpYmlsaXR5VUlFbGVtZW50Ojpu dW1iZXJBdHRyaWJ1dGVWYWx1ZSk6CisKIDIwMTEtMDgtMTYgIEFkYW0gQmFydGggIDxhYmFydGhA d2Via2l0Lm9yZz4KIAogICAgICAgICBBZGQgYSBDRyBxdWFsaWZpZXIgc2ltaWxhciB0byB0aGUg R1BVIHF1YWxpZmllcgpJbmRleDogVG9vbHMvRHVtcFJlbmRlclRyZWUvQWNjZXNzaWJpbGl0eVVJ RWxlbWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvRHVtcFJlbmRlclRyZWUvQWNjZXNzaWJp bGl0eVVJRWxlbWVudC5jcHAJKHJldmlzaW9uIDkzMTkzKQorKysgVG9vbHMvRHVtcFJlbmRlclRy ZWUvQWNjZXNzaWJpbGl0eVVJRWxlbWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM3NCw2ICsz NzQsMTggQEAgc3RhdGljIEpTVmFsdWVSZWYgc3RyaW5nQXR0cmlidXRlVmFsdWVDYQogICAgIHJl dHVybiByZXN1bHQ7CiB9CiAKK3N0YXRpYyBKU1ZhbHVlUmVmIG51bWJlckF0dHJpYnV0ZVZhbHVl Q2FsbGJhY2soSlNDb250ZXh0UmVmIGNvbnRleHQsIEpTT2JqZWN0UmVmIGZ1bmN0aW9uLCBKU09i amVjdFJlZiB0aGlzT2JqZWN0LCBzaXplX3QgYXJndW1lbnRDb3VudCwgY29uc3QgSlNWYWx1ZVJl ZiBhcmd1bWVudHNbXSwgSlNWYWx1ZVJlZiogZXhjZXB0aW9uKQoreworICAgIEpTU3RyaW5nUmVm IGF0dHJpYnV0ZSA9IDA7CisgICAgaWYgKGFyZ3VtZW50Q291bnQgPT0gMSkKKyAgICAgICAgYXR0 cmlidXRlID0gSlNWYWx1ZVRvU3RyaW5nQ29weShjb250ZXh0LCBhcmd1bWVudHNbMF0sIGV4Y2Vw dGlvbik7CisgICAgZG91YmxlIHZhbCA9IHRvQVhFbGVtZW50KHRoaXNPYmplY3QpLT5udW1iZXJB dHRyaWJ1dGVWYWx1ZShhdHRyaWJ1dGUpOworICAgIEpTVmFsdWVSZWYgcmVzdWx0ID0gSlNWYWx1 ZU1ha2VOdW1iZXIoY29udGV4dCwgdmFsKTsKKyAgICBpZiAoYXR0cmlidXRlKQorICAgICAgICBK U1N0cmluZ1JlbGVhc2UoYXR0cmlidXRlKTsKKyAgICByZXR1cm4gcmVzdWx0OworfQorCiBzdGF0 aWMgSlNWYWx1ZVJlZiBjZWxsRm9yQ29sdW1uQW5kUm93Q2FsbGJhY2soSlNDb250ZXh0UmVmIGNv bnRleHQsIEpTT2JqZWN0UmVmIGZ1bmN0aW9uLCBKU09iamVjdFJlZiB0aGlzT2JqZWN0LCBzaXpl X3QgYXJndW1lbnRDb3VudCwgY29uc3QgSlNWYWx1ZVJlZiBhcmd1bWVudHNbXSwgSlNWYWx1ZVJl ZiogZXhjZXB0aW9uKQogewogICAgIHVuc2lnbmVkIGNvbHVtbiA9IDAsIHJvdyA9IDA7CkBAIC0x MDA4LDYgKzEwMjAsNyBAQCBKU0NsYXNzUmVmIEFjY2Vzc2liaWxpdHlVSUVsZW1lbnQ6OmdldEpT CiAgICAgICAgIHsgInRpdGxlVUlFbGVtZW50IiwgdGl0bGVVSUVsZW1lbnRDYWxsYmFjaywga0pT UHJvcGVydHlBdHRyaWJ1dGVSZWFkT25seSB8IGtKU1Byb3BlcnR5QXR0cmlidXRlRG9udERlbGV0 ZSB9LAogICAgICAgICB7ICJzZXRTZWxlY3RlZFRleHRSYW5nZSIsIHNldFNlbGVjdGVkVGV4dFJh bmdlQ2FsbGJhY2ssIGtKU1Byb3BlcnR5QXR0cmlidXRlUmVhZE9ubHkgfCBrSlNQcm9wZXJ0eUF0 dHJpYnV0ZURvbnREZWxldGUgfSwKICAgICAgICAgeyAic3RyaW5nQXR0cmlidXRlVmFsdWUiLCBz dHJpbmdBdHRyaWJ1dGVWYWx1ZUNhbGxiYWNrLCBrSlNQcm9wZXJ0eUF0dHJpYnV0ZVJlYWRPbmx5 IHwga0pTUHJvcGVydHlBdHRyaWJ1dGVEb250RGVsZXRlIH0sCisgICAgICAgIHsgIm51bWJlckF0 dHJpYnV0ZVZhbHVlIiwgbnVtYmVyQXR0cmlidXRlVmFsdWVDYWxsYmFjaywga0pTUHJvcGVydHlB dHRyaWJ1dGVSZWFkT25seSB8IGtKU1Byb3BlcnR5QXR0cmlidXRlRG9udERlbGV0ZSB9LAogICAg ICAgICB7ICJib29sQXR0cmlidXRlVmFsdWUiLCBib29sQXR0cmlidXRlVmFsdWVDYWxsYmFjaywg a0pTUHJvcGVydHlBdHRyaWJ1dGVSZWFkT25seSB8IGtKU1Byb3BlcnR5QXR0cmlidXRlRG9udERl bGV0ZSB9LAogICAgICAgICB7ICJpc0F0dHJpYnV0ZVN1cHBvcnRlZCIsIGlzQXR0cmlidXRlU3Vw cG9ydGVkQ2FsbGJhY2ssIGtKU1Byb3BlcnR5QXR0cmlidXRlUmVhZE9ubHkgfCBrSlNQcm9wZXJ0 eUF0dHJpYnV0ZURvbnREZWxldGUgfSwKICAgICAgICAgeyAiaXNBdHRyaWJ1dGVTZXR0YWJsZSIs IGlzQXR0cmlidXRlU2V0dGFibGVDYWxsYmFjaywga0pTUHJvcGVydHlBdHRyaWJ1dGVSZWFkT25s eSB8IGtKU1Byb3BlcnR5QXR0cmlidXRlRG9udERlbGV0ZSB9LApJbmRleDogVG9vbHMvRHVtcFJl bmRlclRyZWUvQWNjZXNzaWJpbGl0eVVJRWxlbWVudC5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0R1 bXBSZW5kZXJUcmVlL0FjY2Vzc2liaWxpdHlVSUVsZW1lbnQuaAkocmV2aXNpb24gOTMxOTMpCisr KyBUb29scy9EdW1wUmVuZGVyVHJlZS9BY2Nlc3NpYmlsaXR5VUlFbGVtZW50LmgJKHdvcmtpbmcg Y29weSkKQEAgLTEwNCw2ICsxMDQsNyBAQCBwdWJsaWM6CiAKICAgICAvLyBBdHRyaWJ1dGVzIC0g cGxhdGZvcm0taW5kZXBlbmRlbnQgaW1wbGVtZW50YXRpb25zCiAgICAgSlNTdHJpbmdSZWYgc3Ry aW5nQXR0cmlidXRlVmFsdWUoSlNTdHJpbmdSZWYgYXR0cmlidXRlKTsKKyAgICBkb3VibGUgbnVt YmVyQXR0cmlidXRlVmFsdWUoSlNTdHJpbmdSZWYgYXR0cmlidXRlKTsKICAgICBib29sIGJvb2xB dHRyaWJ1dGVWYWx1ZShKU1N0cmluZ1JlZiBhdHRyaWJ1dGUpOwogICAgIGJvb2wgaXNBdHRyaWJ1 dGVTdXBwb3J0ZWQoSlNTdHJpbmdSZWYgYXR0cmlidXRlKTsKICAgICBib29sIGlzQXR0cmlidXRl U2V0dGFibGUoSlNTdHJpbmdSZWYgYXR0cmlidXRlKTsKSW5kZXg6IFRvb2xzL0R1bXBSZW5kZXJU cmVlL2d0ay9BY2Nlc3NpYmlsaXR5VUlFbGVtZW50R3RrLmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29s cy9EdW1wUmVuZGVyVHJlZS9ndGsvQWNjZXNzaWJpbGl0eVVJRWxlbWVudEd0ay5jcHAJKHJldmlz aW9uIDkzMTkzKQorKysgVG9vbHMvRHVtcFJlbmRlclRyZWUvZ3RrL0FjY2Vzc2liaWxpdHlVSUVs ZW1lbnRHdGsuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02MTQsNiArNjE0LDEyIEBAIEpTU3RyaW5n UmVmIEFjY2Vzc2liaWxpdHlVSUVsZW1lbnQ6OnN0cmkKICAgICByZXR1cm4gSlNTdHJpbmdDcmVh dGVXaXRoQ2hhcmFjdGVycygwLCAwKTsKIH0KIAorZG91YmxlIEFjY2Vzc2liaWxpdHlVSUVsZW1l bnQ6Om51bWJlckF0dHJpYnV0ZVZhbHVlKEpTU3RyaW5nUmVmIGF0dHJpYnV0ZSkKK3sKKyAgICAv LyBGSVhNRTogaW1wbGVtZW50CisgICAgcmV0dXJuIDAuMGY7Cit9CisKIGJvb2wgQWNjZXNzaWJp bGl0eVVJRWxlbWVudDo6Ym9vbEF0dHJpYnV0ZVZhbHVlKEpTU3RyaW5nUmVmIGF0dHJpYnV0ZSkK IHsKICAgICAvLyBGSVhNRTogaW1wbGVtZW50CkluZGV4OiBUb29scy9EdW1wUmVuZGVyVHJlZS9t YWMvQWNjZXNzaWJpbGl0eVVJRWxlbWVudE1hYy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9EdW1w UmVuZGVyVHJlZS9tYWMvQWNjZXNzaWJpbGl0eVVJRWxlbWVudE1hYy5tbQkocmV2aXNpb24gOTMx OTMpCisrKyBUb29scy9EdW1wUmVuZGVyVHJlZS9tYWMvQWNjZXNzaWJpbGl0eVVJRWxlbWVudE1h Yy5tbQkod29ya2luZyBjb3B5KQpAQCAtNDgwLDYgKzQ4MCwxNyBAQCBKU1N0cmluZ1JlZiBBY2Nl c3NpYmlsaXR5VUlFbGVtZW50OjpzdHJpCiAgICAgcmV0dXJuIDA7CiB9CiAKK2RvdWJsZSBBY2Nl c3NpYmlsaXR5VUlFbGVtZW50OjpudW1iZXJBdHRyaWJ1dGVWYWx1ZShKU1N0cmluZ1JlZiBhdHRy aWJ1dGUpCit7CisgICAgQkVHSU5fQVhfT0JKQ19FWENFUFRJT05TCisgICAgaWQgdmFsdWUgPSBb bV9lbGVtZW50IGFjY2Vzc2liaWxpdHlBdHRyaWJ1dGVWYWx1ZTpbTlNTdHJpbmcgc3RyaW5nV2l0 aEpTU3RyaW5nUmVmOmF0dHJpYnV0ZV1dOworICAgIGlmIChbdmFsdWUgaXNLaW5kT2ZDbGFzczpb TlNOdW1iZXIgY2xhc3NdXSkKKyAgICAgICAgcmV0dXJuIFt2YWx1ZSBkb3VibGVWYWx1ZV07Cisg ICAgRU5EX0FYX09CSkNfRVhDRVBUSU9OUworICAgIAorICAgIHJldHVybiAwOworfQorCiBib29s IEFjY2Vzc2liaWxpdHlVSUVsZW1lbnQ6OmJvb2xBdHRyaWJ1dGVWYWx1ZShKU1N0cmluZ1JlZiBh dHRyaWJ1dGUpCiB7CiAgICAgQkVHSU5fQVhfT0JKQ19FWENFUFRJT05TCkluZGV4OiBUb29scy9E dW1wUmVuZGVyVHJlZS93aW4vQWNjZXNzaWJpbGl0eVVJRWxlbWVudFdpbi5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gVG9vbHMvRHVtcFJlbmRlclRyZWUvd2luL0FjY2Vzc2liaWxpdHlVSUVsZW1lbnRXaW4u Y3BwCShyZXZpc2lvbiA5MzE5MykKKysrIFRvb2xzL0R1bXBSZW5kZXJUcmVlL3dpbi9BY2Nlc3Np YmlsaXR5VUlFbGVtZW50V2luLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTEzLDYgKzUxMywxMiBA QCBKU1N0cmluZ1JlZiBBY2Nlc3NpYmlsaXR5VUlFbGVtZW50OjpzdHJpCiAgICAgcmV0dXJuIEpT U3RyaW5nQ3JlYXRlV2l0aENoYXJhY3RlcnMoMCwgMCk7CiB9CiAKK2RvdWJsZSBBY2Nlc3NpYmls aXR5VUlFbGVtZW50OjpudW1iZXJBdHRyaWJ1dGVWYWx1ZShKU1N0cmluZ1JlZiBhdHRyaWJ1dGUp Cit7CisgICAgLy8gRklYTUU6IGltcGxlbWVudAorICAgIHJldHVybiAwOworfQorCiBib29sIEFj Y2Vzc2liaWxpdHlVSUVsZW1lbnQ6OmJvb2xBdHRyaWJ1dGVWYWx1ZShKU1N0cmluZ1JlZiBhdHRy aWJ1dGUpCiB7CiAgICAgLy8gRklYTUU6IGltcGxlbWVudApJbmRleDogTGF5b3V0VGVzdHMvQ2hh bmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24gOTMy MDYpCisrKyBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwx OSBAQAorMjAxMS0wOC0xNyAgU2FtIFdoaXRlICA8c2FtdWVsLndoaXRlQHJvY2hlc3Rlci5lZHU+ CisKKyAgICAgICAgQWNjZXNzaWJpbGl0eU9iamVjdCBsZXZlbHMgYXJlIGluY29uc2lzdGVudAor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjYxODAKKyAg ICAgICAgCisgICAgICAgIFRoaXMgdGVzdCBlbnN1cmVzIHRoYXQgYWxsIEFjY2Vzc2liaWxpdHlP YmplY3RzIHRoYXQgcmV0dXJuIGEgbGV2ZWwgdmFsdWUgcmV0dXJuIGNvbnNpc3RlbnQgcmVzdWx0 cy4KKyAgICAgICAgRm9yIGV4YW1wbGUsIGEgbGV2ZWwgb2YgMCBzaG91bGQgb25seSBiZSByZXR1 cm5lZCBieSBhIGxldmVsIGZ1bmN0aW9uIHdoZW4gaXQgaXMgY2FsbGVkIG9uIGFuCisgICAgICAg IEFjY2Vzc2liaWxpdHlPYmplY3Qgb2YgdGhlIHdyb25nIHR5cGUuIEl0J3MgZXNwZWNpYWxseSBp bXBvcnRhbnQgdGhhdCB3ZSBlbmZvcmNlIHRoaXMgY29uc2lzdGVuY3kKKyAgICAgICAgdXNpbmcg bGF5b3V0IHRlc3RzIGJlY2F1c2UgdGhlc2UgbGV2ZWwgdmFsdWVzIGFyZSBub3QgZGVmaW5lZCBi eSB0aGUgVzNDIGJ1dCBhcmUgc3RpbGwgdXNlZCBieQorICAgICAgICBwb3B1bGFyIHNjcmVlbiBy ZWFkZXJzIHN1Y2ggYXMgVm9pY2VPdmVyLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogcGxhdGZvcm0vbWFjL2FjY2Vzc2liaWxpdHkvZWxlbWVudC1s ZXZlbC1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIHBsYXRmb3JtL21hYy9hY2Nlc3Np YmlsaXR5L2VsZW1lbnQtbGV2ZWwuaHRtbDogQWRkZWQuCisKIDIwMTEtMDgtMTcgIEFkYW0gUm9i ZW4gIDxhcm9iZW5AYXBwbGUuY29tPgogCiAgICAgICAgIEFkZCBXaW5kb3dzIHJlc3VsdHMgZm9y IHRlc3RzIHRoYXQgZGlmZmVyIGZyb20gTGlvbiBkdWUgdG8gZm9udCBkaWZmZXJlbmNlcwpJbmRl eDogTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2FjY2Vzc2liaWxpdHkvZWxlbWVudC1sZXZlbC1l eHBlY3RlZC50eHQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2FjY2Vz c2liaWxpdHkvZWxlbWVudC1sZXZlbC1leHBlY3RlZC50eHQJKHJldmlzaW9uIDApCisrKyBMYXlv dXRUZXN0cy9wbGF0Zm9ybS9tYWMvYWNjZXNzaWJpbGl0eS9lbGVtZW50LWxldmVsLWV4cGVjdGVk LnR4dAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSwyNiBAQAorYmxvY2txdW90ZSBsZXZlbCAxCiti bG9ja3F1b3RlIGxldmVsIDIKK2hlYWRpbmcgbGV2ZWwgMQorCitoZWFkaW5nIGxldmVsIDIKKwor dGFibGUgaGVhZGluZyBsZXZlbCAxCit0YWJsZSBoZWFkaW5nIGxldmVsIDIKK3RhYmxlIGJvZHkg bGV2ZWwgMgorVGhpcyB0ZXN0cyBlbGVtZW50cycgYWNjZXNzaWJpbGl0eSBsZXZlbCB2YWx1ZS4K KworT24gc3VjY2VzcywgeW91IHdpbGwgc2VlIGEgc2VyaWVzIG9mICJQQVNTIiBtZXNzYWdlcywg Zm9sbG93ZWQgYnkgIlRFU1QgQ09NUExFVEUiLgorCisKK1BBU1MgYm9keS5jaGlsZEF0SW5kZXgo MCkuY2hpbGRBdEluZGV4KDApLm51bWJlckF0dHJpYnV0ZVZhbHVlKCdBWEJsb2NrUXVvdGVMZXZl bCcpIGlzIDEKK1BBU1MgYm9keS5jaGlsZEF0SW5kZXgoMSkuY2hpbGRBdEluZGV4KDApLm51bWJl ckF0dHJpYnV0ZVZhbHVlKCdBWEJsb2NrUXVvdGVMZXZlbCcpIGlzIDIKK1BBU1MgYm9keS5jaGls ZEF0SW5kZXgoMikubnVtYmVyQXR0cmlidXRlVmFsdWUoJ0FYQmxvY2tRdW90ZUxldmVsJykgaXMg MAorUEFTUyBib2R5LmNoaWxkQXRJbmRleCgyKS5udW1iZXJBdHRyaWJ1dGVWYWx1ZSgnQVhWYWx1 ZScpIGlzIDEKK1BBU1MgYm9keS5jaGlsZEF0SW5kZXgoMykubnVtYmVyQXR0cmlidXRlVmFsdWUo J0FYVmFsdWUnKSBpcyAyCitQQVNTIGJvZHkuY2hpbGRBdEluZGV4KDQpLm51bWJlckF0dHJpYnV0 ZVZhbHVlKCdBWFRhYmxlTGV2ZWwnKSBpcyAxCitQQVNTIGJvZHkuY2hpbGRBdEluZGV4KDQpLmNo aWxkQXRJbmRleCgxKS5jaGlsZEF0SW5kZXgoMCkuY2hpbGRBdEluZGV4KDApLm51bWJlckF0dHJp YnV0ZVZhbHVlKCdBWFRhYmxlTGV2ZWwnKSBpcyAyCitQQVNTIGJvZHkuY2hpbGRBdEluZGV4KDAp Lm51bWJlckF0dHJpYnV0ZVZhbHVlKCdBWFRhYmxlTGV2ZWwnKSBpcyAwCitQQVNTIHN1Y2Nlc3Nm dWxseVBhcnNlZCBpcyB0cnVlCisKK1RFU1QgQ09NUExFVEUKKwpJbmRleDogTGF5b3V0VGVzdHMv cGxhdGZvcm0vbWFjL2FjY2Vzc2liaWxpdHkvZWxlbWVudC1sZXZlbC5odG1sCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIExheW91dFRlc3RzL3BsYXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5L2VsZW1lbnQtbGV2ZWwu aHRtbAkocmV2aXNpb24gMCkKKysrIExheW91dFRlc3RzL3BsYXRmb3JtL21hYy9hY2Nlc3NpYmls aXR5L2VsZW1lbnQtbGV2ZWwuaHRtbAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSw2NSBAQAorPCFE T0NUWVBFIEhUTUwgUFVCTElDICItLy9JRVRGLy9EVEQgSFRNTC8vRU4iPgorPGh0bWw+Cis8aGVh ZD4KKzxsaW5rIHJlbD0ic3R5bGVzaGVldCIgaHJlZj0iLi4vLi4vLi4vZmFzdC9qcy9yZXNvdXJj ZXMvanMtdGVzdC1zdHlsZS5jc3MiPgorPHNjcmlwdD4KK3ZhciBzdWNjZXNzZnVsbHlQYXJzZWQg PSBmYWxzZTsKKzwvc2NyaXB0PgorPHNjcmlwdCBzcmM9Ii4uLy4uLy4uL2Zhc3QvanMvcmVzb3Vy Y2VzL2pzLXRlc3QtcHJlLmpzIj48L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5IGlkPSJib2R5Ij4K KworPGJsb2NrcXVvdGU+CisgICAgYmxvY2txdW90ZSBsZXZlbCAxCisgICAgPGJsb2NrcXVvdGU+ CisgICAgICAgIGJsb2NrcXVvdGUgbGV2ZWwgMgorICAgIDwvYmxvY2txdW90ZT4KKzwvYmxvY2tx dW90ZT4KKworPGgxPmhlYWRpbmcgbGV2ZWwgMTwvaDE+Cis8aDI+aGVhZGluZyBsZXZlbCAyPC9o Mj4KKworPCEtLSBUYWJsZSBoZWFkaW5ncyBhbmQgYm9kaWVzIGFyZSBpbmNsdWRlZCBzbyB0aGVz ZSB0YWJsZXMgYXJlIGlkZW50aWZpZWQgYXMgYWNjZXNzaWJpbGl0eSB0YWJsZXMuIC0tPgorPHRh YmxlPgorICAgIDx0aGVhZD48dHI+PHRkPnRhYmxlIGhlYWRpbmcgbGV2ZWwgMTwvdGQ+PC90cj48 L3RoZWFkPgorICAgIDx0Ym9keT48dHI+PHRkPjx0YWJsZT4KKyAgICAgICAgPHRoZWFkPjx0cj48 dGQ+dGFibGUgaGVhZGluZyBsZXZlbCAyPC90ZD48L3RyPjwvdGhlYWQ+CisgICAgICAgIDx0Ym9k eT48dHI+PHRkPnRhYmxlIGJvZHkgbGV2ZWwgMjwvdGQ+PC90cj48L3Rib2R5PgorICAgIDwvdGFi bGU+PC90ZD48L3RyPjwvdGJvZHk+Cis8L3RhYmxlPgorCis8cCBpZD0iZGVzY3JpcHRpb24iPjwv cD4KKzxkaXYgaWQ9ImNvbnNvbGUiPjwvZGl2PgorCis8c2NyaXB0PgorICAgIGRlc2NyaXB0aW9u KCJUaGlzIHRlc3RzIGVsZW1lbnRzJyBhY2Nlc3NpYmlsaXR5IGxldmVsIHZhbHVlLiIpOworICAg IAorICAgIGlmICh3aW5kb3cuYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIpIHsKKyAgICAgICAgZG9j dW1lbnQuZ2V0RWxlbWVudEJ5SWQoImJvZHkiKS5mb2N1cygpOworICAgICAgICB2YXIgYm9keSA9 IGFjY2Vzc2liaWxpdHlDb250cm9sbGVyLmZvY3VzZWRFbGVtZW50OworICAgICAgICAKKyAgICAg ICAgLy8gQmxvY2txdW90ZSBsZXZlbHMuCisgICAgICAgIHNob3VsZEJlKCJib2R5LmNoaWxkQXRJ bmRleCgwKS5jaGlsZEF0SW5kZXgoMCkubnVtYmVyQXR0cmlidXRlVmFsdWUoJ0FYQmxvY2tRdW90 ZUxldmVsJykiLCAiMSIpOworICAgICAgICBzaG91bGRCZSgiYm9keS5jaGlsZEF0SW5kZXgoMSku Y2hpbGRBdEluZGV4KDApLm51bWJlckF0dHJpYnV0ZVZhbHVlKCdBWEJsb2NrUXVvdGVMZXZlbCcp IiwgIjIiKTsKKyAgICAgICAgLy8gTm9uLWJsb2NrcXVvdGVzIHNob3VsZCByZXR1cm4gYSBibG9j a3F1b3RlIGxldmVsIG9mIDAuCisgICAgICAgIHNob3VsZEJlKCJib2R5LmNoaWxkQXRJbmRleCgy KS5udW1iZXJBdHRyaWJ1dGVWYWx1ZSgnQVhCbG9ja1F1b3RlTGV2ZWwnKSIsICIwIik7CisgICAg ICAgIAorICAgICAgICAvLyBIZWFkaW5nIGxldmVscy4KKyAgICAgICAgc2hvdWxkQmUoImJvZHku Y2hpbGRBdEluZGV4KDIpLm51bWJlckF0dHJpYnV0ZVZhbHVlKCdBWFZhbHVlJykiLCAiMSIpOwor ICAgICAgICBzaG91bGRCZSgiYm9keS5jaGlsZEF0SW5kZXgoMykubnVtYmVyQXR0cmlidXRlVmFs dWUoJ0FYVmFsdWUnKSIsICIyIik7CisgICAgICAgIC8vIEhlYWRpbmcgbGV2ZWwgaXMgZXhwbGlj aXRseSBzcGVjaWZpZWQgdXNpbmcgYSB1bmlxdWUgSFRNTCB0YWcgYW5kIGlzIG5vdCBzaW1wbHkg YW4gYXR0cmlidXRlIGFueSBlbGVtZW50IG1heSBoYXZlLgorICAgICAgICAvLyBUaGVyZWZvcmUs IG5vbi1oZWFkaW5ncyBkbyBub3QgaGF2ZSBhIGhlYWRpbmcgbGV2ZWwgdGhhdCBtdXN0IGJlIGNo ZWNrZWQuCisgICAgICAgIAorICAgICAgICAvLyBUYWJsZSBsZXZlbHMuCisgICAgICAgIHNob3Vs ZEJlKCJib2R5LmNoaWxkQXRJbmRleCg0KS5udW1iZXJBdHRyaWJ1dGVWYWx1ZSgnQVhUYWJsZUxl dmVsJykiLCAiMSIpOworICAgICAgICBzaG91bGRCZSgiYm9keS5jaGlsZEF0SW5kZXgoNCkuY2hp bGRBdEluZGV4KDEpLmNoaWxkQXRJbmRleCgwKS5jaGlsZEF0SW5kZXgoMCkubnVtYmVyQXR0cmli dXRlVmFsdWUoJ0FYVGFibGVMZXZlbCcpIiwgIjIiKTsKKyAgICAgICAgLy8gTm9uLXRhYmxlcyBz aG91bGQgcmV0dXJuIGEgdGFibGUgbGV2ZWwgb2YgMC4KKyAgICAgICAgc2hvdWxkQmUoImJvZHku Y2hpbGRBdEluZGV4KDApLm51bWJlckF0dHJpYnV0ZVZhbHVlKCdBWFRhYmxlTGV2ZWwnKSIsICIw Iik7CisgICAgfQorICAgIAorICAgIHN1Y2Nlc3NmdWxseVBhcnNlZCA9IHRydWU7Cis8L3Njcmlw dD4KKworPHNjcmlwdCBzcmM9Ii4uLy4uLy4uL2Zhc3QvanMvcmVzb3VyY2VzL2pzLXRlc3QtcG9z dC5qcyI+PC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0bWw+Cg==