28963 2009-09-03 20:36:10 -0700 AX notifications should be an ENUM type instead of strings 2009-09-09 23:41:08 -0700 1 1 1 Unclassified WebKit Accessibility 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 cfleizach cfleizach oldest_to_newest 144680 0 cfleizach 2009-09-03 20:36:10 -0700 right now AX notifications are string literals that match exactly with the strings used on the mac platform. it would be better to be an ENUM type that could then use public API 145649 1 39245 cfleizach 2009-09-08 22:21:44 -0700 Created attachment 39245 patch 145744 2 39245 darin 2009-09-09 07:42:40 -0700 Comment on attachment 39245 patch > + // Notifications. Use strings provided for consistency. What does "Use strings provided for consistency" mean? Who should use strings, for what? > + enum AXNotification { > + AXCheckedStateChanged = 1, Why the = 1 here? I recommend leaving that out unless you have some need for a zero value. r=me 146093 3 cfleizach 2009-09-09 23:41:08 -0700 Committed rr48244: <http://trac.webkit.org/changeset/r48244> 39245 2009-09-08 22:21:44 -0700 2009-09-09 07:42:40 -0700 patch patch.txt text/plain 15453 cfleizach SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0ODIwMCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsNDMgQEAKKzIwMDktMDktMDggIENocmlzIEZsZWl6YWNoICA8Y2ZsZWl6YWNoQGFw cGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBBWCBub3RpZmljYXRpb25zIHNob3VsZCBiZSBhbiBFTlVNIHR5cGUgaW5zdGVhZCBvZiBzdHJp bmdzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yODk2 MworCisgICAgICAgIE1vdmVzIEFYIG5vdGlmaWNhdGlvbnMgb3ZlciB0byBhbiBFTlVNIHR5cGUg aW5zdGVhZCBvZgorICAgICAgICB1c2luZyB0aGUgYWN0dWFsIHN0cmluZyB2YWx1ZXMgdGhhdCBh cmUgdXNlZCBvbiBPUyBYLgorCisgICAgICAgICogYWNjZXNzaWJpbGl0eS9BWE9iamVjdENhY2hl LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFYT2JqZWN0Q2FjaGU6OnBvc3ROb3RpZmljYXRpb24p OgorICAgICAgICAoV2ViQ29yZTo6QVhPYmplY3RDYWNoZTo6c2VsZWN0ZWRDaGlsZHJlbkNoYW5n ZWQpOgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvQVhPYmplY3RDYWNoZS5oOgorICAgICAgICAo V2ViQ29yZTo6QVhPYmplY3RDYWNoZTo6KToKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L0FjY2Vz c2liaWxpdHlSZW5kZXJPYmplY3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0 eVJlbmRlck9iamVjdDo6aGFuZGxlQWN0aXZlRGVzY2VuZGFudENoYW5nZWQpOgorICAgICAgICAq IGFjY2Vzc2liaWxpdHkvY2hyb21pdW0vQVhPYmplY3RDYWNoZUNocm9taXVtLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkFYT2JqZWN0Q2FjaGU6OnBvc3RQbGF0Zm9ybU5vdGlmaWNhdGlvbik6Cisg ICAgICAgICogYWNjZXNzaWJpbGl0eS9ndGsvQVhPYmplY3RDYWNoZUF0ay5jcHA6CisgICAgICAg IChXZWJDb3JlOjpBWE9iamVjdENhY2hlOjpwb3N0UGxhdGZvcm1Ob3RpZmljYXRpb24pOgorICAg ICAgICAqIGFjY2Vzc2liaWxpdHkvbWFjL0FYT2JqZWN0Q2FjaGVNYWMubW06CisgICAgICAgIChX ZWJDb3JlOjpBWE9iamVjdENhY2hlOjpwb3N0UGxhdGZvcm1Ob3RpZmljYXRpb24pOgorICAgICAg ICAqIGFjY2Vzc2liaWxpdHkvd2luL0FYT2JqZWN0Q2FjaGVXaW4uY3BwOgorICAgICAgICAoV2Vi Q29yZTo6QVhPYmplY3RDYWNoZTo6cG9zdFBsYXRmb3JtTm90aWZpY2F0aW9uKToKKyAgICAgICAg KiBkb20vRG9jdW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6OmltcGxpY2l0 Q2xvc2UpOgorICAgICAgICAqIGRvbS9FbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkVs ZW1lbnQ6OnVwZGF0ZUFmdGVyQXR0cmlidXRlQ2hhbmdlZCk6CisgICAgICAgICogZWRpdGluZy9F ZGl0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RWRpdG9yOjpyZXNwb25kVG9DaGFuZ2VkQ29u dGVudHMpOgorICAgICAgICAqIGVkaXRpbmcvbWFjL1NlbGVjdGlvbkNvbnRyb2xsZXJNYWMubW06 CisgICAgICAgIChXZWJDb3JlOjpTZWxlY3Rpb25Db250cm9sbGVyOjpub3RpZnlBY2Nlc3NpYmls aXR5Rm9yU2VsZWN0aW9uQ2hhbmdlKToKKyAgICAgICAgKiBodG1sL0hUTUxJbnB1dEVsZW1lbnQu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTElucHV0RWxlbWVudDo6c2V0Q2hlY2tlZCk6Cisg ICAgICAgICogcGFnZS9GcmFtZVZpZXcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3 OjpsYXlvdXQpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUZXh0Q29udHJvbC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJUZXh0Q29udHJvbDo6c2V0SW5uZXJUZXh0VmFsdWUpOgor CiAyMDA5LTA5LTA4ICBPbGl2ZXIgSHVudCAgPG9saXZlckBhcHBsZS5jb20+CiAKICAgICAgICAg UmV2aWV3ZWQgYnkgU2FtIFdlaW5pZy4KSW5kZXg6IFdlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWE9i amVjdENhY2hlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhPYmpl Y3RDYWNoZS5jcHAJKHJldmlzaW9uIDQ4MDQ5KQorKysgV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FY T2JqZWN0Q2FjaGUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMzksNyArMzM5LDcgQEAgdm9pZCBB WE9iamVjdENhY2hlOjpub3RpZmljYXRpb25Qb3N0VGltZQogfQogICAgIAogI2lmIEhBVkUoQUND RVNTSUJJTElUWSkKLXZvaWQgQVhPYmplY3RDYWNoZTo6cG9zdE5vdGlmaWNhdGlvbihSZW5kZXJP YmplY3QqIHJlbmRlcmVyLCBjb25zdCBTdHJpbmcmIG1lc3NhZ2UsIGJvb2wgcG9zdFRvRWxlbWVu dCkKK3ZvaWQgQVhPYmplY3RDYWNoZTo6cG9zdE5vdGlmaWNhdGlvbihSZW5kZXJPYmplY3QqIHJl bmRlcmVyLCBBWE5vdGlmaWNhdGlvbiBub3RpZmljYXRpb24sIGJvb2wgcG9zdFRvRWxlbWVudCkK IHsKICAgICAvLyBOb3RpZmljYXRpb25zIGZvciB0ZXh0IGlucHV0IG9iamVjdHMgYXJlIHNlbnQg dG8gdGhhdCBvYmplY3QuCiAgICAgLy8gQWxsIG90aGVycyBhcmUgc2VudCB0byB0aGUgdG9wIFdl YkFyZWEuCkBAIC0zNjcsMTQgKzM2NywxNCBAQCB2b2lkIEFYT2JqZWN0Q2FjaGU6OnBvc3ROb3Rp ZmljYXRpb24oUmVuCiAgICAgaWYgKCFvYmopCiAgICAgICAgIHJldHVybjsKIAotICAgIG1fbm90 aWZpY2F0aW9uc1RvUG9zdC5hcHBlbmQobWFrZV9wYWlyKG9iaiwgbWVzc2FnZSkpOworICAgIG1f bm90aWZpY2F0aW9uc1RvUG9zdC5hcHBlbmQobWFrZV9wYWlyKG9iaiwgbm90aWZpY2F0aW9uKSk7 CiAgICAgaWYgKCFtX25vdGlmaWNhdGlvblBvc3RUaW1lci5pc0FjdGl2ZSgpKQogICAgICAgICBt X25vdGlmaWNhdGlvblBvc3RUaW1lci5zdGFydE9uZVNob3QoMCk7CiB9CiAKIHZvaWQgQVhPYmpl Y3RDYWNoZTo6c2VsZWN0ZWRDaGlsZHJlbkNoYW5nZWQoUmVuZGVyT2JqZWN0KiByZW5kZXJlcikK IHsKLSAgICBwb3N0Tm90aWZpY2F0aW9uKHJlbmRlcmVyLCAiQVhTZWxlY3RlZENoaWxkcmVuQ2hh bmdlZCIsIHRydWUpOworICAgIHBvc3ROb3RpZmljYXRpb24ocmVuZGVyZXIsIEFYU2VsZWN0ZWRD aGlsZHJlbkNoYW5nZWQsIHRydWUpOwogfQogI2VuZGlmCiAKSW5kZXg6IFdlYkNvcmUvYWNjZXNz aWJpbGl0eS9BWE9iamVjdENhY2hlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9hY2Nlc3NpYmls aXR5L0FYT2JqZWN0Q2FjaGUuaAkocmV2aXNpb24gNDgwNDkpCisrKyBXZWJDb3JlL2FjY2Vzc2li aWxpdHkvQVhPYmplY3RDYWNoZS5oCSh3b3JraW5nIGNvcHkpCkBAIC03Niw4ICs3Niw2IEBAIG5h bWVzcGFjZSBXZWJDb3JlIHsKIAogICAgICAgICB2b2lkIGRldGFjaFdyYXBwZXIoQWNjZXNzaWJp bGl0eU9iamVjdCopOwogICAgICAgICB2b2lkIGF0dGFjaFdyYXBwZXIoQWNjZXNzaWJpbGl0eU9i amVjdCopOwotICAgICAgICB2b2lkIHBvc3ROb3RpZmljYXRpb24oUmVuZGVyT2JqZWN0KiwgY29u c3QgU3RyaW5nJiwgYm9vbCBwb3N0VG9FbGVtZW50KTsKLSAgICAgICAgdm9pZCBwb3N0UGxhdGZv cm1Ob3RpZmljYXRpb24oQWNjZXNzaWJpbGl0eU9iamVjdCosIGNvbnN0IFN0cmluZyYpOwogICAg ICAgICB2b2lkIGNoaWxkcmVuQ2hhbmdlZChSZW5kZXJPYmplY3QqKTsKICAgICAgICAgdm9pZCBz ZWxlY3RlZENoaWxkcmVuQ2hhbmdlZChSZW5kZXJPYmplY3QqKTsKICAgICAgICAgdm9pZCBoYW5k bGVBY3RpdmVEZXNjZW5kYW50Q2hhbmdlZChSZW5kZXJPYmplY3QqKTsKQEAgLTk4LDYgKzk2LDIy IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgc3RhdGljIHZvaWQgdGV4dE1hcmtlckRh dGFGb3JWaXNpYmxlUG9zaXRpb24oVGV4dE1hcmtlckRhdGEmLCBjb25zdCBWaXNpYmxlUG9zaXRp b24mKTsKICAgICAgICAgc3RhdGljIFZpc2libGVQb3NpdGlvbiB2aXNpYmxlUG9zaXRpb25Gb3JU ZXh0TWFya2VyRGF0YShUZXh0TWFya2VyRGF0YSYpOwogCisgICAgICAgIC8vIE5vdGlmaWNhdGlv bnMuIFVzZSBzdHJpbmdzIHByb3ZpZGVkIGZvciBjb25zaXN0ZW5jeS4KKyAgICAgICAgZW51bSBB WE5vdGlmaWNhdGlvbiB7CisgICAgICAgICAgICBBWENoZWNrZWRTdGF0ZUNoYW5nZWQgPSAxLAor ICAgICAgICAgICAgQVhGb2N1c2VkVUlFbGVtZW50Q2hhbmdlZCwKKyAgICAgICAgICAgIEFYTGF5 b3V0Q29tcGxldGUsCisgICAgICAgICAgICBBWExvYWRDb21wbGV0ZSwKKyAgICAgICAgICAgIEFY U2VsZWN0ZWRDaGlsZHJlbkNoYW5nZWQsCisgICAgICAgICAgICBBWFNlbGVjdGVkVGV4dENoYW5n ZWQsCisgICAgICAgICAgICBBWFZhbHVlQ2hhbmdlZAorICAgICAgICB9OworICAgICAgICAKKyAg ICAgICAgdm9pZCBwb3N0Tm90aWZpY2F0aW9uKFJlbmRlck9iamVjdCosIEFYTm90aWZpY2F0aW9u LCBib29sIHBvc3RUb0VsZW1lbnQpOworCisgICAgcHJvdGVjdGVkOgorICAgICAgICB2b2lkIHBv c3RQbGF0Zm9ybU5vdGlmaWNhdGlvbihBY2Nlc3NpYmlsaXR5T2JqZWN0KiwgQVhOb3RpZmljYXRp b24pOworCiAgICAgcHJpdmF0ZToKICAgICAgICAgSGFzaE1hcDxBWElELCBSZWZQdHI8QWNjZXNz aWJpbGl0eU9iamVjdD4gPiBtX29iamVjdHM7CiAgICAgICAgIEhhc2hNYXA8UmVuZGVyT2JqZWN0 KiwgQVhJRD4gbV9yZW5kZXJPYmplY3RNYXBwaW5nOwpAQCAtMTA3LDcgKzEyMSw3IEBAIG5hbWVz cGFjZSBXZWJDb3JlIHsKICAgICAgICAgSGFzaFNldDxBWElEPiBtX2lkc0luVXNlOwogICAgICAg ICAKICAgICAgICAgVGltZXI8QVhPYmplY3RDYWNoZT4gbV9ub3RpZmljYXRpb25Qb3N0VGltZXI7 Ci0gICAgICAgIFZlY3RvcjxwYWlyPFJlZlB0cjxBY2Nlc3NpYmlsaXR5T2JqZWN0PiwgY29uc3Qg U3RyaW5nPiA+IG1fbm90aWZpY2F0aW9uc1RvUG9zdDsKKyAgICAgICAgVmVjdG9yPHBhaXI8UmVm UHRyPEFjY2Vzc2liaWxpdHlPYmplY3Q+LCBBWE5vdGlmaWNhdGlvbj4gPiBtX25vdGlmaWNhdGlv bnNUb1Bvc3Q7CiAgICAgICAgIHZvaWQgbm90aWZpY2F0aW9uUG9zdFRpbWVyRmlyZWQoVGltZXI8 QVhPYmplY3RDYWNoZT4qKTsKICAgICAgICAgCiAgICAgICAgIEFYSUQgZ2V0QVhJRChBY2Nlc3Np YmlsaXR5T2JqZWN0Kik7CkluZGV4OiBXZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0 eVJlbmRlck9iamVjdC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0Fj Y2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuY3BwCShyZXZpc2lvbiA0ODA0OSkKKysrIFdlYkNvcmUv YWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmNwcAkod29ya2luZyBjb3B5 KQpAQCAtMjE3NCw3ICsyMTc0LDcgQEAgdm9pZCBBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0Ojpo YW5kbGVBYwogICAgIEFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QqIGFjdGl2ZWRlc2NlbmRhbnQg PSBzdGF0aWNfY2FzdDxBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0Kj4oYWN0aXZlRGVzY2VuZGFu dCgpKTsKICAgICAKICAgICBpZiAoYWN0aXZlZGVzY2VuZGFudCAmJiBzaG91bGRGb2N1c0FjdGl2 ZURlc2NlbmRhbnQoKSkKLSAgICAgICAgZG9jLT5heE9iamVjdENhY2hlKCktPnBvc3ROb3RpZmlj YXRpb24oYWN0aXZlZGVzY2VuZGFudC0+cmVuZGVyZXIoKSwgIkFYRm9jdXNlZFVJRWxlbWVudENo YW5nZWQiLCB0cnVlKTsKKyAgICAgICAgZG9jLT5heE9iamVjdENhY2hlKCktPnBvc3ROb3RpZmlj YXRpb24oYWN0aXZlZGVzY2VuZGFudC0+cmVuZGVyZXIoKSwgQVhPYmplY3RDYWNoZTo6QVhGb2N1 c2VkVUlFbGVtZW50Q2hhbmdlZCwgdHJ1ZSk7CiB9CiAKIApJbmRleDogV2ViQ29yZS9hY2Nlc3Np YmlsaXR5L2Nocm9taXVtL0FYT2JqZWN0Q2FjaGVDaHJvbWl1bS5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2Nocm9taXVtL0FYT2JqZWN0Q2FjaGVDaHJvbWl1bS5jcHAJ KHJldmlzaW9uIDQ4MDQ5KQorKysgV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2Nocm9taXVtL0FYT2Jq ZWN0Q2FjaGVDaHJvbWl1bS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQzLDcgKzQzLDcgQEAgdm9p ZCBBWE9iamVjdENhY2hlOjphdHRhY2hXcmFwcGVyKEFjY2VzcwogICAgIC8vIEluIENocm9taXVt LCBBY2Nlc3NpYmlsaXR5T2JqZWN0cyBhcmUgd3JhcHBlZCBsYXppbHkuCiB9CiAKLXZvaWQgQVhP YmplY3RDYWNoZTo6cG9zdFBsYXRmb3JtTm90aWZpY2F0aW9uKEFjY2Vzc2liaWxpdHlPYmplY3Qq LCBjb25zdCBTdHJpbmcmKQordm9pZCBBWE9iamVjdENhY2hlOjpwb3N0UGxhdGZvcm1Ob3RpZmlj YXRpb24oQWNjZXNzaWJpbGl0eU9iamVjdCosIEFYTm90aWZpY2F0aW9uKQogewogfQogCkluZGV4 OiBXZWJDb3JlL2FjY2Vzc2liaWxpdHkvZ3RrL0FYT2JqZWN0Q2FjaGVBdGsuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYkNvcmUvYWNjZXNzaWJpbGl0eS9ndGsvQVhPYmplY3RDYWNoZUF0ay5jcHAJKHJl dmlzaW9uIDQ4MDQ5KQorKysgV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2d0ay9BWE9iamVjdENhY2hl QXRrLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzcsOSArMzcsOSBAQCB2b2lkIEFYT2JqZWN0Q2Fj aGU6OmF0dGFjaFdyYXBwZXIoQWNjZXNzCiAgICAgZ19vYmplY3RfdW5yZWYoYXRrT2JqKTsKIH0K IAotdm9pZCBBWE9iamVjdENhY2hlOjpwb3N0UGxhdGZvcm1Ob3RpZmljYXRpb24oQWNjZXNzaWJp bGl0eU9iamVjdCogY29yZU9iamVjdCwgY29uc3QgU3RyaW5nJiBtZXNzYWdlKQordm9pZCBBWE9i amVjdENhY2hlOjpwb3N0UGxhdGZvcm1Ob3RpZmljYXRpb24oQWNjZXNzaWJpbGl0eU9iamVjdCog Y29yZU9iamVjdCwgQVhOb3RpZmljYXRpb24gbm90aWZpY2F0aW9uKQogewotICAgIGlmIChtZXNz YWdlID09ICJBWENoZWNrZWRTdGF0ZUNoYW5nZWQiKSB7CisgICAgaWYgKG5vdGlmaWNhdGlvbiA9 PSBBWENoZWNrZWRTdGF0ZUNoYW5nZWQpIHsKICAgICAgICAgaWYgKCFjb3JlT2JqZWN0LT5pc0No ZWNrYm94T3JSYWRpbygpKQogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICBnX3NpZ25hbF9l bWl0X2J5X25hbWUoY29yZU9iamVjdC0+d3JhcHBlcigpLCAic3RhdGUtY2hhbmdlIiwgImNoZWNr ZWQiLCBjb3JlT2JqZWN0LT5pc0NoZWNrZWQoKSk7CkluZGV4OiBXZWJDb3JlL2FjY2Vzc2liaWxp dHkvbWFjL0FYT2JqZWN0Q2FjaGVNYWMubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9hY2Nlc3Np YmlsaXR5L21hYy9BWE9iamVjdENhY2hlTWFjLm1tCShyZXZpc2lvbiA0ODA0OSkKKysrIFdlYkNv cmUvYWNjZXNzaWJpbGl0eS9tYWMvQVhPYmplY3RDYWNoZU1hYy5tbQkod29ya2luZyBjb3B5KQpA QCAtNTEsMTIgKzUxLDM4IEBAIHZvaWQgQVhPYmplY3RDYWNoZTo6YXR0YWNoV3JhcHBlcihBY2Nl c3MKICAgICBvYmotPnNldFdyYXBwZXIoW1tBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlciBhbGxv Y10gaW5pdFdpdGhBY2Nlc3NpYmlsaXR5T2JqZWN0Om9ial0pOwogfQogCi12b2lkIEFYT2JqZWN0 Q2FjaGU6OnBvc3RQbGF0Zm9ybU5vdGlmaWNhdGlvbihBY2Nlc3NpYmlsaXR5T2JqZWN0KiBvYmos IGNvbnN0IFN0cmluZyYgbWVzc2FnZSkKK3ZvaWQgQVhPYmplY3RDYWNoZTo6cG9zdFBsYXRmb3Jt Tm90aWZpY2F0aW9uKEFjY2Vzc2liaWxpdHlPYmplY3QqIG9iaiwgQVhOb3RpZmljYXRpb24gbm90 aWZpY2F0aW9uKQogewogICAgIGlmICghb2JqKQogICAgICAgICByZXR1cm47CiAgICAgCi0gICAg TlNBY2Nlc3NpYmlsaXR5UG9zdE5vdGlmaWNhdGlvbihvYmotPndyYXBwZXIoKSwgbWVzc2FnZSk7 CisgICAgLy8gU29tZSBub3RpZmljYXRpb25zIGFyZSB1bmlxdWUgdG8gU2FmYXJpIGFuZCBkbyBu b3QgaGF2ZSBOU0FjY2Vzc2liaWxpdHkgZXF1aXZhbGVudHMuCisgICAgU3RyaW5nIG1hY05vdGlm aWNhdGlvbjsKKyAgICBzd2l0Y2ggKG5vdGlmaWNhdGlvbikgeworICAgICAgICBjYXNlIEFYQ2hl Y2tlZFN0YXRlQ2hhbmdlZDoKKyAgICAgICAgICAgIG1hY05vdGlmaWNhdGlvbiA9ICJBWENoZWNr ZWRTdGF0ZUNoYW5nZWQiOworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIGNhc2UgQVhGb2N1 c2VkVUlFbGVtZW50Q2hhbmdlZDoKKyAgICAgICAgICAgIG1hY05vdGlmaWNhdGlvbiA9IE5TQWNj ZXNzaWJpbGl0eUZvY3VzZWRVSUVsZW1lbnRDaGFuZ2VkTm90aWZpY2F0aW9uOworICAgICAgICAg ICAgYnJlYWs7CisgICAgICAgIGNhc2UgQVhMYXlvdXRDb21wbGV0ZToKKyAgICAgICAgICAgIG1h Y05vdGlmaWNhdGlvbiA9ICJBWExheW91dENvbXBsZXRlIjsKKyAgICAgICAgICAgIGJyZWFrOwor ICAgICAgICBjYXNlIEFYTG9hZENvbXBsZXRlOgorICAgICAgICAgICAgbWFjTm90aWZpY2F0aW9u ID0gIkFYTG9hZENvbXBsZXRlIjsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICBjYXNlIEFY U2VsZWN0ZWRDaGlsZHJlbkNoYW5nZWQ6CisgICAgICAgICAgICBtYWNOb3RpZmljYXRpb24gPSBO U0FjY2Vzc2liaWxpdHlTZWxlY3RlZENoaWxkcmVuQ2hhbmdlZE5vdGlmaWNhdGlvbjsKKyAgICAg ICAgICAgIGJyZWFrOworICAgICAgICBjYXNlIEFYU2VsZWN0ZWRUZXh0Q2hhbmdlZDoKKyAgICAg ICAgICAgIG1hY05vdGlmaWNhdGlvbiA9IE5TQWNjZXNzaWJpbGl0eVNlbGVjdGVkVGV4dENoYW5n ZWROb3RpZmljYXRpb247CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgY2FzZSBBWFZhbHVl Q2hhbmdlZDoKKyAgICAgICAgICAgIG1hY05vdGlmaWNhdGlvbiA9IE5TQWNjZXNzaWJpbGl0eVZh bHVlQ2hhbmdlZE5vdGlmaWNhdGlvbjsKKyAgICAgICAgICAgIGJyZWFrOworICAgIH0KKyAgICAK KyAgICBOU0FjY2Vzc2liaWxpdHlQb3N0Tm90aWZpY2F0aW9uKG9iai0+d3JhcHBlcigpLCBtYWNO b3RpZmljYXRpb24pOwogfQogCiB2b2lkIEFYT2JqZWN0Q2FjaGU6OmhhbmRsZUZvY3VzZWRVSUVs ZW1lbnRDaGFuZ2VkKFJlbmRlck9iamVjdCosIFJlbmRlck9iamVjdCopCkluZGV4OiBXZWJDb3Jl L2FjY2Vzc2liaWxpdHkvd2luL0FYT2JqZWN0Q2FjaGVXaW4uY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YkNvcmUvYWNjZXNzaWJpbGl0eS93aW4vQVhPYmplY3RDYWNoZVdpbi5jcHAJKHJldmlzaW9uIDQ4 MDQ5KQorKysgV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L3dpbi9BWE9iamVjdENhY2hlV2luLmNwcAko d29ya2luZyBjb3B5KQpAQCAtNTEsNyArNTEsNyBAQCB2b2lkIEFYT2JqZWN0Q2FjaGU6OmF0dGFj aFdyYXBwZXIoQWNjZXNzCiAgICAgLy8gc29mdHdhcmUgcmVxdWVzdHMgdGhlbSB2aWEgZ2V0X2Fj Y0NoaWxkLgogfQogCi12b2lkIEFYT2JqZWN0Q2FjaGU6OnBvc3RQbGF0Zm9ybU5vdGlmaWNhdGlv bihBY2Nlc3NpYmlsaXR5T2JqZWN0KiwgY29uc3QgU3RyaW5nJikKK3ZvaWQgQVhPYmplY3RDYWNo ZTo6cG9zdFBsYXRmb3JtTm90aWZpY2F0aW9uKEFjY2Vzc2liaWxpdHlPYmplY3QqLCBBWE5vdGlm aWNhdGlvbikKIHsKIH0KIApJbmRleDogV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAkocmV2aXNpb24gNDgwNDkpCisrKyBXZWJD b3JlL2RvbS9Eb2N1bWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE3MDMsNyArMTcwMyw3IEBA IHZvaWQgRG9jdW1lbnQ6OmltcGxpY2l0Q2xvc2UoKQogICAgICAgICAvLyBleGlzdHMgaW4gdGhl IGNhY2hlICh3ZSBpZ25vcmUgdGhlIHJldHVybiB2YWx1ZSBiZWNhdXNlIHdlIGRvbid0IG5lZWQg aXQgaGVyZSkuIFRoaXMgaXMgCiAgICAgICAgIC8vIG9ubHkgc2FmZSB0byBjYWxsIHdoZW4gYSBs YXlvdXQgaXMgbm90IGluIHByb2dyZXNzLCBzbyBpdCBjYW4gbm90IGJlIHVzZWQgaW4gcG9zdE5v dGlmaWNhdGlvbi4gICAgCiAgICAgICAgIGF4T2JqZWN0Q2FjaGUoKS0+Z2V0T3JDcmVhdGUocmVu ZGVyT2JqZWN0KTsKLSAgICAgICAgYXhPYmplY3RDYWNoZSgpLT5wb3N0Tm90aWZpY2F0aW9uKHJl bmRlck9iamVjdCwgIkFYTG9hZENvbXBsZXRlIiwgdHJ1ZSk7CisgICAgICAgIGF4T2JqZWN0Q2Fj aGUoKS0+cG9zdE5vdGlmaWNhdGlvbihyZW5kZXJPYmplY3QsIEFYT2JqZWN0Q2FjaGU6OkFYTG9h ZENvbXBsZXRlLCB0cnVlKTsKICAgICB9CiAjZW5kaWYKIApJbmRleDogV2ViQ29yZS9kb20vRWxl bWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9kb20vRWxlbWVudC5jcHAJKHJldmlzaW9u IDQ4MDQ5KQorKysgV2ViQ29yZS9kb20vRWxlbWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTYw MiwxNiArNjAyLDE3IEBAIHZvaWQgRWxlbWVudDo6YXR0cmlidXRlQ2hhbmdlZChBdHRyaWJ1dGUK IAogdm9pZCBFbGVtZW50Ojp1cGRhdGVBZnRlckF0dHJpYnV0ZUNoYW5nZWQoQXR0cmlidXRlKiBh dHRyKQogewotICAgIGlmICghZG9jdW1lbnQoKS0+YXhPYmplY3RDYWNoZSgpLT5hY2Nlc3NpYmls aXR5RW5hYmxlZCgpKQorICAgIEFYT2JqZWN0Q2FjaGUqIGF4T2JqZWN0Q2FjaGUgPSBkb2N1bWVu dCgpLT5heE9iamVjdENhY2hlKCk7CisgICAgaWYgKCFheE9iamVjdENhY2hlLT5hY2Nlc3NpYmls aXR5RW5hYmxlZCgpKQogICAgICAgICByZXR1cm47CiAKICAgICBjb25zdCBRdWFsaWZpZWROYW1l JiBhdHRyTmFtZSA9IGF0dHItPm5hbWUoKTsKICAgICBpZiAoYXR0ck5hbWUgPT0gYXJpYV9hY3Rp dmVkZXNjZW5kYW50QXR0cikgewogICAgICAgICAvLyBhbnkgY2hhbmdlIHRvIGFyaWEtYWN0aXZl ZGVzY2VuZGFudCBhdHRyaWJ1dGUgdHJpZ2dlcnMgYWNjZXNzaWJpbGl0eSBmb2N1cyBjaGFuZ2Us IGJ1dCBkb2N1bWVudCBmb2N1cyByZW1haW5zIGludGFjdAotICAgICAgICBkb2N1bWVudCgpLT5h eE9iamVjdENhY2hlKCktPmhhbmRsZUFjdGl2ZURlc2NlbmRhbnRDaGFuZ2VkKHJlbmRlcmVyKCkp OworICAgICAgICBheE9iamVjdENhY2hlLT5oYW5kbGVBY3RpdmVEZXNjZW5kYW50Q2hhbmdlZChy ZW5kZXJlcigpKTsKICAgICB9IGVsc2UgaWYgKGF0dHJOYW1lID09IHJvbGVBdHRyKSB7CiAgICAg ICAgIC8vIHRoZSByb2xlIGF0dHJpYnV0ZSBjYW4gY2hhbmdlIGF0IGFueSB0aW1lLCBhbmQgdGhl IEFjY2Vzc2liaWxpdHlPYmplY3QgbXVzdCBwaWNrIHVwIHRoZXNlIGNoYW5nZXMKLSAgICAgICAg ZG9jdW1lbnQoKS0+YXhPYmplY3RDYWNoZSgpLT5oYW5kbGVBcmlhUm9sZUNoYW5nZWQocmVuZGVy ZXIoKSk7CisgICAgICAgIGF4T2JqZWN0Q2FjaGUtPmhhbmRsZUFyaWFSb2xlQ2hhbmdlZChyZW5k ZXJlcigpKTsKICAgICB9CiB9CiAgICAgCkluZGV4OiBXZWJDb3JlL2VkaXRpbmcvRWRpdG9yLmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2VkaXRpbmcvRWRpdG9yLmNwcAkocmV2aXNpb24gNDgw NDkpCisrKyBXZWJDb3JlL2VkaXRpbmcvRWRpdG9yLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzkz LDcgKzM5Myw3IEBAIHZvaWQgRWRpdG9yOjpyZXNwb25kVG9DaGFuZ2VkQ29udGVudHMoY28KICAg ICBpZiAoQVhPYmplY3RDYWNoZTo6YWNjZXNzaWJpbGl0eUVuYWJsZWQoKSkgewogICAgICAgICBO b2RlKiBub2RlID0gZW5kaW5nU2VsZWN0aW9uLnN0YXJ0KCkubm9kZSgpOwogICAgICAgICBpZiAo bm9kZSkKLSAgICAgICAgICAgIG1fZnJhbWUtPmRvY3VtZW50KCktPmF4T2JqZWN0Q2FjaGUoKS0+ cG9zdE5vdGlmaWNhdGlvbihub2RlLT5yZW5kZXJlcigpLCAiQVhWYWx1ZUNoYW5nZWQiLCBmYWxz ZSk7CisgICAgICAgICAgICBtX2ZyYW1lLT5kb2N1bWVudCgpLT5heE9iamVjdENhY2hlKCktPnBv c3ROb3RpZmljYXRpb24obm9kZS0+cmVuZGVyZXIoKSwgQVhPYmplY3RDYWNoZTo6QVhWYWx1ZUNo YW5nZWQsIGZhbHNlKTsKICAgICB9CiAgICAgCiAgICAgaWYgKGNsaWVudCgpKQpJbmRleDogV2Vi Q29yZS9lZGl0aW5nL21hYy9TZWxlY3Rpb25Db250cm9sbGVyTWFjLm1tCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYkNvcmUvZWRpdGluZy9tYWMvU2VsZWN0aW9uQ29udHJvbGxlck1hYy5tbQkocmV2aXNpb24g NDgwNDkpCisrKyBXZWJDb3JlL2VkaXRpbmcvbWFjL1NlbGVjdGlvbkNvbnRyb2xsZXJNYWMubW0J KHdvcmtpbmcgY29weSkKQEAgLTM4LDcgKzM4LDcgQEAgdm9pZCBTZWxlY3Rpb25Db250cm9sbGVy Ojpub3RpZnlBY2Nlc3NpYgogICAgIERvY3VtZW50KiBkb2N1bWVudCA9IG1fZnJhbWUtPmRvY3Vt ZW50KCk7CiAKICAgICBpZiAoQVhPYmplY3RDYWNoZTo6YWNjZXNzaWJpbGl0eUVuYWJsZWQoKSAm JiBtX3NlbC5zdGFydCgpLmlzTm90TnVsbCgpICYmIG1fc2VsLmVuZCgpLmlzTm90TnVsbCgpKQot ICAgICAgICBkb2N1bWVudC0+YXhPYmplY3RDYWNoZSgpLT5wb3N0Tm90aWZpY2F0aW9uKG1fc2Vs LnN0YXJ0KCkubm9kZSgpLT5yZW5kZXJlcigpLCAiQVhTZWxlY3RlZFRleHRDaGFuZ2VkIiwgZmFs c2UpOworICAgICAgICBkb2N1bWVudC0+YXhPYmplY3RDYWNoZSgpLT5wb3N0Tm90aWZpY2F0aW9u KG1fc2VsLnN0YXJ0KCkubm9kZSgpLT5yZW5kZXJlcigpLCBBWE9iamVjdENhY2hlOjpBWFNlbGVj dGVkVGV4dENoYW5nZWQsIGZhbHNlKTsKIAogICAgIC8vIGlmIHpvb20gZmVhdHVyZSBpcyBlbmFi bGVkLCBpbnNlcnRpb24gcG9pbnQgY2hhbmdlcyBzaG91bGQgdXBkYXRlIHRoZSB6b29tCiAgICAg aWYgKCFVQVpvb21FbmFibGVkKCkgfHwgIW1fc2VsLmlzQ2FyZXQoKSkKSW5kZXg6IFdlYkNvcmUv aHRtbC9IVE1MSW5wdXRFbGVtZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2h0bWwvSFRN TElucHV0RWxlbWVudC5jcHAJKHJldmlzaW9uIDQ4MDQ5KQorKysgV2ViQ29yZS9odG1sL0hUTUxJ bnB1dEVsZW1lbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC05OTksNyArOTk5LDcgQEAgdm9pZCBI VE1MSW5wdXRFbGVtZW50OjpzZXRDaGVja2VkKGJvb2wgbgogICAgIC8vIFJlbmRlclRleHRWaWV3 KSwgYnV0IGl0J3Mgbm90IHBvc3NpYmxlIHRvIGRvIGl0IGF0IHRoZSBtb21lbnQKICAgICAvLyBi ZWNhdXNlIG9mIHRoZSB3YXkgdGhlIGNvZGUgaXMgc3RydWN0dXJlZC4KICAgICBpZiAocmVuZGVy ZXIoKSAmJiBBWE9iamVjdENhY2hlOjphY2Nlc3NpYmlsaXR5RW5hYmxlZCgpKQotICAgICAgICBy ZW5kZXJlcigpLT5kb2N1bWVudCgpLT5heE9iamVjdENhY2hlKCktPnBvc3ROb3RpZmljYXRpb24o cmVuZGVyZXIoKSwgIkFYQ2hlY2tlZFN0YXRlQ2hhbmdlZCIsIHRydWUpOworICAgICAgICByZW5k ZXJlcigpLT5kb2N1bWVudCgpLT5heE9iamVjdENhY2hlKCktPnBvc3ROb3RpZmljYXRpb24ocmVu ZGVyZXIoKSwgQVhPYmplY3RDYWNoZTo6QVhDaGVja2VkU3RhdGVDaGFuZ2VkLCB0cnVlKTsKIAog ICAgIC8vIE9ubHkgc2VuZCBhIGNoYW5nZSBldmVudCBmb3IgaXRlbXMgaW4gdGhlIGRvY3VtZW50 IChhdm9pZCBmaXJpbmcgZHVyaW5nCiAgICAgLy8gcGFyc2luZykgYW5kIGRvbid0IHNlbmQgYSBj aGFuZ2UgZXZlbnQgZm9yIGEgcmFkaW8gYnV0dG9uIHRoYXQncyBnZXR0aW5nCkluZGV4OiBXZWJD b3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BhZ2UvRnJhbWVW aWV3LmNwcAkocmV2aXNpb24gNDgwNDkpCisrKyBXZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAko d29ya2luZyBjb3B5KQpAQCAtNjc4LDcgKzY3OCw3IEBAIHZvaWQgRnJhbWVWaWV3OjpsYXlvdXQo Ym9vbCBhbGxvd1N1YnRyZWUKIAogI2lmIFBMQVRGT1JNKE1BQykKICAgICBpZiAoQVhPYmplY3RD YWNoZTo6YWNjZXNzaWJpbGl0eUVuYWJsZWQoKSkKLSAgICAgICAgcm9vdC0+ZG9jdW1lbnQoKS0+ YXhPYmplY3RDYWNoZSgpLT5wb3N0Tm90aWZpY2F0aW9uKHJvb3QsICJBWExheW91dENvbXBsZXRl IiwgdHJ1ZSk7CisgICAgICAgIHJvb3QtPmRvY3VtZW50KCktPmF4T2JqZWN0Q2FjaGUoKS0+cG9z dE5vdGlmaWNhdGlvbihyb290LCBBWE9iamVjdENhY2hlOjpBWExheW91dENvbXBsZXRlLCB0cnVl KTsKICNlbmRpZgogI2lmIEVOQUJMRShEQVNIQk9BUkRfU1VQUE9SVCkKICAgICB1cGRhdGVEYXNo Ym9hcmRSZWdpb25zKCk7CkluZGV4OiBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0Q29udHJv bC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dENvbnRyb2wu Y3BwCShyZXZpc2lvbiA0ODA0OSkKKysrIFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHRDb250 cm9sLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTgyLDcgKzE4Miw3IEBAIHZvaWQgUmVuZGVyVGV4 dENvbnRyb2w6OnNldElubmVyVGV4dFZhbHUKICAgICAgICAgICAgICAgICBmcmFtZS0+ZWRpdG9y KCktPmNsZWFyVW5kb1JlZG9PcGVyYXRpb25zKCk7CiAgICAgICAgICAgICAgICAgCiAgICAgICAg ICAgICAgICAgaWYgKEFYT2JqZWN0Q2FjaGU6OmFjY2Vzc2liaWxpdHlFbmFibGVkKCkpCi0gICAg ICAgICAgICAgICAgICAgIGRvY3VtZW50KCktPmF4T2JqZWN0Q2FjaGUoKS0+cG9zdE5vdGlmaWNh dGlvbih0aGlzLCAiQVhWYWx1ZUNoYW5nZWQiLCBmYWxzZSk7CisgICAgICAgICAgICAgICAgICAg IGRvY3VtZW50KCktPmF4T2JqZWN0Q2FjaGUoKS0+cG9zdE5vdGlmaWNhdGlvbih0aGlzLCBBWE9i amVjdENhY2hlOjpBWFZhbHVlQ2hhbmdlZCwgZmFsc2UpOwogICAgICAgICAgICAgfQogICAgICAg ICB9CiAK