234663 2021-12-24 07:41:58 -0800 [GTK][a11y] Stop setting manages-descendants on web process root object with ATSPI 2021-12-26 23:37:24 -0800 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 230253 1 cgarcia webkit-unassigned aboxhall andresg_22 aperez apinheiro bugs-noreply cfleizach dmazzoni ews-watchlist jcraig jdiggs samuel_white oldest_to_newest 1826714 0 cgarcia 2021-12-24 07:41:58 -0800 Emit parent-changed and children-changed signals instead, like all other objects, to properly update the ATSPI cache. 1826715 1 447937 cgarcia 2021-12-24 07:48:24 -0800 Created attachment 447937 Patch 1826943 2 cgarcia 2021-12-26 23:37:24 -0800 Committed r287456 (?): <https://commits.webkit.org/r287456> 447937 2021-12-24 07:48:24 -0800 2021-12-26 14:54:29 -0800 Patch wcore-atspi-root-descendants.diff text/plain 13776 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAwNWMwMzBlOTNiNGQuLjIzOWIzNmRkYzYwZCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAt MSwzICsxLDMwIEBACisyMDIxLTEyLTI0ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFA aWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXVthMTF5XSBTdG9wIHNldHRpbmcgbWFuYWdlcy1k ZXNjZW5kYW50cyBvbiB3ZWIgcHJvY2VzcyByb290IG9iamVjdCB3aXRoIEFUU1BJCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzQ2NjMKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBFbWl0IHBhcmVudC1jaGFu Z2VkIGFuZCBjaGlsZHJlbi1jaGFuZ2VkIHNpZ25hbHMgaW5zdGVhZCwgbGlrZSBhbGwgb3RoZXIg b2JqZWN0cywgdG8gcHJvcGVybHkgdXBkYXRlIHRoZSBBVFNQSQorICAgICAgICBjYWNoZS4KKwor ICAgICAgICAqIGFjY2Vzc2liaWxpdHkvYXRzcGkvQWNjZXNzaWJpbGl0eUF0c3BpLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlBdHNwaTo6cGFyZW50Q2hhbmdlZCk6IEVtaXQg dGhlIHNpZ25hbCBmb3IgdGhlIHJvb3Qgb2JqZWN0LgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNz aWJpbGl0eUF0c3BpOjpjaGlsZHJlbkNoYW5nZWQpOiBEaXR0by4KKyAgICAgICAgKiBhY2Nlc3Np YmlsaXR5L2F0c3BpL0FjY2Vzc2liaWxpdHlBdHNwaS5oOgorICAgICAgICAqIGFjY2Vzc2liaWxp dHkvYXRzcGkvQWNjZXNzaWJpbGl0eU9iamVjdEF0c3BpLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkFjY2Vzc2liaWxpdHlPYmplY3RBdHNwaTo6Y2FjaGVEZXN0cm95ZWQpOiBOb3RpZnkgdGhlIHJv b3Qgb2JqZWN0IHRvby4KKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlPYmplY3RBdHNw aTo6ZWxlbWVudERlc3Ryb3llZCk6IERpdHRvLgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJp bGl0eU9iamVjdEF0c3BpOjpzZXRQYXJlbnQpOiBEaXR0by4KKyAgICAgICAgKFdlYkNvcmU6OkFj Y2Vzc2liaWxpdHlPYmplY3RBdHNwaTo6c2VyaWFsaXplIGNvbnN0KTogVXNlIEFjY2Vzc2liaWxp dHlSb290QXRzcGk6OmFwcGxpY2F0aW9uUmVmZXJlbmNlKCkuCisgICAgICAgICogYWNjZXNzaWJp bGl0eS9hdHNwaS9BY2Nlc3NpYmlsaXR5Um9vdEF0c3BpLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkFjY2Vzc2liaWxpdHlSb290QXRzcGk6OmVtYmVkZGVkKTogQ2FsbCBBY2Nlc3NpYmlsaXR5QXRz cGk6OnBhcmVudENoYW5nZWQoKS4KKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlSb290 QXRzcGk6OnBhcmVudFJlZmVyZW5jZSBjb25zdCk6IEFkZGVkLgorICAgICAgICAoV2ViQ29yZTo6 QWNjZXNzaWJpbGl0eVJvb3RBdHNwaTo6Y2hpbGRBZGRlZCk6IENhbGwgQWNjZXNzaWJpbGl0eUF0 c3BpOjpjaGlsZHJlbkNoYW5nZWQoKS4KKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlS b290QXRzcGk6OmNoaWxkUmVtb3ZlZCk6IERpdHRvLgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNz aWJpbGl0eVJvb3RBdHNwaTo6c2VyaWFsaXplIGNvbnN0KTogRG8gbm90IHNldCBtYW5hZ2VzLWRl c2NlbmRhbnRzIHN0YXRlLgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvYXRzcGkvQWNjZXNzaWJp bGl0eVJvb3RBdHNwaS5oOgorCiAyMDIxLTEyLTIzICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNn YXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLXVthMTF5XSBFeHBvc2UgbGl2ZSByZWdp b24gYXR0cmlidXRlcyB3aXRoIEFUU1BJCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nl c3NpYmlsaXR5L2F0c3BpL0FjY2Vzc2liaWxpdHlBdHNwaS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9h Y2Nlc3NpYmlsaXR5L2F0c3BpL0FjY2Vzc2liaWxpdHlBdHNwaS5jcHAKaW5kZXggN2JmNmQ5ZTY1 MWQ3Li5hZjM0YWU1MzA3N2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxp dHkvYXRzcGkvQWNjZXNzaWJpbGl0eUF0c3BpLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nl c3NpYmlsaXR5L2F0c3BpL0FjY2Vzc2liaWxpdHlBdHNwaS5jcHAKQEAgLTM0Miw2ICszNDIsMTYg QEAgdm9pZCBBY2Nlc3NpYmlsaXR5QXRzcGk6OnBhcmVudENoYW5nZWQoQWNjZXNzaWJpbGl0eU9i amVjdEF0c3BpJiBhdHNwaU9iamVjdCkKICAgICB9KTsKIH0KIAordm9pZCBBY2Nlc3NpYmlsaXR5 QXRzcGk6OnBhcmVudENoYW5nZWQoQWNjZXNzaWJpbGl0eVJvb3RBdHNwaSYgcm9vdE9iamVjdCkK K3sKKyAgICBSRUxFQVNFX0FTU0VSVCghaXNNYWluVGhyZWFkKCkpOworICAgIGlmICghbV9jb25u ZWN0aW9uKQorICAgICAgICByZXR1cm47CisKKyAgICBnX2RidXNfY29ubmVjdGlvbl9lbWl0X3Np Z25hbChtX2Nvbm5lY3Rpb24uZ2V0KCksIG51bGxwdHIsIHJvb3RPYmplY3QucGF0aCgpLnV0Zjgo KS5kYXRhKCksICJvcmcuYTExeS5hdHNwaS5FdmVudC5PYmplY3QiLCAiUHJvcGVydHlDaGFuZ2Ui LAorICAgICAgICBnX3ZhcmlhbnRfbmV3KCIoc2lpdmF7c3Z9KSIsICJhY2Nlc3NpYmxlLXBhcmVu dCIsIDAsIDAsIHJvb3RPYmplY3QucGFyZW50UmVmZXJlbmNlKCksIG51bGxwdHIpLCBudWxscHRy KTsKK30KKwogdm9pZCBBY2Nlc3NpYmlsaXR5QXRzcGk6OmNoaWxkcmVuQ2hhbmdlZChBY2Nlc3Np YmlsaXR5T2JqZWN0QXRzcGkmIGF0c3BpT2JqZWN0LCBBY2Nlc3NpYmlsaXR5T2JqZWN0QXRzcGkm IGNoaWxkLCBDaGlsZHJlbkNoYW5nZWQgY2hhbmdlKQogewogICAgIFJFTEVBU0VfQVNTRVJUKGlz TWFpblRocmVhZCgpKTsKQEAgLTM2NCw2ICszNzQsMjAgQEAgdm9pZCBBY2Nlc3NpYmlsaXR5QXRz cGk6OmNoaWxkcmVuQ2hhbmdlZChBY2Nlc3NpYmlsaXR5T2JqZWN0QXRzcGkmIGF0c3BpT2JqZWN0 LAogICAgIH0pOwogfQogCit2b2lkIEFjY2Vzc2liaWxpdHlBdHNwaTo6Y2hpbGRyZW5DaGFuZ2Vk KEFjY2Vzc2liaWxpdHlSb290QXRzcGkmIHJvb3RPYmplY3QsIEFjY2Vzc2liaWxpdHlPYmplY3RB dHNwaSYgY2hpbGQsIENoaWxkcmVuQ2hhbmdlZCBjaGFuZ2UpCit7CisgICAgUkVMRUFTRV9BU1NF UlQoaXNNYWluVGhyZWFkKCkpOworCisgICAgbV9xdWV1ZS0+ZGlzcGF0Y2goW3RoaXMsIHJvb3RP YmplY3QgPSBSZWYgeyByb290T2JqZWN0IH0sIGNoaWxkID0gUmVmIHsgY2hpbGQgfSwgY2hhbmdl XSB7CisgICAgICAgIGlmICghbV9jb25uZWN0aW9uKQorICAgICAgICAgICAgcmV0dXJuOworCisg ICAgICAgIGdfZGJ1c19jb25uZWN0aW9uX2VtaXRfc2lnbmFsKG1fY29ubmVjdGlvbi5nZXQoKSwg bnVsbHB0ciwgcm9vdE9iamVjdC0+cGF0aCgpLnV0ZjgoKS5kYXRhKCksICJvcmcuYTExeS5hdHNw aS5FdmVudC5PYmplY3QiLCAiQ2hpbGRyZW5DaGFuZ2VkIiwKKyAgICAgICAgICAgIGdfdmFyaWFu dF9uZXcoIihzaWl2KHNvKSkiLCBjaGFuZ2UgPT0gQ2hpbGRyZW5DaGFuZ2VkOjpBZGRlZCA/ICJh ZGQiIDogInJlbW92ZSIsIDAsCisgICAgICAgICAgICAwLCBnX3ZhcmlhbnRfbmV3KCIoc28pIiwg dW5pcXVlTmFtZSgpLCBjaGlsZC0+cGF0aCgpLnV0ZjgoKS5kYXRhKCkpLCB1bmlxdWVOYW1lKCks IHJvb3RPYmplY3QtPnBhdGgoKS51dGY4KCkuZGF0YSgpKSwgbnVsbHB0cik7CisgICAgfSk7Cit9 CisKIHZvaWQgQWNjZXNzaWJpbGl0eUF0c3BpOjpzdGF0ZUNoYW5nZWQoQWNjZXNzaWJpbGl0eU9i amVjdEF0c3BpJiBhdHNwaU9iamVjdCwgY29uc3QgY2hhciogbmFtZSwgYm9vbCB2YWx1ZSkKIHsK ICAgICBSRUxFQVNFX0FTU0VSVChpc01haW5UaHJlYWQoKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2F0c3BpL0FjY2Vzc2liaWxpdHlBdHNwaS5oIGIvU291cmNl L1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9hdHNwaS9BY2Nlc3NpYmlsaXR5QXRzcGkuaAppbmRleCA2 OTE2Y2QyOTRiY2MuLjc1NGYzMGNkMmQ2OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNj ZXNzaWJpbGl0eS9hdHNwaS9BY2Nlc3NpYmlsaXR5QXRzcGkuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9hY2Nlc3NpYmlsaXR5L2F0c3BpL0FjY2Vzc2liaWxpdHlBdHNwaS5oCkBAIC01OCw4ICs1OCwx MCBAQCBwdWJsaWM6CiAgICAgU3RyaW5nIHJlZ2lzdGVySHlwZXJsaW5rKEFjY2Vzc2liaWxpdHlP YmplY3RBdHNwaSYsIFZlY3RvcjxzdGQ6OnBhaXI8R0RCdXNJbnRlcmZhY2VJbmZvKiwgR0RCdXNJ bnRlcmZhY2VWVGFibGUqPj4mJik7CiAKICAgICB2b2lkIHBhcmVudENoYW5nZWQoQWNjZXNzaWJp bGl0eU9iamVjdEF0c3BpJik7CisgICAgdm9pZCBwYXJlbnRDaGFuZ2VkKEFjY2Vzc2liaWxpdHlS b290QXRzcGkmKTsKICAgICBlbnVtIGNsYXNzIENoaWxkcmVuQ2hhbmdlZCB7IEFkZGVkLCBSZW1v dmVkIH07CiAgICAgdm9pZCBjaGlsZHJlbkNoYW5nZWQoQWNjZXNzaWJpbGl0eU9iamVjdEF0c3Bp JiwgQWNjZXNzaWJpbGl0eU9iamVjdEF0c3BpJiwgQ2hpbGRyZW5DaGFuZ2VkKTsKKyAgICB2b2lk IGNoaWxkcmVuQ2hhbmdlZChBY2Nlc3NpYmlsaXR5Um9vdEF0c3BpJiwgQWNjZXNzaWJpbGl0eU9i amVjdEF0c3BpJiwgQ2hpbGRyZW5DaGFuZ2VkKTsKIAogICAgIHZvaWQgc3RhdGVDaGFuZ2VkKEFj Y2Vzc2liaWxpdHlPYmplY3RBdHNwaSYsIGNvbnN0IGNoYXIqLCBib29sKTsKIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9hdHNwaS9BY2Nlc3NpYmlsaXR5T2JqZWN0 QXRzcGkuY3BwIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9hdHNwaS9BY2Nlc3NpYmls aXR5T2JqZWN0QXRzcGkuY3BwCmluZGV4IGEzMzNhNGJhYTk3MC4uNGNkZjgwMzgyZDQ5IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2F0c3BpL0FjY2Vzc2liaWxpdHlP YmplY3RBdHNwaS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9hdHNwaS9B Y2Nlc3NpYmlsaXR5T2JqZWN0QXRzcGkuY3BwCkBAIC0xMzYsNiArMTM2LDcgQEAgdm9pZCBBY2Nl c3NpYmlsaXR5T2JqZWN0QXRzcGk6OmNhY2hlRGVzdHJveWVkKCkKICAgICBpZiAoIW1faXNSZWdp c3RlcmVkLmxvYWQoKSkKICAgICAgICAgcmV0dXJuOwogCisgICAgbV9yb290LmNoaWxkUmVtb3Zl ZCgqdGhpcyk7CiAgICAgbV9yb290LmF0c3BpKCkudW5yZWdpc3Rlck9iamVjdCgqdGhpcyk7CiB9 CiAKQEAgLTE0Niw4ICsxNDcsMTIgQEAgdm9pZCBBY2Nlc3NpYmlsaXR5T2JqZWN0QXRzcGk6OmVs ZW1lbnREZXN0cm95ZWQoKQogICAgIGlmICghbV9pc1JlZ2lzdGVyZWQubG9hZCgpKQogICAgICAg ICByZXR1cm47CiAKLSAgICBpZiAobV9wYXJlbnQgJiYgKm1fcGFyZW50KQotICAgICAgICBtX3Bh cmVudC52YWx1ZSgpLT5jaGlsZFJlbW92ZWQoKnRoaXMpOworICAgIGlmIChtX3BhcmVudCkgewor ICAgICAgICBpZiAoKm1fcGFyZW50KQorICAgICAgICAgICAgbV9wYXJlbnQudmFsdWUoKS0+Y2hp bGRSZW1vdmVkKCp0aGlzKTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgbV9yb290LmNoaWxk UmVtb3ZlZCgqdGhpcyk7CisgICAgfQogCiAgICAgbV9yb290LmF0c3BpKCkudW5yZWdpc3Rlck9i amVjdCgqdGhpcyk7CiB9CkBAIC01NTgsOCArNTYzLDEyIEBAIHZvaWQgQWNjZXNzaWJpbGl0eU9i amVjdEF0c3BpOjpzZXRQYXJlbnQoc3RkOjpvcHRpb25hbDxBY2Nlc3NpYmlsaXR5T2JqZWN0QXRz cGkqCiAgICAgICAgIHJldHVybjsKIAogICAgIG1fcm9vdC5hdHNwaSgpLnBhcmVudENoYW5nZWQo KnRoaXMpOwotICAgIGlmIChtX3BhcmVudCAmJiAqbV9wYXJlbnQpCi0gICAgICAgIG1fcGFyZW50 LnZhbHVlKCktPmNoaWxkQWRkZWQoKnRoaXMpOworICAgIGlmIChtX3BhcmVudCkgeworICAgICAg ICBpZiAoKm1fcGFyZW50KQorICAgICAgICAgICAgbV9wYXJlbnQudmFsdWUoKS0+Y2hpbGRBZGRl ZCgqdGhpcyk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIG1fcm9vdC5jaGlsZEFkZGVkKCp0 aGlzKTsKKyAgICB9CiB9CiAKIHN0ZDo6b3B0aW9uYWw8QWNjZXNzaWJpbGl0eU9iamVjdEF0c3Bp Kj4gQWNjZXNzaWJpbGl0eU9iamVjdEF0c3BpOjpwYXJlbnQoKSBjb25zdApAQCAtMTIwNyw3ICsx MjE2LDcgQEAgdm9pZCBBY2Nlc3NpYmlsaXR5T2JqZWN0QXRzcGk6OnNlcmlhbGl6ZShHVmFyaWFu dEJ1aWxkZXIqIGJ1aWxkZXIpIGNvbnN0CiB7CiAgICAgUkVMRUFTRV9BU1NFUlQoIWlzTWFpblRo cmVhZCgpKTsKICAgICBnX3ZhcmlhbnRfYnVpbGRlcl9hZGQoYnVpbGRlciwgIihzbykiLCBtX3Jv b3QuYXRzcGkoKS51bmlxdWVOYW1lKCksIG1fcGF0aC51dGY4KCkuZGF0YSgpKTsKLSAgICBnX3Zh cmlhbnRfYnVpbGRlcl9hZGQoYnVpbGRlciwgIihzbykiLCBtX3Jvb3QucGFyZW50VW5pcXVlTmFt ZSgpLnV0ZjgoKS5kYXRhKCksICIvb3JnL2ExMXkvYXRzcGkvYWNjZXNzaWJsZS9yb290Iik7Cisg ICAgZ192YXJpYW50X2J1aWxkZXJfYWRkKGJ1aWxkZXIsICJAKHNvKSIsIG1fcm9vdC5hcHBsaWNh dGlvblJlZmVyZW5jZSgpKTsKICAgICBnX3ZhcmlhbnRfYnVpbGRlcl9hZGQoYnVpbGRlciwgIkAo c28pIiwgcGFyZW50UmVmZXJlbmNlKCkpOwogCiAgICAgZ192YXJpYW50X2J1aWxkZXJfYWRkKGJ1 aWxkZXIsICJpIiwgaW5kZXhJblBhcmVudCgpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2FjY2Vzc2liaWxpdHkvYXRzcGkvQWNjZXNzaWJpbGl0eVJvb3RBdHNwaS5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2F0c3BpL0FjY2Vzc2liaWxpdHlSb290QXRzcGkuY3BwCmlu ZGV4IGIzYjYwYWM2NzljNC4uZTE4NjYzNzM2YWMxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9hY2Nlc3NpYmlsaXR5L2F0c3BpL0FjY2Vzc2liaWxpdHlSb290QXRzcGkuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvYXRzcGkvQWNjZXNzaWJpbGl0eVJvb3RBdHNwaS5j cHAKQEAgLTYwLDEwICs2MCw5IEBAIEdEQnVzSW50ZXJmYWNlVlRhYmxlIEFjY2Vzc2liaWxpdHlS b290QXRzcGk6OnNfYWNjZXNzaWJsZUZ1bmN0aW9ucyA9IHsKICAgICAgICAgZWxzZSBpZiAoIWdf c3RyY21wMChtZXRob2ROYW1lLCAiR2V0U3RhdGUiKSkgewogICAgICAgICAgICAgR1ZhcmlhbnRC dWlsZGVyIGJ1aWxkZXIgPSBHX1ZBUklBTlRfQlVJTERFUl9JTklUKEdfVkFSSUFOVF9UWVBFKCIo YXUpIikpOwogCi0gICAgICAgICAgICB1aW50NjRfdCBhdHNwaVN0YXRlcyA9IChHX0dVSU5UNjRf Q09OU1RBTlQoMSkgPDwgQXRzcGk6OlN0YXRlOjpNYW5hZ2VzRGVzY2VuZGFudHMpOwogICAgICAg ICAgICAgZ192YXJpYW50X2J1aWxkZXJfb3BlbigmYnVpbGRlciwgR19WQVJJQU5UX1RZUEUoImF1 IikpOwotICAgICAgICAgICAgZ192YXJpYW50X2J1aWxkZXJfYWRkKCZidWlsZGVyLCAidSIsIHN0 YXRpY19jYXN0PHVpbnQzMl90PihhdHNwaVN0YXRlcyAmIDB4ZmZmZmZmZmYpKTsKLSAgICAgICAg ICAgIGdfdmFyaWFudF9idWlsZGVyX2FkZCgmYnVpbGRlciwgInUiLCBzdGF0aWNfY2FzdDx1aW50 MzJfdD4oYXRzcGlTdGF0ZXMgPj4gMzIpKTsKKyAgICAgICAgICAgIGdfdmFyaWFudF9idWlsZGVy X2FkZCgmYnVpbGRlciwgInUiLCAwKTsKKyAgICAgICAgICAgIGdfdmFyaWFudF9idWlsZGVyX2Fk ZCgmYnVpbGRlciwgInUiLCAwKTsKICAgICAgICAgICAgIGdfdmFyaWFudF9idWlsZGVyX2Nsb3Nl KCZidWlsZGVyKTsKIAogICAgICAgICAgICAgZ19kYnVzX21ldGhvZF9pbnZvY2F0aW9uX3JldHVy bl92YWx1ZShpbnZvY2F0aW9uLCBnX3ZhcmlhbnRfYnVpbGRlcl9lbmQoJmJ1aWxkZXIpKTsKQEAg LTEyOCw3ICsxMjcsNyBAQCBHREJ1c0ludGVyZmFjZVZUYWJsZSBBY2Nlc3NpYmlsaXR5Um9vdEF0 c3BpOjpzX2FjY2Vzc2libGVGdW5jdGlvbnMgPSB7CiAgICAgICAgIGlmICghZ19zdHJjbXAwKHBy b3BlcnR5TmFtZSwgIkFjY2Vzc2libGVJZCIpKQogICAgICAgICAgICAgcmV0dXJuIGdfdmFyaWFu dF9uZXdfc3RyaW5nKCIiKTsKICAgICAgICAgaWYgKCFnX3N0cmNtcDAocHJvcGVydHlOYW1lLCAi UGFyZW50IikpCi0gICAgICAgICAgICByZXR1cm4gZ192YXJpYW50X25ldygiKHNvKSIsIHJvb3RP YmplY3QubV9wYXJlbnRVbmlxdWVOYW1lLnV0ZjgoKS5kYXRhKCksIHJvb3RPYmplY3QubV9wYXJl bnRQYXRoLnV0ZjgoKS5kYXRhKCkpOworICAgICAgICAgICAgcmV0dXJuIHJvb3RPYmplY3QucGFy ZW50UmVmZXJlbmNlKCk7CiAgICAgICAgIGlmICghZ19zdHJjbXAwKHByb3BlcnR5TmFtZSwgIkNo aWxkQ291bnQiKSkgewogICAgICAgICAgICAgYXV0byBjaGlsZENvdW50ID0gQWNjZXNzaWJpbGl0 eTo6cmV0cmlldmVWYWx1ZUZyb21NYWluVGhyZWFkPGludDMyX3Q+KFsmcm9vdE9iamVjdF0oKSAt PiBpbnQzMl90IHsKICAgICAgICAgICAgICAgICByZXR1cm4gcm9vdE9iamVjdC5jaGlsZCgpID8g MSA6IDA7CkBAIC0yMjMsNiArMjIyLDcgQEAgdm9pZCBBY2Nlc3NpYmlsaXR5Um9vdEF0c3BpOjpl bWJlZGRlZChjb25zdCBjaGFyKiBwYXJlbnRVbmlxdWVOYW1lLCBjb25zdCBjaGFyKgogICAgIFJF TEVBU0VfQVNTRVJUKCFpc01haW5UaHJlYWQoKSk7CiAgICAgbV9wYXJlbnRVbmlxdWVOYW1lID0g cGFyZW50VW5pcXVlTmFtZTsKICAgICBtX3BhcmVudFBhdGggPSBwYXJlbnRQYXRoOworICAgIG1f YXRzcGkucGFyZW50Q2hhbmdlZCgqdGhpcyk7CiAgICAgaWYgKCFtX2lzVHJlZVJlZ2lzdGVyZWQu bG9hZCgpICYmIG1fYXRzcGkuaGFzRXZlbnRMaXN0ZW5lcnMoKSkKICAgICAgICAgcmVnaXN0ZXJU cmVlKCk7CiB9CkBAIC0yNDEsNiArMjQxLDEyIEBAIEdWYXJpYW50KiBBY2Nlc3NpYmlsaXR5Um9v dEF0c3BpOjpyZWZlcmVuY2UoKSBjb25zdAogICAgIHJldHVybiBnX3ZhcmlhbnRfbmV3KCIoc28p IiwgbV9hdHNwaS51bmlxdWVOYW1lKCksIG1fcGF0aC51dGY4KCkuZGF0YSgpKTsKIH0KIAorR1Zh cmlhbnQqIEFjY2Vzc2liaWxpdHlSb290QXRzcGk6OnBhcmVudFJlZmVyZW5jZSgpIGNvbnN0Cit7 CisgICAgUkVMRUFTRV9BU1NFUlQoIWlzTWFpblRocmVhZCgpKTsKKyAgICByZXR1cm4gZ192YXJp YW50X25ldygiKHNvKSIsIG1fcGFyZW50VW5pcXVlTmFtZS51dGY4KCkuZGF0YSgpLCBtX3BhcmVu dFBhdGgudXRmOCgpLmRhdGEoKSk7Cit9CisKIEFjY2Vzc2liaWxpdHlPYmplY3RBdHNwaSogQWNj ZXNzaWJpbGl0eVJvb3RBdHNwaTo6Y2hpbGQoKSBjb25zdAogewogICAgIFJFTEVBU0VfQVNTRVJU KGlzTWFpblRocmVhZCgpKTsKQEAgLTI2MCwxMiArMjY2LDIyIEBAIEFjY2Vzc2liaWxpdHlPYmpl Y3RBdHNwaSogQWNjZXNzaWJpbGl0eVJvb3RBdHNwaTo6Y2hpbGQoKSBjb25zdAogICAgIHJldHVy biByb290T2JqZWN0ID8gcm9vdE9iamVjdC0+d3JhcHBlcigpIDogbnVsbHB0cjsKIH0KIAordm9p ZCBBY2Nlc3NpYmlsaXR5Um9vdEF0c3BpOjpjaGlsZEFkZGVkKEFjY2Vzc2liaWxpdHlPYmplY3RB dHNwaSYgY2hpbGQpCit7CisgICAgbV9hdHNwaS5jaGlsZHJlbkNoYW5nZWQoKnRoaXMsIGNoaWxk LCBBY2Nlc3NpYmlsaXR5QXRzcGk6OkNoaWxkcmVuQ2hhbmdlZDo6QWRkZWQpOworfQorCit2b2lk IEFjY2Vzc2liaWxpdHlSb290QXRzcGk6OmNoaWxkUmVtb3ZlZChBY2Nlc3NpYmlsaXR5T2JqZWN0 QXRzcGkmIGNoaWxkKQoreworICAgIG1fYXRzcGkuY2hpbGRyZW5DaGFuZ2VkKCp0aGlzLCBjaGls ZCwgQWNjZXNzaWJpbGl0eUF0c3BpOjpDaGlsZHJlbkNoYW5nZWQ6OlJlbW92ZWQpOworfQorCiB2 b2lkIEFjY2Vzc2liaWxpdHlSb290QXRzcGk6OnNlcmlhbGl6ZShHVmFyaWFudEJ1aWxkZXIqIGJ1 aWxkZXIpIGNvbnN0CiB7CiAgICAgUkVMRUFTRV9BU1NFUlQoIWlzTWFpblRocmVhZCgpKTsKICAg ICBnX3ZhcmlhbnRfYnVpbGRlcl9hZGQoYnVpbGRlciwgIihzbykiLCBtX2F0c3BpLnVuaXF1ZU5h bWUoKSwgbV9wYXRoLnV0ZjgoKS5kYXRhKCkpOwotICAgIGdfdmFyaWFudF9idWlsZGVyX2FkZChi dWlsZGVyLCAiKHNvKSIsIG1fcGFyZW50VW5pcXVlTmFtZS51dGY4KCkuZGF0YSgpLCAiL29yZy9h MTF5L2F0c3BpL2FjY2Vzc2libGUvcm9vdCIpOwotICAgIGdfdmFyaWFudF9idWlsZGVyX2FkZChi dWlsZGVyLCAiKHNvKSIsIG1fcGFyZW50VW5pcXVlTmFtZS51dGY4KCkuZGF0YSgpLCBtX3BhcmVu dFBhdGgudXRmOCgpLmRhdGEoKSk7CisgICAgZ192YXJpYW50X2J1aWxkZXJfYWRkKGJ1aWxkZXIs ICJAKHNvKSIsIGFwcGxpY2F0aW9uUmVmZXJlbmNlKCkpOworICAgIGdfdmFyaWFudF9idWlsZGVy X2FkZChidWlsZGVyLCAiQChzbykiLCBwYXJlbnRSZWZlcmVuY2UoKSk7CiAKICAgICBnX3Zhcmlh bnRfYnVpbGRlcl9hZGQoYnVpbGRlciwgImkiLCAwKTsKICAgICBnX3ZhcmlhbnRfYnVpbGRlcl9h ZGQoYnVpbGRlciwgImkiLCBBY2Nlc3NpYmlsaXR5OjpyZXRyaWV2ZVZhbHVlRnJvbU1haW5UaHJl YWQ8aW50MzJfdD4oW3RoaXNdKCkgLT4gaW50MzJfdCB7CkBAIC0yODQsOSArMzAwLDggQEAgdm9p ZCBBY2Nlc3NpYmlsaXR5Um9vdEF0c3BpOjpzZXJpYWxpemUoR1ZhcmlhbnRCdWlsZGVyKiBidWls ZGVyKSBjb25zdAogICAgIGdfdmFyaWFudF9idWlsZGVyX2FkZChidWlsZGVyLCAicyIsICIiKTsK IAogICAgIEdWYXJpYW50QnVpbGRlciBzdGF0ZXMgPSBHX1ZBUklBTlRfQlVJTERFUl9JTklUKEdf VkFSSUFOVF9UWVBFKCJhdSIpKTsKLSAgICB1aW50NjRfdCBhdHNwaVN0YXRlcyA9IChHX0dVSU5U NjRfQ09OU1RBTlQoMSkgPDwgQXRzcGk6OlN0YXRlOjpNYW5hZ2VzRGVzY2VuZGFudHMpOwotICAg IGdfdmFyaWFudF9idWlsZGVyX2FkZCgmc3RhdGVzLCAidSIsIHN0YXRpY19jYXN0PHVpbnQzMl90 PihhdHNwaVN0YXRlcyAmIDB4ZmZmZmZmZmYpKTsKLSAgICBnX3ZhcmlhbnRfYnVpbGRlcl9hZGQo JnN0YXRlcywgInUiLCBzdGF0aWNfY2FzdDx1aW50MzJfdD4oYXRzcGlTdGF0ZXMgPj4gMzIpKTsK KyAgICBnX3ZhcmlhbnRfYnVpbGRlcl9hZGQoJnN0YXRlcywgInUiLCAwKTsKKyAgICBnX3Zhcmlh bnRfYnVpbGRlcl9hZGQoJnN0YXRlcywgInUiLCAwKTsKICAgICBnX3ZhcmlhbnRfYnVpbGRlcl9h ZGQoYnVpbGRlciwgIkBhdSIsIGdfdmFyaWFudF9idWlsZGVyX2VuZCgmc3RhdGVzKSk7CiB9CiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvYXRzcGkvQWNjZXNzaWJp bGl0eVJvb3RBdHNwaS5oIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9hdHNwaS9BY2Nl c3NpYmlsaXR5Um9vdEF0c3BpLmgKaW5kZXggMTA0ZTM0MzczZmE1Li40ZTBjOTI3YTkwMzMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvYXRzcGkvQWNjZXNzaWJpbGl0 eVJvb3RBdHNwaS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvYXRzcGkvQWNj ZXNzaWJpbGl0eVJvb3RBdHNwaS5oCkBAIC00NiwxMSArNDYsMTMgQEAgcHVibGljOgogICAgIHZv aWQgc2V0UGF0aChTdHJpbmcmJik7CiAKICAgICBjb25zdCBTdHJpbmcmIHBhdGgoKSBjb25zdCB7 IHJldHVybiBtX3BhdGg7IH0KLSAgICBjb25zdCBTdHJpbmcmIHBhcmVudFVuaXF1ZU5hbWUoKSBj b25zdCB7IHJldHVybiBtX3BhcmVudFVuaXF1ZU5hbWU7IH0KICAgICBHVmFyaWFudCogcmVmZXJl bmNlKCkgY29uc3Q7CisgICAgR1ZhcmlhbnQqIHBhcmVudFJlZmVyZW5jZSgpIGNvbnN0OwogICAg IEdWYXJpYW50KiBhcHBsaWNhdGlvblJlZmVyZW5jZSgpIGNvbnN0OwogICAgIEFjY2Vzc2liaWxp dHlBdHNwaSYgYXRzcGkoKSBjb25zdCB7IHJldHVybiBtX2F0c3BpOyB9CiAgICAgQWNjZXNzaWJp bGl0eU9iamVjdEF0c3BpKiBjaGlsZCgpIGNvbnN0OworICAgIHZvaWQgY2hpbGRBZGRlZChBY2Nl c3NpYmlsaXR5T2JqZWN0QXRzcGkmKTsKKyAgICB2b2lkIGNoaWxkUmVtb3ZlZChBY2Nlc3NpYmls aXR5T2JqZWN0QXRzcGkmKTsKIAogICAgIHZvaWQgc2VyaWFsaXplKEdWYXJpYW50QnVpbGRlciop IGNvbnN0OwogCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cK aW5kZXggNzJjZTVjMThlNzFiLi44ZTYyOGQwMjM5Y2MgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5n ZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAyMS0xMi0yNCAg Q2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dU S11bYTExeV0gU3RvcCBzZXR0aW5nIG1hbmFnZXMtZGVzY2VuZGFudHMgb24gd2ViIHByb2Nlc3Mg cm9vdCBvYmplY3Qgd2l0aCBBVFNQSQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjM0NjYzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgVXBkYXRlIHRoZSB1bml0IHRlc3QgdG8gcmVtb3ZlIHRoZSBBVFNQSSBp ZmRlZi4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0R3RrL1Rlc3RXZWJL aXRBY2Nlc3NpYmlsaXR5LmNwcDoKKyAgICAgICAgKHRlc3RBY2Nlc3NpYmxlQmFzaWNIaWVyYXJj aHkpOgorCiAyMDIxLTEyLTIzICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlh LmNvbT4KIAogICAgICAgICBbR1RLXVthMTF5XSBFeHBvc2UgbGl2ZSByZWdpb24gYXR0cmlidXRl cyB3aXRoIEFUU1BJCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktp dEd0ay9UZXN0V2ViS2l0QWNjZXNzaWJpbGl0eS5jcHAgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rl c3RzL1dlYktpdEd0ay9UZXN0V2ViS2l0QWNjZXNzaWJpbGl0eS5jcHAKaW5kZXggOTBlMjFlNWI3 NWYzLi4yNTI3M2ZkODQxMTggMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMv V2ViS2l0R3RrL1Rlc3RXZWJLaXRBY2Nlc3NpYmlsaXR5LmNwcAorKysgYi9Ub29scy9UZXN0V2Vi S2l0QVBJL1Rlc3RzL1dlYktpdEd0ay9UZXN0V2ViS2l0QWNjZXNzaWJpbGl0eS5jcHAKQEAgLTI1 OSwxNSArMjU5LDkgQEAgc3RhdGljIHZvaWQgdGVzdEFjY2Vzc2libGVCYXNpY0hpZXJhcmNoeShB Y2Nlc3NpYmlsaXR5VGVzdCogdGVzdCwgZ2NvbnN0cG9pbnRlcikKICAgICAgICAgIiAgPC9ib2R5 PiIKICAgICAgICAgIjwvaHRtbD4iLAogICAgICAgICBudWxscHRyKTsKLSNpZiBVU0UoQVRTUEkp Ci0gICAgLy8gSW4gYXRzcGkgaW1wbGVtZW50YXRpb24gdGhlIHJvb3Qgb2JqZWN0IGRvZXNuJ3Qg ZW1pdCBjaGlsZHJlbi1jaGFuZ2VkIGJlY2F1c2UgaXQKLSAgICAvLyBhbHdheXMgaGFzIE1hbmFn ZXNEZXNjZW5kYW50cyBpbiBzdGF0ZS4KLSAgICB0ZXN0LT53YWl0VW50aWxMb2FkRmluaXNoZWQo KTsKLSNlbHNlCiAgICAgLy8gQ2hlY2sgdGhhdCBjaGlsZHJlbi1jaGFuZ2VkOjpyZW1vdmUgaXMg ZW1pdHRlZCBvbiB0aGUgcm9vdCBvYmplY3Qgb24gbmF2aWdhdGlvbiwKICAgICAvLyBhbmQgdGhl IGExMXkgaGllcmFyY2h5IGlzIHVwZGF0ZWQuCiAgICAgdGVzdC0+d2FpdFVudGlsQ2hpbGRyZW5S ZW1vdmVkKHJvb3RPYmplY3QuZ2V0KCkpOwotI2VuZGlmCiAKICAgICBkb2N1bWVudFdlYiA9IHRl c3QtPmZpbmREb2N1bWVudFdlYih0ZXN0QXBwLmdldCgpKTsKICAgICBnX2Fzc2VydF90cnVlKEFU U1BJX0lTX0FDQ0VTU0lCTEUoZG9jdW1lbnRXZWIuZ2V0KCkpKTsK