235313 2022-01-18 01:38:58 -0800 [GTK][a11y] Stop registering the tree when clients are connected with ATSPI 2022-01-22 01:31:38 -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 1831638 0 cgarcia 2022-01-18 01:38:58 -0800 That was needed with the isolated tree mode, now we can go back to register objects on demand. 1831639 1 449370 cgarcia 2022-01-18 01:44:19 -0800 Created attachment 449370 Patch 1832990 2 cgarcia 2022-01-22 01:31:38 -0800 Committed r288403 (246294@trunk): <https://commits.webkit.org/246294@trunk> 449370 2022-01-18 01:44:19 -0800 2022-01-18 07:09:14 -0800 Patch wcore-atspi-no-register-tree.diff text/plain 13167 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAzNmEwNTQyNjFmMzAuLmU3NjkyNTUyYTUzMCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAt MSwzICsxLDMxIEBACisyMDIyLTAxLTE4ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFA aWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXVthMTF5XSBTdG9wIHJlZ2lzdGVyaW5nIHRoZSB0 cmVlIHdoZW4gY2xpZW50cyBhcmUgY29ubmVjdGVkIHdpdGggQVRTUEkKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNTMxMworCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoYXQgd2FzIG5lZWRlZCB3aXRoIHRo ZSBpc29sYXRlZCB0cmVlIG1vZGUsIG5vdyB3ZSBjYW4gZ28gYmFjayB0byByZWdpc3RlciBvYmpl Y3RzIG9uIGRlbWFuZC4KKworICAgICAgICAqIGFjY2Vzc2liaWxpdHkvYXRzcGkvQVhPYmplY3RD YWNoZUF0c3BpLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFYT2JqZWN0Q2FjaGU6OnBsYXRmb3Jt UGVyZm9ybURlZmVycmVkQ2FjaGVVcGRhdGUpOgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvYXRz cGkvQWNjZXNzaWJpbGl0eUF0c3BpLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxp dHlBdHNwaTo6YWRkQ2xpZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlBdHNw aTo6cGFyZW50Q2hhbmdlZCk6CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5QXRzcGk6 OmNoaWxkcmVuQ2hhbmdlZCk6CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5QXRzcGk6 OmNhY2hlQ2xlYXJUaW1lckZpcmVkKToKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L2F0c3BpL0Fj Y2Vzc2liaWxpdHlPYmplY3RBdHNwaS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmls aXR5T2JqZWN0QXRzcGk6OmlzVHJlZVJlZ2lzdGVyZWQgY29uc3QpOiBEZWxldGVkLgorICAgICAg ICAqIGFjY2Vzc2liaWxpdHkvYXRzcGkvQWNjZXNzaWJpbGl0eU9iamVjdEF0c3BpLmg6CisgICAg ICAgICogYWNjZXNzaWJpbGl0eS9hdHNwaS9BY2Nlc3NpYmlsaXR5Um9vdEF0c3BpLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlSb290QXRzcGk6OmVtYmVkZGVkKToKKyAgICAg ICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlSb290QXRzcGk6OmNoaWxkIGNvbnN0KToKKyAgICAg ICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlSb290QXRzcGk6OmNoaWxkQWRkZWQpOgorICAgICAg ICAoV2ViQ29yZTo6cmVnaXN0ZXJTdWJ0cmVlKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6 OkFjY2Vzc2liaWxpdHlSb290QXRzcGk6OnJlZ2lzdGVyVHJlZSk6IERlbGV0ZWQuCisgICAgICAg IChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5Um9vdEF0c3BpOjpkaWRVbnJlZ2lzdGVyVHJlZSk6IERl bGV0ZWQuCisgICAgICAgICogYWNjZXNzaWJpbGl0eS9hdHNwaS9BY2Nlc3NpYmlsaXR5Um9vdEF0 c3BpLmg6CisKIDIwMjItMDEtMTcgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2Fs aWEuY29tPgogCiAgICAgICAgIFtHVEtdW2ExMXldIFN0b3AgdXNpbmcgaXNvbGF0ZWQgdHJlZSBm b3IgdGhlIEFUU1BJIGltcGxlbWVudGF0aW9uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9h Y2Nlc3NpYmlsaXR5L2F0c3BpL0FYT2JqZWN0Q2FjaGVBdHNwaS5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9hY2Nlc3NpYmlsaXR5L2F0c3BpL0FYT2JqZWN0Q2FjaGVBdHNwaS5jcHAKaW5kZXggYTc0NDk5 OWYwYmNmLi5jZmYyYTQ0YWYyNzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2li aWxpdHkvYXRzcGkvQVhPYmplY3RDYWNoZUF0c3BpLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9h Y2Nlc3NpYmlsaXR5L2F0c3BpL0FYT2JqZWN0Q2FjaGVBdHNwaS5jcHAKQEAgLTM5LDEyICszOSw2 IEBAIHZvaWQgQVhPYmplY3RDYWNoZTo6YXR0YWNoV3JhcHBlcihBWENvcmVPYmplY3QqIGF4T2Jq ZWN0KQogICAgIGF1dG8gd3JhcHBlciA9IEFjY2Vzc2liaWxpdHlPYmplY3RBdHNwaTo6Y3JlYXRl KGF4T2JqZWN0LCBhdHNwaVJvb3QpOwogICAgIGF4T2JqZWN0LT5zZXRXcmFwcGVyKHdyYXBwZXIu cHRyKCkpOwogCi0gICAgLy8gSGFuZGxlIHRoZSByb290IGVhcmxpZXIgaGVyZSwgc2luY2Ugd2Ug a25vdyBpdCBvbmx5IGhhcyBvbmUgY2hpbGQuCi0gICAgaWYgKCFheE9iamVjdC0+cGFyZW50T2Jq ZWN0VW5pZ25vcmVkKCkgJiYgYXhPYmplY3QtPmlzU2Nyb2xsVmlldygpICYmIGF4T2JqZWN0LT5z Y3JvbGxWaWV3KCkgPT0gZG9jdW1lbnQoKS52aWV3KCkgJiYgYXRzcGlSb290KSB7Ci0gICAgICAg IHdyYXBwZXItPnNldFBhcmVudChudWxscHRyKTsgLy8gbnVsbHB0ciBtZWFucyByb290LgotICAg ICAgICByZXR1cm47Ci0gICAgfQotCiAgICAgbV9kZWZlcnJlZFBhcmVudENoYW5nZWRMaXN0LmFk ZChheE9iamVjdCk7CiAgICAgbV9wZXJmb3JtQ2FjaGVVcGRhdGVUaW1lci5zdGFydE9uZVNob3Qo MF9zKTsKIH0KQEAgLTU3LDggKzUxLDExIEBAIHZvaWQgQVhPYmplY3RDYWNoZTo6cGxhdGZvcm1Q ZXJmb3JtRGVmZXJyZWRDYWNoZVVwZGF0ZSgpCiAgICAgICAgICAgICByZXR1cm47CiAKICAgICAg ICAgYXV0byogYXhQYXJlbnQgPSBheE9iamVjdC5wYXJlbnRPYmplY3RVbmlnbm9yZWQoKTsKLSAg ICAgICAgaWYgKCFheFBhcmVudCkKKyAgICAgICAgaWYgKCFheFBhcmVudCkgeworICAgICAgICAg ICAgaWYgKGF4T2JqZWN0LmlzU2Nyb2xsVmlldygpICYmIGF4T2JqZWN0LnNjcm9sbFZpZXcoKSA9 PSBkb2N1bWVudCgpLnZpZXcoKSkKKyAgICAgICAgICAgICAgICB3cmFwcGVyLT5zZXRQYXJlbnQo bnVsbHB0cik7IC8vIG51bGxwdHIgbWVhbnMgcm9vdC4KICAgICAgICAgICAgIHJldHVybjsKKyAg ICAgICAgfQogCiAgICAgICAgIGlmIChhdXRvKiBheFBhcmVudFdyYXBwZXIgPSBheFBhcmVudC0+ d3JhcHBlcigpKQogICAgICAgICAgICAgd3JhcHBlci0+c2V0UGFyZW50KGF4UGFyZW50V3JhcHBl cik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2F0c3BpL0FjY2Vz c2liaWxpdHlBdHNwaS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2F0c3BpL0Fj Y2Vzc2liaWxpdHlBdHNwaS5jcHAKaW5kZXggOWNlY2FkMjFiYTA3Li4xMzk2MWM1NmFkYWEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvYXRzcGkvQWNjZXNzaWJpbGl0 eUF0c3BpLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2F0c3BpL0FjY2Vz c2liaWxpdHlBdHNwaS5jcHAKQEAgLTE4NCwxMCArMTg0LDggQEAgdm9pZCBBY2Nlc3NpYmlsaXR5 QXRzcGk6OnJlbW92ZUV2ZW50TGlzdGVuZXIoY29uc3QgY2hhciogZGJ1c05hbWUsIGNvbnN0IGNo YXIqIGUKIAogdm9pZCBBY2Nlc3NpYmlsaXR5QXRzcGk6OmFkZENsaWVudChjb25zdCBjaGFyKiBk YnVzTmFtZSkKIHsKLSAgICBpZiAobV9jbGllbnRzLmlzRW1wdHkoKSkgewotICAgICAgICBmb3Ig KGF1dG8qIHJvb3RPYmplY3QgOiBtX3Jvb3RPYmplY3RzLmtleXMoKSkKLSAgICAgICAgICAgIHJv b3RPYmplY3QtPnJlZ2lzdGVyVHJlZSgpOwotICAgIH0KKyAgICBpZiAobV9jbGllbnRzLmlzRW1w dHkoKSkKKyAgICAgICAgQVhPYmplY3RDYWNoZTo6ZW5hYmxlQWNjZXNzaWJpbGl0eSgpOwogCiAg ICAgYXV0byBhZGRSZXN1bHQgPSBtX2NsaWVudHMuYWRkKGRidXNOYW1lLCAwKTsKICAgICBpZiAo IWFkZFJlc3VsdC5pc05ld0VudHJ5KQpAQCAtMzc1LDggKzM3Myw4IEBAIHZvaWQgQWNjZXNzaWJp bGl0eUF0c3BpOjpwYXJlbnRDaGFuZ2VkKEFjY2Vzc2liaWxpdHlPYmplY3RBdHNwaSYgYXRzcGlP YmplY3QpCiAgICAgaWYgKCFtX2Nvbm5lY3Rpb24pCiAgICAgICAgIHJldHVybjsKIAotICAgIC8v IEFsd2F5cyBlbWl0IHBhcmVudENoYW5nZWQgd2hlbiB0aGUgdHJlZSBpcyByZWdpc3RlcmVkIGJl Y2F1c2UgdGhlIGF0c3BpIGNhY2hlIGFsd2F5cyBjb25zdW1lcyBpdC4KLSAgICBpZiAoIWF0c3Bp T2JqZWN0LmlzVHJlZVJlZ2lzdGVyZWQoKSkKKyAgICAvLyBBbHdheXMgZW1pdCBwYXJlbnRDaGFu Z2VkIHdoZW4gdGhlcmUgYXJlIGNsaWVudHMgYmVjYXVzZSB0aGUgYXRzcGkgY2FjaGUgYWx3YXlz IGNvbnN1bWVzIGl0LgorICAgIGlmICghbV9jbGllbnRzLmlzRW1wdHkoKSkKICAgICAgICAgcmV0 dXJuOwogCiAgICAgLy8gRW1pdCBwYXJlbnRDaGFuZ2VkIG9ubHkgaWYgdGhlIG9iamVjdCBpcyBh bHJlYWR5IHJlZ2lzdGVyZWQsIG90aGVyd2lzZSByZWdpc3RlciB0aGUgb2JqZWN0LApAQCAtMzk1 LDYgKzM5MywxMCBAQCB2b2lkIEFjY2Vzc2liaWxpdHlBdHNwaTo6cGFyZW50Q2hhbmdlZChBY2Nl c3NpYmlsaXR5Um9vdEF0c3BpJiByb290T2JqZWN0KQogICAgIGlmICghbV9jb25uZWN0aW9uKQog ICAgICAgICByZXR1cm47CiAKKyAgICAvLyBBbHdheXMgZW1pdCBwYXJlbnRDaGFuZ2VkIHdoZW4g dGhlcmUgYXJlIGNsaWVudHMgYmVjYXVzZSB0aGUgYXRzcGkgY2FjaGUgYWx3YXlzIGNvbnN1bWVz IGl0LgorICAgIGlmIChtX2NsaWVudHMuaXNFbXB0eSgpKQorICAgICAgICByZXR1cm47CisKICAg ICBnX2RidXNfY29ubmVjdGlvbl9lbWl0X3NpZ25hbChtX2Nvbm5lY3Rpb24uZ2V0KCksIG51bGxw dHIsIHJvb3RPYmplY3QucGF0aCgpLnV0ZjgoKS5kYXRhKCksICJvcmcuYTExeS5hdHNwaS5FdmVu dC5PYmplY3QiLCAiUHJvcGVydHlDaGFuZ2UiLAogICAgICAgICBnX3ZhcmlhbnRfbmV3KCIoc2lp dmF7c3Z9KSIsICJhY2Nlc3NpYmxlLXBhcmVudCIsIDAsIDAsIHJvb3RPYmplY3QucGFyZW50UmVm ZXJlbmNlKCksIG51bGxwdHIpLCBudWxscHRyKTsKIH0KQEAgLTQwOCw4ICs0MTAsOCBAQCB2b2lk IEFjY2Vzc2liaWxpdHlBdHNwaTo6Y2hpbGRyZW5DaGFuZ2VkKEFjY2Vzc2liaWxpdHlPYmplY3RB dHNwaSYgYXRzcGlPYmplY3QsCiAgICAgaWYgKCFtX2Nvbm5lY3Rpb24pCiAgICAgICAgIHJldHVy bjsKIAotICAgIC8vIEFsd2F5cyBlbWl0IENoaWxkcmVuQ2hhbmdlZCB3aGVuIHRoZSB0cmVlIGlz IHJlZ2lzdGVyZWQgYmVjYXVzZSB0aGUgYXRzcGkgY2FjaGUgYWx3YXlzIGNvbnN1bWVzIGl0Lgot ICAgIGlmICghYXRzcGlPYmplY3QuaXNUcmVlUmVnaXN0ZXJlZCgpKQorICAgIC8vIEFsd2F5cyBl bWl0IENoaWxkcmVuQ2hhbmdlZCB3aGVuIHRoZXJlIGFyZSBjbGllbnRzIGJlY2F1c2UgdGhlIGF0 c3BpIGNhY2hlIGFsd2F5cyBjb25zdW1lcyBpdC4KKyAgICBpZiAobV9jbGllbnRzLmlzRW1wdHko KSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgYWRkVG9DYWNoZUlmUGVuZGluZyhhdHNwaU9iamVj dCk7CkBAIC00MjUsNiArNDI3LDEwIEBAIHZvaWQgQWNjZXNzaWJpbGl0eUF0c3BpOjpjaGlsZHJl bkNoYW5nZWQoQWNjZXNzaWJpbGl0eVJvb3RBdHNwaSYgcm9vdE9iamVjdCwgQWNjCiAgICAgaWYg KCFtX2Nvbm5lY3Rpb24pCiAgICAgICAgIHJldHVybjsKIAorICAgIC8vIEFsd2F5cyBlbWl0IENo aWxkcmVuQ2hhbmdlZCB3aGVuIHRoZXJlIGFyZSBjbGllbnRzIGJlY2F1c2UgdGhlIGF0c3BpIGNh Y2hlIGFsd2F5cyBjb25zdW1lcyBpdC4KKyAgICBpZiAobV9jbGllbnRzLmlzRW1wdHkoKSkKKyAg ICAgICAgcmV0dXJuOworCiAgICAgYWRkVG9DYWNoZUlmUGVuZGluZyhjaGlsZCk7CiAKICAgICBn X2RidXNfY29ubmVjdGlvbl9lbWl0X3NpZ25hbChtX2Nvbm5lY3Rpb24uZ2V0KCksIG51bGxwdHIs IHJvb3RPYmplY3QucGF0aCgpLnV0ZjgoKS5kYXRhKCksICJvcmcuYTExeS5hdHNwaS5FdmVudC5P YmplY3QiLCAiQ2hpbGRyZW5DaGFuZ2VkIiwKQEAgLTgzNywxMCArODQzLDYgQEAgdm9pZCBBY2Nl c3NpYmlsaXR5QXRzcGk6OmNhY2hlQ2xlYXJUaW1lckZpcmVkKCkKICAgICAgICAgaXQua2V5LT5k aWRVbnJlZ2lzdGVyT2JqZWN0KCk7CiAgICAgfQogICAgIG1fYXRzcGlPYmplY3RzLmNsZWFyKCk7 Ci0KLSAgICBmb3IgKGF1dG8qIHJvb3RPYmplY3QgOiBtX3Jvb3RPYmplY3RzLmtleXMoKSkKLSAg ICAgICAgcm9vdE9iamVjdC0+ZGlkVW5yZWdpc3RlclRyZWUoKTsKLQogICAgIG1fY2FjaGUuY2xl YXIoKTsKIAogICAgIFJFTEVBU0VfQVNTRVJUKG1fY2FjaGVVcGRhdGVMaXN0LmlzRW1wdHkoKSk7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2F0c3BpL0FjY2Vzc2li aWxpdHlPYmplY3RBdHNwaS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2F0c3Bp L0FjY2Vzc2liaWxpdHlPYmplY3RBdHNwaS5jcHAKaW5kZXggZWRhZWIzMTk3YWU3Li42NzU3NDhm ODY2MGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvYXRzcGkvQWNj ZXNzaWJpbGl0eU9iamVjdEF0c3BpLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmls aXR5L2F0c3BpL0FjY2Vzc2liaWxpdHlPYmplY3RBdHNwaS5jcHAKQEAgLTQ3NiwxMSArNDc2LDYg QEAgQWNjZXNzaWJpbGl0eVJvb3RBdHNwaSogQWNjZXNzaWJpbGl0eU9iamVjdEF0c3BpOjpyb290 KCkKICAgICByZXR1cm4gbV9yb290OwogfQogCi1ib29sIEFjY2Vzc2liaWxpdHlPYmplY3RBdHNw aTo6aXNUcmVlUmVnaXN0ZXJlZCgpIGNvbnN0Ci17Ci0gICAgcmV0dXJuIG1fcm9vdCA/IG1fcm9v dC0+aXNUcmVlUmVnaXN0ZXJlZCgpIDogZmFsc2U7Ci19Ci0KIGJvb2wgQWNjZXNzaWJpbGl0eU9i amVjdEF0c3BpOjpyZWdpc3Rlck9iamVjdCgpCiB7CiAgICAgaWYgKCFtX3BhdGguaXNOdWxsKCkp CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2F0c3BpL0FjY2Vzc2li aWxpdHlPYmplY3RBdHNwaS5oIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9hdHNwaS9B Y2Nlc3NpYmlsaXR5T2JqZWN0QXRzcGkuaAppbmRleCAzYjU5MjgyZDRlMmEuLmU3NDlkNDk0ODBj ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9hdHNwaS9BY2Nlc3Np YmlsaXR5T2JqZWN0QXRzcGkuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2F0 c3BpL0FjY2Vzc2liaWxpdHlPYmplY3RBdHNwaS5oCkBAIC00MSw3ICs0MSw2IEBAIHB1YmxpYzoK ICAgICB+QWNjZXNzaWJpbGl0eU9iamVjdEF0c3BpKCkgPSBkZWZhdWx0OwogCiAgICAgYm9vbCBy ZWdpc3Rlck9iamVjdCgpOwotICAgIGJvb2wgaXNUcmVlUmVnaXN0ZXJlZCgpIGNvbnN0OwogICAg IHZvaWQgZGlkVW5yZWdpc3Rlck9iamVjdCgpOwogCiAgICAgZW51bSBjbGFzcyBJbnRlcmZhY2Ug OiB1aW50MTZfdCB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2F0 c3BpL0FjY2Vzc2liaWxpdHlSb290QXRzcGkuY3BwIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJp bGl0eS9hdHNwaS9BY2Nlc3NpYmlsaXR5Um9vdEF0c3BpLmNwcAppbmRleCA1Njg4YjYxNjIwNzku Ljc1NzFiNzE1OGM5ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9h dHNwaS9BY2Nlc3NpYmlsaXR5Um9vdEF0c3BpLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nl c3NpYmlsaXR5L2F0c3BpL0FjY2Vzc2liaWxpdHlSb290QXRzcGkuY3BwCkBAIC0zMCw3ICszMCw2 IEBACiAjaW5jbHVkZSAiRnJhbWVWaWV3LmgiCiAjaW5jbHVkZSAiUGFnZS5oIgogI2luY2x1ZGUg PGdsaWIvZ2kxOG4tbGliLmg+Ci0jaW5jbHVkZSA8d3RmL1NldEZvclNjb3BlLmg+CiAKIG5hbWVz cGFjZSBXZWJDb3JlIHsKIApAQCAtMTY5LDM2ICsxNjgsNiBAQCB2b2lkIEFjY2Vzc2liaWxpdHlS b290QXRzcGk6OnVucmVnaXN0ZXJPYmplY3QoKQogICAgICAgICBtX3BhZ2UtPnNldEFjY2Vzc2li aWxpdHlSb290T2JqZWN0KG51bGxwdHIpOwogfQogCi1zdGF0aWMgdm9pZCByZWdpc3RlclN1YnRy ZWUoQWNjZXNzaWJpbGl0eU9iamVjdEF0c3BpKiBhdHNwaU9iamVjdCkKLXsKLSAgICBpZiAoIWF0 c3BpT2JqZWN0KQotICAgICAgICByZXR1cm47Ci0KLSAgICBpZiAoIWF0c3BpT2JqZWN0LT5yZWdp c3Rlck9iamVjdCgpKQotICAgICAgICByZXR1cm47Ci0KLSAgICBhdHNwaU9iamVjdC0+dXBkYXRl QmFja2luZ1N0b3JlKCk7Ci0gICAgZm9yIChhdXRvJiBjaGlsZCA6IGF0c3BpT2JqZWN0LT5jaGls ZHJlbigpKQotICAgICAgICByZWdpc3RlclN1YnRyZWUoY2hpbGQuZ2V0KCkpOwotfQotCi12b2lk IEFjY2Vzc2liaWxpdHlSb290QXRzcGk6OnJlZ2lzdGVyVHJlZSgpCi17Ci0gICAgaWYgKG1fcGFy ZW50VW5pcXVlTmFtZS5pc051bGwoKSkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgaWYgKG1faXNU cmVlUmVnaXN0ZXJlZCkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgcmVnaXN0ZXJTdWJ0cmVlKGNo aWxkKCkpOwotICAgIG1faXNUcmVlUmVnaXN0ZXJlZCA9IHRydWU7Ci19Ci0KLXZvaWQgQWNjZXNz aWJpbGl0eVJvb3RBdHNwaTo6ZGlkVW5yZWdpc3RlclRyZWUoKQotewotICAgIG1faXNUcmVlUmVn aXN0ZXJlZCA9IGZhbHNlOwotfQotCiB2b2lkIEFjY2Vzc2liaWxpdHlSb290QXRzcGk6OnNldFBh dGgoU3RyaW5nJiYgcGF0aCkKIHsKICAgICBtX3BhdGggPSBXVEZNb3ZlKHBhdGgpOwpAQCAtMjA5 LDggKzE3OCw2IEBAIHZvaWQgQWNjZXNzaWJpbGl0eVJvb3RBdHNwaTo6ZW1iZWRkZWQoY29uc3Qg Y2hhciogcGFyZW50VW5pcXVlTmFtZSwgY29uc3QgY2hhcioKICAgICBtX3BhcmVudFVuaXF1ZU5h bWUgPSBwYXJlbnRVbmlxdWVOYW1lOwogICAgIG1fcGFyZW50UGF0aCA9IHBhcmVudFBhdGg7CiAg ICAgQWNjZXNzaWJpbGl0eUF0c3BpOjpzaW5nbGV0b24oKS5wYXJlbnRDaGFuZ2VkKCp0aGlzKTsK LSAgICBpZiAoQWNjZXNzaWJpbGl0eUF0c3BpOjpzaW5nbGV0b24oKS5oYXNDbGllbnRzKCkpCi0g ICAgICAgIHJlZ2lzdGVyVHJlZSgpOwogfQogCiBHVmFyaWFudCogQWNjZXNzaWJpbGl0eVJvb3RB dHNwaTo6YXBwbGljYXRpb25SZWZlcmVuY2UoKSBjb25zdApAQCAtMjM5LDggKzIwNiw2IEBAIEFj Y2Vzc2liaWxpdHlPYmplY3RBdHNwaSogQWNjZXNzaWJpbGl0eVJvb3RBdHNwaTo6Y2hpbGQoKSBj b25zdAogICAgIGlmICghZnJhbWUuZG9jdW1lbnQoKSkKICAgICAgICAgcmV0dXJuIG51bGxwdHI7 CiAKLSAgICBTZXRGb3JTY29wZTxib29sPiBpbkNoaWxkKG1faW5DaGlsZCwgdHJ1ZSk7Ci0KICAg ICBBWE9iamVjdENhY2hlOjplbmFibGVBY2Nlc3NpYmlsaXR5KCk7CiAgICAgQVhPYmplY3RDYWNo ZSogY2FjaGUgPSBmcmFtZS5kb2N1bWVudCgpLT5heE9iamVjdENhY2hlKCk7CiAgICAgaWYgKCFj YWNoZSkKQEAgLTI1MiwxMyArMjE3LDYgQEAgQWNjZXNzaWJpbGl0eU9iamVjdEF0c3BpKiBBY2Nl c3NpYmlsaXR5Um9vdEF0c3BpOjpjaGlsZCgpIGNvbnN0CiAKIHZvaWQgQWNjZXNzaWJpbGl0eVJv b3RBdHNwaTo6Y2hpbGRBZGRlZChBY2Nlc3NpYmlsaXR5T2JqZWN0QXRzcGkmIGNoaWxkKQogewot ICAgIC8vIERvbid0IGVtaXQgY2hpbGRyZW4gY2hhbmdlZCB3aGVuIGNhbGxlZCBmcm9tIGNoaWxk KCkgYmVjYXVzZSB0aGF0IG1lYW5zIHRoZSB0cmVlIGlzIGJlaW5nIHBvcHVsYXRlZC4KLSAgICBp ZiAobV9pbkNoaWxkIHx8ICFtX2lzVHJlZVJlZ2lzdGVyZWQpCi0gICAgICAgIHJldHVybjsKLQot ICAgIGlmICh0aGlzLT5jaGlsZCgpICE9ICZjaGlsZCkKLSAgICAgICAgcmV0dXJuOwotCiAgICAg QWNjZXNzaWJpbGl0eUF0c3BpOjpzaW5nbGV0b24oKS5jaGlsZHJlbkNoYW5nZWQoKnRoaXMsIGNo aWxkLCBBY2Nlc3NpYmlsaXR5QXRzcGk6OkNoaWxkcmVuQ2hhbmdlZDo6QWRkZWQpOwogfQogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2F0c3BpL0FjY2Vzc2liaWxp dHlSb290QXRzcGkuaCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvYXRzcGkvQWNjZXNz aWJpbGl0eVJvb3RBdHNwaS5oCmluZGV4IDg4ZmIxZjgzMzcxZS4uMjIyNjNlMDE3MzE3IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2F0c3BpL0FjY2Vzc2liaWxpdHlS b290QXRzcGkuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2F0c3BpL0FjY2Vz c2liaWxpdHlSb290QXRzcGkuaApAQCAtNDAsOSArNDAsNiBAQCBwdWJsaWM6CiAKICAgICB2b2lk IHJlZ2lzdGVyT2JqZWN0KENvbXBsZXRpb25IYW5kbGVyPHZvaWQoY29uc3QgU3RyaW5nJik+JiYp OwogICAgIHZvaWQgdW5yZWdpc3Rlck9iamVjdCgpOwotICAgIHZvaWQgcmVnaXN0ZXJUcmVlKCk7 Ci0gICAgdm9pZCBkaWRVbnJlZ2lzdGVyVHJlZSgpOwotICAgIGJvb2wgaXNUcmVlUmVnaXN0ZXJl ZCgpIGNvbnN0IHsgcmV0dXJuIG1faXNUcmVlUmVnaXN0ZXJlZDsgfQogICAgIHZvaWQgc2V0UGF0 aChTdHJpbmcmJik7CiAKICAgICBjb25zdCBTdHJpbmcmIHBhdGgoKSBjb25zdCB7IHJldHVybiBt X3BhdGg7IH0KQEAgLTY5LDggKzY2LDYgQEAgcHJpdmF0ZToKICAgICBTdHJpbmcgbV9wYXRoOwog ICAgIFN0cmluZyBtX3BhcmVudFVuaXF1ZU5hbWU7CiAgICAgU3RyaW5nIG1fcGFyZW50UGF0aDsK LSAgICBib29sIG1faXNUcmVlUmVnaXN0ZXJlZCB7IGZhbHNlIH07Ci0gICAgbXV0YWJsZSBib29s IG1faW5DaGlsZCB7IGZhbHNlIH07CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYg LS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMDExNzI4YjZm Njk1Li4wODRmZTU4MDUyNWIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29s cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAyMi0wMS0xOCAgQ2FybG9zIEdhcmNpYSBD YW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dUS11bYTExeV0gU3RvcCBy ZWdpc3RlcmluZyB0aGUgdHJlZSB3aGVuIGNsaWVudHMgYXJlIGNvbm5lY3RlZCB3aXRoIEFUU1BJ CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzUzMTMK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFRlc3RX ZWJLaXRBUEkvVGVzdHMvV2ViS2l0R3RrL1Rlc3RXZWJLaXRBY2Nlc3NpYmlsaXR5LmNwcDoKKyAg ICAgICAgKHRlc3REb2N1bWVudExvYWRFdmVudHMpOiBOb3cgd2UgZG9uJ3QgZ2V0IHRoZSBpbml0 aWFsIGV2ZW50IGZyb20gcHJldmlvdXMgZG9jdW1lbnQgd2ViIGJlY2F1c2UgaXQgaGFwcGVucwor ICAgICAgICBiZWZvcmUgdGhlIGZpcnN0IGNsaWVudCBpcyBjb25uZWN0ZWQuCisKIDIwMjItMDEt MTcgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAg IFtHVEtdW2ExMXldIFN0b3AgdXNpbmcgaXNvbGF0ZWQgdHJlZSBmb3IgdGhlIEFUU1BJIGltcGxl bWVudGF0aW9uCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdEd0 ay9UZXN0V2ViS2l0QWNjZXNzaWJpbGl0eS5jcHAgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3Rz L1dlYktpdEd0ay9UZXN0V2ViS2l0QWNjZXNzaWJpbGl0eS5jcHAKaW5kZXggNWQ2MWM4M2Y4ODVk Li44ZTcwOTRkYTJkNTggMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2Vi S2l0R3RrL1Rlc3RXZWJLaXRBY2Nlc3NpYmlsaXR5LmNwcAorKysgYi9Ub29scy9UZXN0V2ViS2l0 QVBJL1Rlc3RzL1dlYktpdEd0ay9UZXN0V2ViS2l0QWNjZXNzaWJpbGl0eS5jcHAKQEAgLTIzOTMs MTcgKzIzOTMsMTQgQEAgc3RhdGljIHZvaWQgdGVzdERvY3VtZW50TG9hZEV2ZW50cyhBY2Nlc3Np YmlsaXR5VGVzdCogdGVzdCwgZ2NvbnN0cG9pbnRlcikKICAgICAgICAgIjwvaHRtbD4iLAogICAg ICAgICBudWxscHRyKTsKICAgICB0ZXN0LT53YWl0VW50aWxMb2FkRmluaXNoZWQoKTsKLSAgICBh dXRvIGV2ZW50cyA9IHRlc3QtPnN0b3BFdmVudE1vbml0b3IoMyk7Ci0gICAgZ19hc3NlcnRfY21w dWludChldmVudHMuc2l6ZSgpLCA9PSwgMyk7CisgICAgYXV0byBldmVudHMgPSB0ZXN0LT5zdG9w RXZlbnRNb25pdG9yKDIpOworICAgIGdfYXNzZXJ0X2NtcHVpbnQoZXZlbnRzLnNpemUoKSwgPT0s IDIpOwogICAgIGdfYXNzZXJ0X2NtcHN0cihldmVudHNbMF0tPnR5cGUsID09LCAib2JqZWN0OnN0 YXRlLWNoYW5nZWQ6YnVzeSIpOwotICAgIGdfYXNzZXJ0X2NtcHVpbnQoZXZlbnRzWzBdLT5kZXRh aWwxLCA9PSwgMSk7Ci0gICAgZ19hc3NlcnRfY21wc3RyKGV2ZW50c1sxXS0+dHlwZSwgPT0sICJv YmplY3Q6c3RhdGUtY2hhbmdlZDpidXN5Iik7Ci0gICAgZ19hc3NlcnRfY21wdWludChldmVudHNb MV0tPmRldGFpbDEsID09LCAwKTsKLSAgICBnX2Fzc2VydF9mYWxzZShldmVudHNbMF0tPnNvdXJj ZSA9PSBldmVudHNbMV0tPnNvdXJjZSk7CisgICAgZ19hc3NlcnRfY21wdWludChldmVudHNbMF0t PmRldGFpbDEsID09LCAwKTsKICAgICBnX2Fzc2VydF90cnVlKEFUU1BJX0lTX0FDQ0VTU0lCTEUo ZXZlbnRzWzBdLT5zb3VyY2UpKTsKICAgICBnX2Fzc2VydF9jbXBpbnQoYXRzcGlfYWNjZXNzaWJs ZV9nZXRfcm9sZShldmVudHNbMF0tPnNvdXJjZSwgbnVsbHB0ciksID09LCBBVFNQSV9ST0xFX0RP Q1VNRU5UX1dFQik7Ci0gICAgZ19hc3NlcnRfY21wc3RyKGV2ZW50c1syXS0+dHlwZSwgPT0sICJk b2N1bWVudDpsb2FkLWNvbXBsZXRlIik7Ci0gICAgZ19hc3NlcnRfdHJ1ZShldmVudHNbMV0tPnNv dXJjZSA9PSBldmVudHNbMl0tPnNvdXJjZSk7CisgICAgZ19hc3NlcnRfY21wc3RyKGV2ZW50c1sx XS0+dHlwZSwgPT0sICJkb2N1bWVudDpsb2FkLWNvbXBsZXRlIik7CisgICAgZ19hc3NlcnRfdHJ1 ZShldmVudHNbMF0tPnNvdXJjZSA9PSBldmVudHNbMV0tPnNvdXJjZSk7CiAgICAgZ19hc3NlcnRf dHJ1ZShBVFNQSV9JU19BQ0NFU1NJQkxFKGV2ZW50c1sxXS0+c291cmNlKSk7CiAgICAgZ19hc3Nl cnRfY21waW50KGF0c3BpX2FjY2Vzc2libGVfZ2V0X3JvbGUoZXZlbnRzWzFdLT5zb3VyY2UsIG51 bGxwdHIpLCA9PSwgQVRTUElfUk9MRV9ET0NVTUVOVF9XRUIpOwogICAgIGV2ZW50cyA9IHsgfTsK