45190 2010-09-03 11:56:28 -0700 [Gtk] A list item's number/bullet should not be a child of that list item 2010-09-08 03:29:31 -0700 1 1 1 Unclassified WebKit Accessibility 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 25531 0 jdiggs webkit-unassigned apinheiro cfleizach commit-queue mario xan.lopez oldest_to_newest 274089 0 66529 jdiggs 2010-09-03 11:56:28 -0700 Created attachment 66529 test case Steps to reproduce: 1. Open the attached test case. 2. Use Accerciser to examine the accessible hierarchy and text. Expected results: * Bullets and numbers would not be children of the list item * Bullets and numbers would be included in the accessible text for the list item. Actual results: (the inverse of the expected results) 274945 1 mario 2010-09-07 03:25:21 -0700 I guess this changes means to change WebCore::AccessibilityRenderObject::accessibilityIsIgnored() to return *true* for those objects with roleValue() == ListMarkerRole, thus affecting all the ports. My question then is, is this change that all the ports are willing to accept? IMHO, it doesn't make sense (neither in GTK nor in any other port) to have a a11y object just fro the number/bullet and, in case that info was important, setting it along with the acecssible text should be enough. But I don't know what other software (like VO, for instance) expects in this case so any light on this topic would be welcome. Joanmarie, Chris, what do you think about this? 274973 2 cfleizach 2010-09-07 05:17:43 -0700 (In reply to comment #1) > I guess this changes means to change WebCore::AccessibilityRenderObject::accessibilityIsIgnored() to return *true* for those objects with roleValue() == ListMarkerRole, thus affecting all the ports. > > My question then is, is this change that all the ports are willing to accept? IMHO, it doesn't make sense (neither in GTK nor in any other port) to have a a11y object just fro the number/bullet and, in case that info was important, setting it along with the acecssible text should be enough. But I don't know what other software (like VO, for instance) expects in this case so any light on this topic would be welcome. > > Joanmarie, Chris, what do you think about this? This is expected behavior on the Mac. Please do not break 275068 3 66728 mario 2010-09-07 08:57:00 -0700 Created attachment 66728 Patch (In reply to comment #2) > [...] > This is expected behavior on the Mac. Please do not break Thanks for the info Chris, but at the end there's no need (fortunately) to break anything in other ports, as all the changes can be carried out for the GTK port only. I'm now attaching a patch that would fix this stuff following Joanmarie's suggestion on IRC (thanks!). Hence, now pending for review. 275148 4 66728 xan.lopez 2010-09-07 10:44:09 -0700 Comment on attachment 66728 Patch I think this is OK. Joanie and you should work towards writing actual layout or unit tests for this stuff instead of manual testcases for each bug. Seems a waste not to do that since she's already writing one test per bug she opens most of the time. 275267 5 66761 mario 2010-09-07 13:49:58 -0700 Created attachment 66761 Patch + unit test (In reply to comment #4) > (From update of attachment 66728 [details]) > I think this is OK. Joanie and you should work towards writing actual layout or unit tests for this stuff > instead of manual testcases for each bug. Seems a waste not to do that since she's already writing > one test per bug she opens most of the time. Understood. Now replacing the former patch with another one including the same code *plus* a new unit test to check everything is working as expected (inspired in Joanie's test case). Btw, if you review+ this new patch don't forget to put the commit-queue+ flag as well, since I'm not a committer and I can't commit patches on my own. Thanks for reviewing and sorry for the hassle 275598 6 66761 mrobinson 2010-09-07 21:43:58 -0700 Comment on attachment 66761 Patch + unit test View in context: https://bugs.webkit.org/attachment.cgi?id=66761&action=prettypatch Looks sane. 275663 7 mario 2010-09-08 00:43:52 -0700 (In reply to comment #6) > (From update of attachment 66761 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=66761&action=prettypatch > > Looks sane. Could please someone put the commit-queue+ flag on this bug? I'm not a committer, so I couldn't get it it on my own. Other than that, please let me know if I'm allowed to set that flag on my own. I'm not sure about that. 275667 8 66761 pnormand 2010-09-08 01:12:02 -0700 Comment on attachment 66761 Patch + unit test Validating commit request of the r+'d patch 275669 9 mario 2010-09-08 01:13:59 -0700 (In reply to comment #8) > (From update of attachment 66761 [details]) > Validating commit request of the r+'d patch Thanks! 275710 10 66728 eric 2010-09-08 03:16:26 -0700 Comment on attachment 66728 Patch Cleared Xan Lopez's review+ from obsolete attachment 66728 so that this bug does not appear in http://webkit.org/pending-commit. 275714 11 66761 commit-queue 2010-09-08 03:29:26 -0700 Comment on attachment 66761 Patch + unit test Clearing flags on attachment: 66761 Committed r66964: <http://trac.webkit.org/changeset/66964> 275715 12 commit-queue 2010-09-08 03:29:31 -0700 All reviewed patches have been landed. Closing bug. 66529 2010-09-03 11:56:28 -0700 2010-09-03 11:56:28 -0700 test case list-items.html text/html 291 jdiggs PGh0bWw+CjxoZWFkPgo8dGl0bGU+TGlzdCBJdGVtczwvdGl0bGU+CjwvaGVhZD4KPGJvZHk+Cjx1 bD4KPGxpPnRleHQgb25seTwvbGk+CjxsaT48YSBocmVmPSJmb28iPmxpbmsgb25seTwvYT48L2xp Pgo8bGk+dGV4dCBhbmQgYSA8YSBocmVmPSJiYXIiPmxpbms8L2E+PC9saT4KPC91bD4KPG9sPgo8 bGk+dGV4dCBvbmx5PC9saT4KPGxpPjxhIGhyZWY9ImZvbyI+bGluayBvbmx5PC9hPjwvbGk+Cjxs aT50ZXh0IGFuZCBhIDxhIGhyZWY9ImJhciI+bGluazwvYT48L2xpPgo8L29sPgo8L2JvZHk+Cjwv aHRtbD4K 66728 2010-09-07 08:57:00 -0700 2010-09-08 03:16:26 -0700 Patch 0001-2010-09-07-Mario-Sanchez-Prada-msanchez-igalia.com.patch text/plain 4189 mario RnJvbSA2N2VhZTYzZDMxNjBkMzA3MzU4MWRhNDQxMTZjZWYxYWNkYmIzNWVkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXJpbyBTYW5jaGV6IFByYWRhIDxtc2FuY2hlekBpZ2FsaWEu Y29tPgpEYXRlOiBUdWUsIDcgU2VwIDIwMTAgMTc6NDY6MjAgKzAyMDAKU3ViamVjdDogW1BBVENI XSAyMDEwLTA5LTA3ICBNYXJpbyBTYW5jaGV6IFByYWRhICA8bXNhbmNoZXpAaWdhbGlhLmNvbT4K CiAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgogICAgICAgIFtHdGtdIEEgbGlz dCBpdGVtJ3MgbnVtYmVyL2J1bGxldCBzaG91bGQgbm90IGJlIGEgY2hpbGQgb2YgdGhhdCBsaXN0 IGl0ZW0KICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDUx OTAKCiAgICAgICAgSWdub3JlIGxpc3QgbWFya2VycyBhbmQgcHJlZml4IHRoZW0gdG8gdGhlIHRl eHQgZm9yIHRoZSBpdGVtCgogICAgICAgICogYWNjZXNzaWJpbGl0eS9ndGsvQWNjZXNzaWJpbGl0 eU9iamVjdEF0ay5jcHA6CiAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlPYmplY3Q6OmFj Y2Vzc2liaWxpdHlQbGF0Zm9ybUluY2x1ZGVzT2JqZWN0KToKICAgICAgICBNYWtlIGxpc3QgbWFy a2VycyBpZ25vcmUgYWNjZXNzaWJpbGl0eSBmb3IgdGhlIEdUSyBwb3J0LgogICAgICAgICogYWNj ZXNzaWJpbGl0eS9ndGsvQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJBdGsuY3BwOgogICAgICAg ICh3ZWJraXRfYWNjZXNzaWJsZV90ZXh0X2dldF90ZXh0KTogUHJlZml4IHRoZSB0ZXh0IG9mIGEg bWFya2VyCiAgICAgICAgYWxvbmcgd2l0aCB0aGUgYWNjZXNzaWJsZSB0ZXh0IGZvciBpdHMgbGlz dCBpdGVtJ3MgQXRrT2JqZWN0Ci0tLQogV2ViQ29yZS9DaGFuZ2VMb2cgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgfCAgIDE2ICsrKysrKysrKysrKysrKysKIC4uLi9hY2Nlc3NpYmls aXR5L2d0ay9BY2Nlc3NpYmlsaXR5T2JqZWN0QXRrLmNwcCAgIHwgICAgNCArKysrCiAuLi4vZ3Rr L0FjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyQXRrLmNwcCAgICAgICAgICB8ICAgMTIgKysrKysr KysrKysrCiAzIGZpbGVzIGNoYW5nZWQsIDMyIGluc2VydGlvbnMoKyksIDAgZGVsZXRpb25zKC0p CgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxvZwppbmRl eCA5N2U5ZmEzLi44NDM1ZjUxIDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9X ZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEwLTA5LTA3ICBNYXJpbyBTYW5j aGV6IFByYWRhICA8bXNhbmNoZXpAaWdhbGlhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbR3RrXSBBIGxpc3QgaXRlbSdzIG51bWJlci9idWxs ZXQgc2hvdWxkIG5vdCBiZSBhIGNoaWxkIG9mIHRoYXQgbGlzdCBpdGVtCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NTE5MAorCisgICAgICAgIElnbm9y ZSBsaXN0IG1hcmtlcnMgYW5kIHByZWZpeCB0aGVtIHRvIHRoZSB0ZXh0IGZvciB0aGUgaXRlbQor CisgICAgICAgICogYWNjZXNzaWJpbGl0eS9ndGsvQWNjZXNzaWJpbGl0eU9iamVjdEF0ay5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5T2JqZWN0OjphY2Nlc3NpYmlsaXR5UGxh dGZvcm1JbmNsdWRlc09iamVjdCk6CisgICAgICAgIE1ha2UgbGlzdCBtYXJrZXJzIGlnbm9yZSBh Y2Nlc3NpYmlsaXR5IGZvciB0aGUgR1RLIHBvcnQuCisgICAgICAgICogYWNjZXNzaWJpbGl0eS9n dGsvQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJBdGsuY3BwOgorICAgICAgICAod2Via2l0X2Fj Y2Vzc2libGVfdGV4dF9nZXRfdGV4dCk6IFByZWZpeCB0aGUgdGV4dCBvZiBhIG1hcmtlcgorICAg ICAgICBhbG9uZyB3aXRoIHRoZSBhY2Nlc3NpYmxlIHRleHQgZm9yIGl0cyBsaXN0IGl0ZW0ncyBB dGtPYmplY3QKKwogMjAxMC0wOS0wNiAgWm9sdGFuIEhlcmN6ZWcgIDx6aGVyY3plZ0B3ZWJraXQu b3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERpcmsgU2NodWx6ZS4KZGlmZiAtLWdpdCBhL1dl YkNvcmUvYWNjZXNzaWJpbGl0eS9ndGsvQWNjZXNzaWJpbGl0eU9iamVjdEF0ay5jcHAgYi9XZWJD b3JlL2FjY2Vzc2liaWxpdHkvZ3RrL0FjY2Vzc2liaWxpdHlPYmplY3RBdGsuY3BwCmluZGV4IGQw MDU3NGIuLmIyMmE1MWUgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9ndGsvQWNj ZXNzaWJpbGl0eU9iamVjdEF0ay5jcHAKKysrIGIvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2d0ay9B Y2Nlc3NpYmlsaXR5T2JqZWN0QXRrLmNwcApAQCAtNzEsNiArNzEsMTAgQEAgQWNjZXNzaWJpbGl0 eU9iamVjdEluY2x1c2lvbiBBY2Nlc3NpYmlsaXR5T2JqZWN0OjphY2Nlc3NpYmlsaXR5UGxhdGZv cm1JbmNsdWRlc08KICAgICBpZiAocm9sZSA9PSBTdGF0aWNUZXh0Um9sZSkKICAgICAgICAgcmV0 dXJuIElnbm9yZU9iamVjdDsKIAorICAgIC8vIEJ1bGxldHMvbnVtYmVycyBmb3IgbGlzdCBpdGVt cyBzaG91bGRuJ3QgYmUgZXhwb3NlZCBhcyBBdGtPYmplY3RzLgorICAgIGlmIChyb2xlVmFsdWUo KSA9PSBMaXN0TWFya2VyUm9sZSkKKyAgICAgICAgcmV0dXJuIElnbm9yZU9iamVjdDsKKwogICAg IHJldHVybiBEZWZhdWx0QmVoYXZpb3I7CiB9CiAKZGlmZiAtLWdpdCBhL1dlYkNvcmUvYWNjZXNz aWJpbGl0eS9ndGsvQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJBdGsuY3BwIGIvV2ViQ29yZS9h Y2Nlc3NpYmlsaXR5L2d0ay9BY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlckF0ay5jcHAKaW5kZXgg YjE2MjM0Ni4uOTBmMzYzZiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2d0ay9B Y2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlckF0ay5jcHAKKysrIGIvV2ViQ29yZS9hY2Nlc3NpYmls aXR5L2d0ay9BY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlckF0ay5jcHAKQEAgLTM0LDYgKzM0LDcg QEAKICNpZiBIQVZFKEFDQ0VTU0lCSUxJVFkpCiAKICNpbmNsdWRlICJBWE9iamVjdENhY2hlLmgi CisjaW5jbHVkZSAiQWNjZXNzaWJpbGl0eUxpc3QuaCIKICNpbmNsdWRlICJBY2Nlc3NpYmlsaXR5 TGlzdEJveC5oIgogI2luY2x1ZGUgIkFjY2Vzc2liaWxpdHlMaXN0Qm94T3B0aW9uLmgiCiAjaW5j bHVkZSAiQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5oIgpAQCAtNTQsNiArNTUsNyBAQAogI2lu Y2x1ZGUgIklubGluZVRleHRCb3guaCIKICNpbmNsdWRlICJJbnRSZWN0LmgiCiAjaW5jbHVkZSAi Tm90SW1wbGVtZW50ZWQuaCIKKyNpbmNsdWRlICJSZW5kZXJMaXN0TWFya2VyLmgiCiAjaW5jbHVk ZSAiUmVuZGVyVGV4dC5oIgogI2luY2x1ZGUgIlRleHRFbmNvZGluZy5oIgogI2luY2x1ZGUgPHd0 Zi90ZXh0L0NTdHJpbmcuaD4KQEAgLTkzMyw2ICs5MzUsMTYgQEAgc3RhdGljIGdjaGFyKiB3ZWJr aXRfYWNjZXNzaWJsZV90ZXh0X2dldF90ZXh0KEF0a1RleHQqIHRleHQsIGdpbnQgc3RhcnRPZmZz ZXQsIGcKICAgICAgICAgcmV0ID0gcmV0LnN1YnN0cmluZyhzdGFydCwgZW5kT2Zmc2V0IC0gc3Rh cnRPZmZzZXQpOwogICAgIH0KIAorICAgIC8vIFByZWZpeCBhIGl0ZW0gbnVtYmVyL2J1bGxldCBp ZiBuZWVkZWQKKyAgICBpZiAoY29yZU9iamVjdC0+cm9sZVZhbHVlKCkgPT0gTGlzdEl0ZW1Sb2xl KSB7CisgICAgICAgIFJlbmRlck9iamVjdCogb2JqUmVuZGVyZXIgPSBzdGF0aWNfY2FzdDxBY2Nl c3NpYmlsaXR5UmVuZGVyT2JqZWN0Kj4oY29yZU9iamVjdCktPnJlbmRlcmVyKCk7CisgICAgICAg IFJlbmRlck9iamVjdCogbWFya2VyUmVuZGVyZXIgPSBvYmpSZW5kZXJlciA/IG9ialJlbmRlcmVy LT5maXJzdENoaWxkKCkgOiAwOworICAgICAgICBpZiAobWFya2VyUmVuZGVyZXIgJiYgbWFya2Vy UmVuZGVyZXItPmlzTGlzdE1hcmtlcigpKSB7CisgICAgICAgICAgICBTdHJpbmcgbWFya2VyVHh0 ID0gdG9SZW5kZXJMaXN0TWFya2VyKG1hcmtlclJlbmRlcmVyKS0+dGV4dCgpOworICAgICAgICAg ICAgcmV0ID0gbWFya2VyVHh0Lmxlbmd0aCgpID4gMCA/IG1hcmtlclR4dCArICIgIiArIHJldCA6 IHJldDsKKyAgICAgICAgfQorICAgIH0KKwogICAgIHJldHVybiBnX3N0cmR1cChyZXQudXRmOCgp LmRhdGEoKSk7CiB9CiAKLS0gCjEuNy4wLjQKCg== 66761 2010-09-07 13:49:58 -0700 2010-09-08 03:29:25 -0700 Patch + unit test 0001-2010-09-07-Mario-Sanchez-Prada-msanchez-igalia.com.patch text/plain 9844 mario RnJvbSA4MWVhOWU4N2NhYzQ5ZGJkOWY5MjlkZDAyNDJkOWQzYzYwMTRiYTk3IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXJpbyBTYW5jaGV6IFByYWRhIDxtc2FuY2hlekBpZ2FsaWEu Y29tPgpEYXRlOiBUdWUsIDcgU2VwIDIwMTAgMTc6NDY6MjAgKzAyMDAKU3ViamVjdDogW1BBVENI XSAyMDEwLTA5LTA3ICBNYXJpbyBTYW5jaGV6IFByYWRhICA8bXNhbmNoZXpAaWdhbGlhLmNvbT4K CiAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgogICAgICAgIFtHdGtdIEEgbGlz dCBpdGVtJ3MgbnVtYmVyL2J1bGxldCBzaG91bGQgbm90IGJlIGEgY2hpbGQgb2YgdGhhdCBsaXN0 IGl0ZW0KICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDUx OTAKCiAgICAgICAgSWdub3JlIGxpc3QgbWFya2VycyBhbmQgcHJlZml4IHRoZW0gdG8gdGhlIHRl eHQgZm9yIHRoZSBpdGVtCgogICAgICAgICogYWNjZXNzaWJpbGl0eS9ndGsvQWNjZXNzaWJpbGl0 eU9iamVjdEF0ay5jcHA6CiAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlPYmplY3Q6OmFj Y2Vzc2liaWxpdHlQbGF0Zm9ybUluY2x1ZGVzT2JqZWN0KToKICAgICAgICBNYWtlIGxpc3QgbWFy a2VycyBpZ25vcmUgYWNjZXNzaWJpbGl0eSBmb3IgdGhlIEdUSyBwb3J0LgogICAgICAgICogYWNj ZXNzaWJpbGl0eS9ndGsvQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJBdGsuY3BwOgogICAgICAg ICh3ZWJraXRfYWNjZXNzaWJsZV90ZXh0X2dldF90ZXh0KTogUHJlZml4IHRoZSB0ZXh0IG9mIGEg bWFya2VyCiAgICAgICAgYWxvbmcgd2l0aCB0aGUgYWNjZXNzaWJsZSB0ZXh0IGZvciBpdHMgbGlz dCBpdGVtJ3MgQXRrT2JqZWN0CgogICAgICAgIE5ldyB1bml0IHRlc3QgYWRkZWQuCgogICAgICAg ICogdGVzdHMvdGVzdGF0ay5jOgogICAgICAgICh0ZXN0V2Via2l0QXRrTGlzdHNPZkl0ZW1zKTog TmV3IHRlc3QgdG8gY2hlY2sgb3JkZXJlZC91bm9yZGVyZWQKICAgICAgICBsaXN0IG9mIGl0ZW1z IGFyZSBwcm9wZXJseSBleHBvc2VkIHRvIEFUIHRlY2hub2xvZ2llcy4KICAgICAgICAobWFpbik6 Ci0tLQogV2ViQ29yZS9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg fCAgIDE2ICsrKysKIC4uLi9hY2Nlc3NpYmlsaXR5L2d0ay9BY2Nlc3NpYmlsaXR5T2JqZWN0QXRr LmNwcCAgIHwgICAgNCArCiAuLi4vZ3RrL0FjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyQXRrLmNw cCAgICAgICAgICB8ICAgMTIgKysrCiBXZWJLaXQvZ3RrL0NoYW5nZUxvZyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICB8ICAgMTQgKysrKwogV2ViS2l0L2d0ay90ZXN0cy90ZXN0YXRrLmMg ICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDc4ICsrKysrKysrKysrKysrKysrKysrCiA1IGZp bGVzIGNoYW5nZWQsIDEyNCBpbnNlcnRpb25zKCspLCAwIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdp dCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTdlOWZhMy4u ODQzNWY1MSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2ViQ29yZS9DaGFu Z2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAxMC0wOS0wNyAgTWFyaW8gU2FuY2hleiBQcmFkYSAg PG1zYW5jaGV6QGlnYWxpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgW0d0a10gQSBsaXN0IGl0ZW0ncyBudW1iZXIvYnVsbGV0IHNob3VsZCBu b3QgYmUgYSBjaGlsZCBvZiB0aGF0IGxpc3QgaXRlbQorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDUxOTAKKworICAgICAgICBJZ25vcmUgbGlzdCBtYXJr ZXJzIGFuZCBwcmVmaXggdGhlbSB0byB0aGUgdGV4dCBmb3IgdGhlIGl0ZW0KKworICAgICAgICAq IGFjY2Vzc2liaWxpdHkvZ3RrL0FjY2Vzc2liaWxpdHlPYmplY3RBdGsuY3BwOgorICAgICAgICAo V2ViQ29yZTo6QWNjZXNzaWJpbGl0eU9iamVjdDo6YWNjZXNzaWJpbGl0eVBsYXRmb3JtSW5jbHVk ZXNPYmplY3QpOgorICAgICAgICBNYWtlIGxpc3QgbWFya2VycyBpZ25vcmUgYWNjZXNzaWJpbGl0 eSBmb3IgdGhlIEdUSyBwb3J0LgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvZ3RrL0FjY2Vzc2li aWxpdHlPYmplY3RXcmFwcGVyQXRrLmNwcDoKKyAgICAgICAgKHdlYmtpdF9hY2Nlc3NpYmxlX3Rl eHRfZ2V0X3RleHQpOiBQcmVmaXggdGhlIHRleHQgb2YgYSBtYXJrZXIKKyAgICAgICAgYWxvbmcg d2l0aCB0aGUgYWNjZXNzaWJsZSB0ZXh0IGZvciBpdHMgbGlzdCBpdGVtJ3MgQXRrT2JqZWN0CisK IDIwMTAtMDktMDYgIFpvbHRhbiBIZXJjemVnICA8emhlcmN6ZWdAd2Via2l0Lm9yZz4KIAogICAg ICAgICBSZXZpZXdlZCBieSBEaXJrIFNjaHVsemUuCmRpZmYgLS1naXQgYS9XZWJDb3JlL2FjY2Vz c2liaWxpdHkvZ3RrL0FjY2Vzc2liaWxpdHlPYmplY3RBdGsuY3BwIGIvV2ViQ29yZS9hY2Nlc3Np YmlsaXR5L2d0ay9BY2Nlc3NpYmlsaXR5T2JqZWN0QXRrLmNwcAppbmRleCBkMDA1NzRiLi5iMjJh NTFlIDEwMDY0NAotLS0gYS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvZ3RrL0FjY2Vzc2liaWxpdHlP YmplY3RBdGsuY3BwCisrKyBiL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9ndGsvQWNjZXNzaWJpbGl0 eU9iamVjdEF0ay5jcHAKQEAgLTcxLDYgKzcxLDEwIEBAIEFjY2Vzc2liaWxpdHlPYmplY3RJbmNs dXNpb24gQWNjZXNzaWJpbGl0eU9iamVjdDo6YWNjZXNzaWJpbGl0eVBsYXRmb3JtSW5jbHVkZXNP CiAgICAgaWYgKHJvbGUgPT0gU3RhdGljVGV4dFJvbGUpCiAgICAgICAgIHJldHVybiBJZ25vcmVP YmplY3Q7CiAKKyAgICAvLyBCdWxsZXRzL251bWJlcnMgZm9yIGxpc3QgaXRlbXMgc2hvdWxkbid0 IGJlIGV4cG9zZWQgYXMgQXRrT2JqZWN0cy4KKyAgICBpZiAocm9sZVZhbHVlKCkgPT0gTGlzdE1h cmtlclJvbGUpCisgICAgICAgIHJldHVybiBJZ25vcmVPYmplY3Q7CisKICAgICByZXR1cm4gRGVm YXVsdEJlaGF2aW9yOwogfQogCmRpZmYgLS1naXQgYS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvZ3Rr L0FjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyQXRrLmNwcCBiL1dlYkNvcmUvYWNjZXNzaWJpbGl0 eS9ndGsvQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJBdGsuY3BwCmluZGV4IGIxNjIzNDYuLjkw ZjM2M2YgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9ndGsvQWNjZXNzaWJpbGl0 eU9iamVjdFdyYXBwZXJBdGsuY3BwCisrKyBiL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9ndGsvQWNj ZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJBdGsuY3BwCkBAIC0zNCw2ICszNCw3IEBACiAjaWYgSEFW RShBQ0NFU1NJQklMSVRZKQogCiAjaW5jbHVkZSAiQVhPYmplY3RDYWNoZS5oIgorI2luY2x1ZGUg IkFjY2Vzc2liaWxpdHlMaXN0LmgiCiAjaW5jbHVkZSAiQWNjZXNzaWJpbGl0eUxpc3RCb3guaCIK ICNpbmNsdWRlICJBY2Nlc3NpYmlsaXR5TGlzdEJveE9wdGlvbi5oIgogI2luY2x1ZGUgIkFjY2Vz c2liaWxpdHlSZW5kZXJPYmplY3QuaCIKQEAgLTU0LDYgKzU1LDcgQEAKICNpbmNsdWRlICJJbmxp bmVUZXh0Qm94LmgiCiAjaW5jbHVkZSAiSW50UmVjdC5oIgogI2luY2x1ZGUgIk5vdEltcGxlbWVu dGVkLmgiCisjaW5jbHVkZSAiUmVuZGVyTGlzdE1hcmtlci5oIgogI2luY2x1ZGUgIlJlbmRlclRl eHQuaCIKICNpbmNsdWRlICJUZXh0RW5jb2RpbmcuaCIKICNpbmNsdWRlIDx3dGYvdGV4dC9DU3Ry aW5nLmg+CkBAIC05MzMsNiArOTM1LDE2IEBAIHN0YXRpYyBnY2hhciogd2Via2l0X2FjY2Vzc2li bGVfdGV4dF9nZXRfdGV4dChBdGtUZXh0KiB0ZXh0LCBnaW50IHN0YXJ0T2Zmc2V0LCBnCiAgICAg ICAgIHJldCA9IHJldC5zdWJzdHJpbmcoc3RhcnQsIGVuZE9mZnNldCAtIHN0YXJ0T2Zmc2V0KTsK ICAgICB9CiAKKyAgICAvLyBQcmVmaXggYSBpdGVtIG51bWJlci9idWxsZXQgaWYgbmVlZGVkCisg ICAgaWYgKGNvcmVPYmplY3QtPnJvbGVWYWx1ZSgpID09IExpc3RJdGVtUm9sZSkgeworICAgICAg ICBSZW5kZXJPYmplY3QqIG9ialJlbmRlcmVyID0gc3RhdGljX2Nhc3Q8QWNjZXNzaWJpbGl0eVJl bmRlck9iamVjdCo+KGNvcmVPYmplY3QpLT5yZW5kZXJlcigpOworICAgICAgICBSZW5kZXJPYmpl Y3QqIG1hcmtlclJlbmRlcmVyID0gb2JqUmVuZGVyZXIgPyBvYmpSZW5kZXJlci0+Zmlyc3RDaGls ZCgpIDogMDsKKyAgICAgICAgaWYgKG1hcmtlclJlbmRlcmVyICYmIG1hcmtlclJlbmRlcmVyLT5p c0xpc3RNYXJrZXIoKSkgeworICAgICAgICAgICAgU3RyaW5nIG1hcmtlclR4dCA9IHRvUmVuZGVy TGlzdE1hcmtlcihtYXJrZXJSZW5kZXJlciktPnRleHQoKTsKKyAgICAgICAgICAgIHJldCA9IG1h cmtlclR4dC5sZW5ndGgoKSA+IDAgPyBtYXJrZXJUeHQgKyAiICIgKyByZXQgOiByZXQ7CisgICAg ICAgIH0KKyAgICB9CisKICAgICByZXR1cm4gZ19zdHJkdXAocmV0LnV0ZjgoKS5kYXRhKCkpOwog fQogCmRpZmYgLS1naXQgYS9XZWJLaXQvZ3RrL0NoYW5nZUxvZyBiL1dlYktpdC9ndGsvQ2hhbmdl TG9nCmluZGV4IDUyNjY1YjEuLjYyNWQ5NWQgMTAwNjQ0Ci0tLSBhL1dlYktpdC9ndGsvQ2hhbmdl TG9nCisrKyBiL1dlYktpdC9ndGsvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTAtMDkt MDcgIE1hcmlvIFNhbmNoZXogUHJhZGEgIDxtc2FuY2hlekBpZ2FsaWEuY29tPgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtHdGtdIEEgbGlzdCBpdGVt J3MgbnVtYmVyL2J1bGxldCBzaG91bGQgbm90IGJlIGEgY2hpbGQgb2YgdGhhdCBsaXN0IGl0ZW0K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ1MTkwCisK KyAgICAgICAgTmV3IHVuaXQgdGVzdCBhZGRlZC4KKworICAgICAgICAqIHRlc3RzL3Rlc3RhdGsu YzoKKyAgICAgICAgKHRlc3RXZWJraXRBdGtMaXN0c09mSXRlbXMpOiBOZXcgdGVzdCB0byBjaGVj ayBvcmRlcmVkL3Vub3JkZXJlZAorICAgICAgICBsaXN0IG9mIGl0ZW1zIGFyZSBwcm9wZXJseSBl eHBvc2VkIHRvIEFUIHRlY2hub2xvZ2llcy4KKyAgICAgICAgKG1haW4pOgorCiAyMDEwLTA5LTAz ICBKZXN1cyBTYW5jaGV6LVBhbGVuY2lhICA8amVzdXMucGFsZW5jaWFAb3BlbmJvc3NhLm9yZz4K IAogICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KZGlmZiAtLWdpdCBhL1dlYktpdC9n dGsvdGVzdHMvdGVzdGF0ay5jIGIvV2ViS2l0L2d0ay90ZXN0cy90ZXN0YXRrLmMKaW5kZXggZTE1 OWY4YS4uOTkzMGJjMiAxMDA2NDQKLS0tIGEvV2ViS2l0L2d0ay90ZXN0cy90ZXN0YXRrLmMKKysr IGIvV2ViS2l0L2d0ay90ZXN0cy90ZXN0YXRrLmMKQEAgLTQ2LDYgKzQ2LDggQEAgc3RhdGljIGNv bnN0IGNoYXIqIGNvbnRlbnRzSW5UYWJsZVdpdGhIZWFkZXJzID0gIjxodG1sPjxib2R5Pjx0YWJs ZT48dHI+PHRoPmZvbzwKIAogc3RhdGljIGNvbnN0IGNoYXIqIHRleHRXaXRoQXR0cmlidXRlcyA9 ICI8aHRtbD48aGVhZD48c3R5bGU+LnN0MSB7Zm9udC1mYW1pbHk6IG1vbm9zcGFjZTsgY29sb3I6 cmdiKDEyMCwxMjEsMTIyKTt9IC5zdDIge3RleHQtZGVjb3JhdGlvbjp1bmRlcmxpbmU7IGJhY2tn cm91bmQtY29sb3I6cmdiKDgwLDgxLDgyKTt9PC9zdHlsZT48L2hlYWQ+PGJvZHk+PHAgc3R5bGU9 XCJmb250LXNpemU6MTQ7IHRleHQtYWxpZ246cmlnaHQ7XCI+VGhpcyBpcyB0aGUgPGk+Zmlyc3Q8 L2k+PGI+IHNlbnRlbmNlIG9mIHRoaXMgdGV4dC48L2I+PC9wPjxwIGNsYXNzPVwic3QxXCI+VGhp cyBzZW50ZW5jZSBzaG91bGQgaGF2ZSBhbiBzdHlsZSBhcHBsaWVkIDxzcGFuIGNsYXNzPVwic3Qy XCI+YW5kIHRoaXMgcGFydCBzaG91bGQgaGF2ZSBhbm90aGVyIG9uZTwvc3Bhbj4uPC9wPjxwPng8 c3ViPjE8L3N1Yj48c3VwPjI8L3N1cD49eDxzdWI+Mjwvc3ViPjxzdXA+Mzwvc3VwPjwvcD48cCBz dHlsZT1cInRleHQtYWxpZ246Y2VudGVyO1wiPlRoaXMgc2VudGVuY2UgaXMgdGhlIDxzdHJpa2U+ bGFzdDwvc3RyaWtlPiBvbmUuPC9wPjwvYm9keT48L2h0bWw+IjsKIAorc3RhdGljIGNvbnN0IGNo YXIqIGxpc3RzT2ZJdGVtcyA9ICI8aHRtbD48Ym9keT48dWw+PGxpPnRleHQgb25seTwvbGk+PGxp PjxhIGhyZWY9J2Zvbyc+bGluayBvbmx5PC9hPjwvbGk+PGxpPnRleHQgYW5kIGEgPGEgaHJlZj0n YmFyJz5saW5rPC9hPjwvbGk+PC91bD48b2w+PGxpPnRleHQgb25seTwvbGk+PGxpPjxhIGhyZWY9 J2Zvbyc+bGluayBvbmx5PC9hPjwvbGk+PGxpPnRleHQgYW5kIGEgPGEgaHJlZj0nYmFyJz5saW5r PC9hPjwvbGk+PC9vbD48L2JvZHk+PC9odG1sPiI7CisKIHN0YXRpYyBnYm9vbGVhbiBiYWlsX291 dChHTWFpbkxvb3AqIGxvb3ApCiB7CiAgICAgaWYgKGdfbWFpbl9sb29wX2lzX3J1bm5pbmcobG9v cCkpCkBAIC04NDMsNiArODQ1LDgxIEBAIHN0YXRpYyB2b2lkIHRlc3Rfd2Via2l0X2F0a19nZXRf ZXh0ZW50cyh2b2lkKQogICAgIGdfb2JqZWN0X3VucmVmKHdlYlZpZXcpOwogfQogCitzdGF0aWMg dm9pZCB0ZXN0V2Via2l0QXRrTGlzdHNPZkl0ZW1zKHZvaWQpCit7CisgICAgV2ViS2l0V2ViVmll dyogd2ViVmlldzsKKyAgICBBdGtPYmplY3QqIG9iajsKKyAgICBBdGtPYmplY3QqIHVMaXN0Owor ICAgIEF0a09iamVjdCogb0xpc3Q7CisgICAgQXRrT2JqZWN0KiBpdGVtMTsKKyAgICBBdGtPYmpl Y3QqIGl0ZW0yOworICAgIEF0a09iamVjdCogaXRlbTM7CisgICAgR01haW5Mb29wKiBsb29wOwor CisgICAgd2ViVmlldyA9IFdFQktJVF9XRUJfVklFVyh3ZWJraXRfd2ViX3ZpZXdfbmV3KCkpOwor ICAgIGdfb2JqZWN0X3JlZl9zaW5rKHdlYlZpZXcpOworICAgIEd0a0FsbG9jYXRpb24gYWxsb2Mg PSB7IDAsIDAsIDgwMCwgNjAwIH07CisgICAgZ3RrX3dpZGdldF9zaXplX2FsbG9jYXRlKEdUS19X SURHRVQod2ViVmlldyksICZhbGxvYyk7CisgICAgd2Via2l0X3dlYl92aWV3X2xvYWRfc3RyaW5n KHdlYlZpZXcsIGxpc3RzT2ZJdGVtcywgTlVMTCwgTlVMTCwgTlVMTCk7CisgICAgbG9vcCA9IGdf bWFpbl9sb29wX25ldyhOVUxMLCBUUlVFKTsKKworICAgIGdfdGltZW91dF9hZGQoMTAwLCAoR1Nv dXJjZUZ1bmMpYmFpbF9vdXQsIGxvb3ApOworICAgIGdfbWFpbl9sb29wX3J1bihsb29wKTsKKwor ICAgIG9iaiA9IGd0a193aWRnZXRfZ2V0X2FjY2Vzc2libGUoR1RLX1dJREdFVCh3ZWJWaWV3KSk7 CisgICAgZ19hc3NlcnQob2JqKTsKKworICAgIC8vIFVub3JkZXJlZCBsaXN0CisKKyAgICB1TGlz dCA9IGF0a19vYmplY3RfcmVmX2FjY2Vzc2libGVfY2hpbGQob2JqLCAwKTsKKyAgICBnX2Fzc2Vy dChBVEtfT0JKRUNUKHVMaXN0KSk7CisgICAgZ19hc3NlcnQoYXRrX29iamVjdF9nZXRfcm9sZSh1 TGlzdCkgPT0gQVRLX1JPTEVfTElTVCk7CisgICAgZ19hc3NlcnRfY21waW50KGF0a19vYmplY3Rf Z2V0X25fYWNjZXNzaWJsZV9jaGlsZHJlbih1TGlzdCksID09LCAzKTsKKworICAgIGl0ZW0xID0g QVRLX1RFWFQoYXRrX29iamVjdF9yZWZfYWNjZXNzaWJsZV9jaGlsZCh1TGlzdCwgMCkpOworICAg IGl0ZW0yID0gQVRLX1RFWFQoYXRrX29iamVjdF9yZWZfYWNjZXNzaWJsZV9jaGlsZCh1TGlzdCwg MSkpOworICAgIGl0ZW0zID0gQVRLX1RFWFQoYXRrX29iamVjdF9yZWZfYWNjZXNzaWJsZV9jaGls ZCh1TGlzdCwgMikpOworCisgICAgZ19hc3NlcnRfY21waW50KGF0a19vYmplY3RfZ2V0X25fYWNj ZXNzaWJsZV9jaGlsZHJlbihpdGVtMSksID09LCAwKTsKKyAgICBnX2Fzc2VydF9jbXBpbnQoYXRr X29iamVjdF9nZXRfbl9hY2Nlc3NpYmxlX2NoaWxkcmVuKGl0ZW0yKSwgPT0sIDEpOworICAgIGdf YXNzZXJ0X2NtcGludChhdGtfb2JqZWN0X2dldF9uX2FjY2Vzc2libGVfY2hpbGRyZW4oaXRlbTMp LCA9PSwgMSk7CisKKyAgICBnX2Fzc2VydF9jbXBzdHIoYXRrX3RleHRfZ2V0X3RleHQoaXRlbTEs IDAsIC0xKSwgPT0sICJcMzQyXDIwMFwyNDIgdGV4dCBvbmx5Iik7CisgICAgZ19hc3NlcnRfY21w c3RyKGF0a190ZXh0X2dldF90ZXh0KGl0ZW0yLCAwLCAtMSksID09LCAiXDM0MlwyMDBcMjQyIGxp bmsgb25seSIpOworICAgIGdfYXNzZXJ0X2NtcHN0cihhdGtfdGV4dF9nZXRfdGV4dChpdGVtMywg MCwgLTEpLCA9PSwgIlwzNDJcMjAwXDI0MiB0ZXh0IGFuZCBhIGxpbmsiKTsKKworICAgIGdfb2Jq ZWN0X3VucmVmKGl0ZW0xKTsKKyAgICBnX29iamVjdF91bnJlZihpdGVtMik7CisgICAgZ19vYmpl Y3RfdW5yZWYoaXRlbTMpOworCisgICAgLy8gT3JkZXJlZCBsaXN0CisKKyAgICBvTGlzdCA9IGF0 a19vYmplY3RfcmVmX2FjY2Vzc2libGVfY2hpbGQob2JqLCAxKTsKKyAgICBnX2Fzc2VydChBVEtf T0JKRUNUKG9MaXN0KSk7CisgICAgZ19hc3NlcnQoYXRrX29iamVjdF9nZXRfcm9sZShvTGlzdCkg PT0gQVRLX1JPTEVfTElTVCk7CisgICAgZ19hc3NlcnRfY21waW50KGF0a19vYmplY3RfZ2V0X25f YWNjZXNzaWJsZV9jaGlsZHJlbihvTGlzdCksID09LCAzKTsKKworICAgIGl0ZW0xID0gQVRLX1RF WFQoYXRrX29iamVjdF9yZWZfYWNjZXNzaWJsZV9jaGlsZChvTGlzdCwgMCkpOworICAgIGl0ZW0y ID0gQVRLX1RFWFQoYXRrX29iamVjdF9yZWZfYWNjZXNzaWJsZV9jaGlsZChvTGlzdCwgMSkpOwor ICAgIGl0ZW0zID0gQVRLX1RFWFQoYXRrX29iamVjdF9yZWZfYWNjZXNzaWJsZV9jaGlsZChvTGlz dCwgMikpOworCisgICAgZ19hc3NlcnRfY21wc3RyKGF0a190ZXh0X2dldF90ZXh0KGl0ZW0xLCAw LCAtMSksID09LCAiMSB0ZXh0IG9ubHkiKTsKKyAgICBnX2Fzc2VydF9jbXBzdHIoYXRrX3RleHRf Z2V0X3RleHQoaXRlbTIsIDAsIC0xKSwgPT0sICIyIGxpbmsgb25seSIpOworICAgIGdfYXNzZXJ0 X2NtcHN0cihhdGtfdGV4dF9nZXRfdGV4dChpdGVtMywgMCwgLTEpLCA9PSwgIjMgdGV4dCBhbmQg YSBsaW5rIik7CisKKyAgICBnX2Fzc2VydF9jbXBpbnQoYXRrX29iamVjdF9nZXRfbl9hY2Nlc3Np YmxlX2NoaWxkcmVuKGl0ZW0xKSwgPT0sIDApOworICAgIGdfYXNzZXJ0X2NtcGludChhdGtfb2Jq ZWN0X2dldF9uX2FjY2Vzc2libGVfY2hpbGRyZW4oaXRlbTIpLCA9PSwgMSk7CisgICAgZ19hc3Nl cnRfY21waW50KGF0a19vYmplY3RfZ2V0X25fYWNjZXNzaWJsZV9jaGlsZHJlbihpdGVtMyksID09 LCAxKTsKKworICAgIGdfb2JqZWN0X3VucmVmKGl0ZW0xKTsKKyAgICBnX29iamVjdF91bnJlZihp dGVtMik7CisgICAgZ19vYmplY3RfdW5yZWYoaXRlbTMpOworCisgICAgZ19vYmplY3RfdW5yZWYo dUxpc3QpOworICAgIGdfb2JqZWN0X3VucmVmKG9MaXN0KTsKKyAgICBnX29iamVjdF91bnJlZih3 ZWJWaWV3KTsKK30KKwogaW50IG1haW4oaW50IGFyZ2MsIGNoYXIqKiBhcmd2KQogewogICAgIGdf dGhyZWFkX2luaXQoTlVMTCk7CkBAIC04NjAsNiArOTM3LDcgQEAgaW50IG1haW4oaW50IGFyZ2Ms IGNoYXIqKiBhcmd2KQogICAgIGdfdGVzdF9hZGRfZnVuYygiL3dlYmtpdC9hdGsvZ2V0SGVhZGVy c0luVGFibGUiLCB0ZXN0V2Via2l0QXRrR2V0SGVhZGVyc0luVGFibGUpOwogICAgIGdfdGVzdF9h ZGRfZnVuYygiL3dlYmtpdC9hdGsvdGV4dEF0dHJpYnV0ZXMiLCB0ZXN0V2Via2l0QXRrVGV4dEF0 dHJpYnV0ZXMpOwogICAgIGdfdGVzdF9hZGRfZnVuYygiL3dlYmtpdC9hdGsvZ2V0X2V4dGVudHMi LCB0ZXN0X3dlYmtpdF9hdGtfZ2V0X2V4dGVudHMpOworICAgIGdfdGVzdF9hZGRfZnVuYygiL3dl YmtpdC9hdGsvbGlzdHNPZkl0ZW1zIiwgdGVzdFdlYmtpdEF0a0xpc3RzT2ZJdGVtcyk7CiAgICAg cmV0dXJuIGdfdGVzdF9ydW4gKCk7CiB9CiAKLS0gCjEuNy4wLjQKCg==