214692 2020-07-23 10:51:50 -0700 Update the isolated tree even when there is no client request. 2020-07-23 13:01:16 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 andresg_22 andresg_22 aboxhall apinheiro cfleizach dmazzoni ews-watchlist jcraig jdiggs samuel_white webkit-bug-importer oldest_to_newest 1674284 0 andresg_22 2020-07-23 10:51:50 -0700 Update the isolated tree even when there is no client request. 1674291 1 405060 andresg_22 2020-07-23 11:06:58 -0700 Created attachment 405060 Patch 1674294 2 405060 cfleizach 2020-07-23 11:24:08 -0700 Comment on attachment 405060 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=405060&action=review > Source/WebCore/accessibility/AXObjectCache.cpp:3196 > + case AXLoadingFinished: can we change this method so it doesn't duplicate the logic in the other updateIsolateTree method? instead do something like void AXObjectCache::updateIsolatedTree(AXCoreObject& object, AXLoadingEvent notification) { if (notification == AXLoadingFinished) updateIsoaltedTree(object, AXChildrenChanged) } 1674311 3 405064 andresg_22 2020-07-23 12:03:29 -0700 Created attachment 405064 Patch 1674315 4 andresg_22 2020-07-23 12:09:21 -0700 (In reply to chris fleizach from comment #2) > Comment on attachment 405060 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=405060&action=review > > > Source/WebCore/accessibility/AXObjectCache.cpp:3196 > > + case AXLoadingFinished: > > can we change this method so it doesn't duplicate the logic in the other > updateIsolateTree method? instead do something like > > void AXObjectCache::updateIsolatedTree(AXCoreObject& object, AXLoadingEvent > notification) > { > if (notification == AXLoadingFinished) > updateIsoaltedTree(object, AXChildrenChanged) > } Done as suggested. Also pondered the approach of merging the AXLoadingEvent enum into AXNotification. But don't know why it was added as a separate enum, and it would require more changes. Something perhaps for a later cleanup. Thanks. 1674332 5 ews-feeder 2020-07-23 13:00:47 -0700 Committed r264784: <https://trac.webkit.org/changeset/264784> All reviewed patches have been landed. Closing bug and clearing flags on attachment 405064. 1674333 6 webkit-bug-importer 2020-07-23 13:01:16 -0700 <rdar://problem/66007855> 405060 2020-07-23 11:06:58 -0700 2020-07-23 12:03:26 -0700 Patch bug-214692-20200723140657.patch text/plain 6926 andresg_22 U3VidmVyc2lvbiBSZXZpc2lvbjogMjY0NDcxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWJlZjQ2NDUwOTZlMjIz YTUyZWE3NTJhNzNlZTNkNGViZDUxYjE3MC4uZWYzNjQxMWE2MDM2NzZlNjU3YWY4YTM2M2JjOGVh ZmQ5ZjU0Njc4NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDIwLTA3LTIzICBBbmRy ZXMgR29uemFsZXogIDxhbmRyZXNnXzIyQGFwcGxlLmNvbT4KKworICAgICAgICBVcGRhdGUgdGhl IGlzb2xhdGVkIHRyZWUgZXZlbiB3aGVuIHRoZXJlIGlzIG5vIGNsaWVudCByZXF1ZXN0LgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE0NjkyCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQVhPYmplY3RDYWNo ZTo6dXBkYXRlSXNvbGF0ZWRUcmVlIHdhcyBjaGVja2luZyBmb3IgaXNJc29sYXRlZFRyZWVFbmFi bGVkLAorICAgICAgICB3aGljaCBpbiB0dXJuIGNoZWNrcyBmb3Igd2hldGhlciB0aGUgY2xpZW50 U3VwcG9ydHNJc29sYXRlZFRyZWUuIE9mdGVuCisgICAgICAgIGF0IHRoZSB0aW1lIHVwZGF0ZUlz b2xhdGVkVHJlZSBpcyBjYWxsZWQsIHRoZXJlIGlzIG5vIGNsaWVudCByZXF1ZXN0CisgICAgICAg IHNpbmNlIGNsaWVudCByZXF1ZXN0cyBhbmQgdXBkYXRlcyBvY2N1ciBpbiBzZXBhcmF0ZSB0aHJl YWRzLAorICAgICAgICBpbmRlcGVuZGVudGx5IGZyb20gZWFjaCBvdGhlci4gVGh1cyB0aGUgaXNv bGF0ZWQgdHJlZSB3YXNuJ3QgYmVpbmcKKyAgICAgICAgdXBkYXRlZC4gVGhpcyBwYXRjaCByZW1v dmVzIHRoZSBjaGVjayBmb3IgaXNJc29sYXRlZFRyZWVFbmFibGVkIGFuZCByZWx5CisgICAgICAg IG9uIHRoZSBwcmVzZW5jZSBvZiBhbiBpc29sYXRlZCB0cmVlIGZvciB0aGUgZ2l2ZW4gUGFnZUlE IHRvIHBlcmZvcm0gdGhlCisgICAgICAgIHVwZGF0ZS4KKyAgICAgICAgSW4gYWRkaXRpb24sIGFk ZGVkIGFuIHVwZGF0ZSBvZiB0aGUgaXNvbGF0ZWQgdHJlZSBmb3IgQVhMb2FkaW5nRXZlbnQ6OkFY TG9hZGluZ0ZpbmlzaGVkLgorICAgICAgICBUaGlzIGZpeGVzIHNldmVyYWwgaW5zdGFuY2Ugb2Yg ZHluYW1pYyBjb250ZW50IHBhZ2UgY2hhbmdlcyB0aGF0IHdlcmUKKyAgICAgICAgbm90IGJlaW5n IHJlZmxlY3RlZCBvbiB0aGUgaXNvbGF0ZWQgdHJlZS4KKworICAgICAgICAqIGFjY2Vzc2liaWxp dHkvQVhPYmplY3RDYWNoZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpBWE9iamVjdENhY2hlOjpj bGllbnRTdXBwb3J0c0lzb2xhdGVkVHJlZSk6IFNvbWUgbG9nZ2luZy4KKyAgICAgICAgKFdlYkNv cmU6OkFYT2JqZWN0Q2FjaGU6OmlzSXNvbGF0ZWRUcmVlRW5hYmxlZCk6IFNvbWUgbG9nZ2luZy4K KyAgICAgICAgKFdlYkNvcmU6OkFYT2JqZWN0Q2FjaGU6OmZyYW1lTG9hZGluZ0V2ZW50Tm90aWZp Y2F0aW9uKTogQ2FsbHMgdXBkYXRlSXNvbGF0ZWRUcmVlLgorICAgICAgICAoV2ViQ29yZTo6QVhP YmplY3RDYWNoZTo6dXBkYXRlSXNvbGF0ZWRUcmVlKTogSGFuZGxlcyBBWExvYWRpbmdFdmVudHMu CisgICAgICAgICogYWNjZXNzaWJpbGl0eS9BWE9iamVjdENhY2hlLmg6CisKIDIwMjAtMDctMTYg IFBlbmcgTGl1ICA8cGVuZy5saXU2QGFwcGxlLmNvbT4KIAogICAgICAgICBEb3VibGUgdGFwcGlu ZyB0byB6b29tIG91dCBhIGZ1bGxzY3JlZW4gdmlkZW8gd2lsbCB6b29tIGluIHNsaWdodGx5IGJl Zm9yZSB6b29taW5nIG91dApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0 eS9BWE9iamVjdENhY2hlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhPYmpl Y3RDYWNoZS5jcHAKaW5kZXggZDgwMDRlMzFhOGE2NTgzZjkzNTQ5ZTU3MDE4MGQ3Nzg1NDE4MjQz Yy4uYWVhOWRlNzE5ODdmOTdlN2M4MGE3YzRjYzVmODAxNTMwM2NhNWY4YiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWE9iamVjdENhY2hlLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FYT2JqZWN0Q2FjaGUuY3BwCkBAIC03MDAsMTkgKzcw MCwyNSBAQCBBY2Nlc3NpYmlsaXR5T2JqZWN0KiBBWE9iamVjdENhY2hlOjpnZXRPckNyZWF0ZShS ZW5kZXJPYmplY3QqIHJlbmRlcmVyKQogI2lmIEVOQUJMRShBQ0NFU1NJQklMSVRZX0lTT0xBVEVE X1RSRUUpCiBib29sIEFYT2JqZWN0Q2FjaGU6OmNsaWVudFN1cHBvcnRzSXNvbGF0ZWRUcmVlKCkK IHsKKyAgICBBWFRSQUNFKCJBWE9iamVjdENhY2hlOjpjbGllbnRTdXBwb3J0c0lzb2xhdGVkVHJl ZSIpOworCiAgICAgaWYgKCFSdW50aW1lRW5hYmxlZEZlYXR1cmVzOjpzaGFyZWRGZWF0dXJlcygp LmlzQWNjZXNzaWJpbGl0eUlzb2xhdGVkVHJlZUVuYWJsZWQoKSkKICAgICAgICAgcmV0dXJuIGZh bHNlOwogCisgICAgQVhMT0cobWFrZVN0cmluZygiX0FYR2V0Q2xpZW50Rm9yQ3VycmVudFJlcXVl c3RVbnRydXN0ZWQgPSAiLCBzdGF0aWNfY2FzdDx1bnNpZ25lZD4oX0FYR2V0Q2xpZW50Rm9yQ3Vy cmVudFJlcXVlc3RVbnRydXN0ZWQoKSkpKTsKICAgICByZXR1cm4gX0FYR2V0Q2xpZW50Rm9yQ3Vy cmVudFJlcXVlc3RVbnRydXN0ZWQoKSA9PSBrQVhDbGllbnRUeXBlVm9pY2VPdmVyOwogfQogCiBi b29sIEFYT2JqZWN0Q2FjaGU6OmlzSXNvbGF0ZWRUcmVlRW5hYmxlZCgpCiB7CisgICAgQVhUUkFD RSgiQVhPYmplY3RDYWNoZTo6aXNJc29sYXRlZFRyZWVFbmFibGVkIik7CisKICAgICBpZiAoVU5M SUtFTFkoX0FYR2V0Q2xpZW50Rm9yQ3VycmVudFJlcXVlc3RVbnRydXN0ZWQoKSA9PSBrQVhDbGll bnRUeXBlV2ViS2l0VGVzdGluZykpCiAgICAgICAgIHJldHVybiB0cnVlOwogCiAgICAgLy8gSWYg aXNvbGF0ZWQgdHJlZSBtb2RlIGlzIG9uLCByZXR1cm4gdHJ1ZSB3aGV0aGVyIHRoZSBjbGllbnQg c3VwcG9ydHMKICAgICAvLyBpc29sYXRlZCB0cmVlIG1vZGUgb3IgdGhlIGNhbGwgaXMgb2ZmIG9m IHRoZSBtYWluIHRocmVhZC4KKyAgICBBWExPRyhtYWtlU3RyaW5nKCJfQVhTSXNvbGF0ZWRUcmVl TW9kZSA9ICIsIF9BWFNJc29sYXRlZFRyZWVNb2RlRnVuY3Rpb25Jc0F2YWlsYWJsZSgpID8gX0FY U0lzb2xhdGVkVHJlZU1vZGVfU29mdCgpIDogMCkpOwogICAgIHJldHVybiBfQVhTSXNvbGF0ZWRU cmVlTW9kZUZ1bmN0aW9uSXNBdmFpbGFibGUoKSAmJiBfQVhTSXNvbGF0ZWRUcmVlTW9kZV9Tb2Z0 KCkgIT0gQVhTSXNvbGF0ZWRUcmVlTW9kZU9mZgogICAgICAgICAmJiAoIWlzTWFpblRocmVhZCgp IHx8IGNsaWVudFN1cHBvcnRzSXNvbGF0ZWRUcmVlKCkpOwogfQpAQCAtMTU0MCw2ICsxNTQ2LDEx IEBAIHZvaWQgQVhPYmplY3RDYWNoZTo6ZnJhbWVMb2FkaW5nRXZlbnROb3RpZmljYXRpb24oRnJh bWUqIGZyYW1lLCBBWExvYWRpbmdFdmVudCBsCiAgICAgICAgIHJldHVybjsKIAogICAgIEFjY2Vz c2liaWxpdHlPYmplY3QqIG9iaiA9IGdldE9yQ3JlYXRlKGNvbnRlbnRSZW5kZXJlcik7CisKKyNp ZiBFTkFCTEUoQUNDRVNTSUJJTElUWV9JU09MQVRFRF9UUkVFKQorICAgIHVwZGF0ZUlzb2xhdGVk VHJlZSgqb2JqLCBsb2FkaW5nRXZlbnQpOworI2VuZGlmCisKICAgICBmcmFtZUxvYWRpbmdFdmVu dFBsYXRmb3JtTm90aWZpY2F0aW9uKG9iaiwgbG9hZGluZ0V2ZW50KTsKIH0KIApAQCAtMzEzNywx OSArMzE0OCwxOSBAQCBSZWY8QVhJc29sYXRlZFRyZWU+IEFYT2JqZWN0Q2FjaGU6OmdlbmVyYXRl SXNvbGF0ZWRUcmVlKFBhZ2VJZGVudGlmaWVyIHBhZ2VJRCwgRAogdm9pZCBBWE9iamVjdENhY2hl Ojp1cGRhdGVJc29sYXRlZFRyZWUoQVhDb3JlT2JqZWN0JiBvYmplY3QsIEFYTm90aWZpY2F0aW9u IG5vdGlmaWNhdGlvbikKIHsKICAgICBBWFRSQUNFKCJBWE9iamVjdENhY2hlOjp1cGRhdGVJc29s YXRlZFRyZWUiKTsKLQotICAgIGlmICghaXNJc29sYXRlZFRyZWVFbmFibGVkKCkpCi0gICAgICAg IHJldHVybjsKLQogICAgIEFYTE9HKHN0ZDo6bWFrZV9wYWlyKCZvYmplY3QsIG5vdGlmaWNhdGlv bikpOwogICAgIEFYTE9HKCp0aGlzKTsKIAotICAgIGlmICghbV9wYWdlSUQgfHwgb2JqZWN0Lm9i amVjdElEKCkgPT0gSW52YWxpZEFYSUQpCisgICAgaWYgKCFtX3BhZ2VJRCB8fCBvYmplY3Qub2Jq ZWN0SUQoKSA9PSBJbnZhbGlkQVhJRCkgeworICAgICAgICBBWExPRygiTm8gcGFnZUlEIG9yIG9i amVjdElEIik7CiAgICAgICAgIHJldHVybjsKKyAgICB9CiAKICAgICBhdXRvIHRyZWUgPSBBWElz b2xhdGVkVHJlZTo6dHJlZUZvclBhZ2VJRCgqbV9wYWdlSUQpOwotICAgIGlmICghdHJlZSkKKyAg ICBpZiAoIXRyZWUpIHsKKyAgICAgICAgQVhMT0coIk5vIGlzb2xhdGVkIHRyZWUgZm9yIG1fcGFn ZUlELiIpOwogICAgICAgICByZXR1cm47CisgICAgfQogCiAgICAgc3dpdGNoIChub3RpZmljYXRp b24pIHsKICAgICBjYXNlIEFYQ2hlY2tlZFN0YXRlQ2hhbmdlZDoKQEAgLTMxNjUsNiArMzE3Niwz MSBAQCB2b2lkIEFYT2JqZWN0Q2FjaGU6OnVwZGF0ZUlzb2xhdGVkVHJlZShBWENvcmVPYmplY3Qm IG9iamVjdCwgQVhOb3RpZmljYXRpb24gbm90aQogICAgIH0KIH0KIAordm9pZCBBWE9iamVjdENh Y2hlOjp1cGRhdGVJc29sYXRlZFRyZWUoQVhDb3JlT2JqZWN0JiBvYmplY3QsIEFYTG9hZGluZ0V2 ZW50IG5vdGlmaWNhdGlvbikKK3sKKyAgICBBWFRSQUNFKCJBWE9iamVjdENhY2hlOjp1cGRhdGVJ c29sYXRlZFRyZWUiKTsKKyAgICBBWExPRygqdGhpcyk7CisKKyAgICBpZiAoIW1fcGFnZUlEIHx8 IG9iamVjdC5vYmplY3RJRCgpID09IEludmFsaWRBWElEKSB7CisgICAgICAgIEFYTE9HKCJObyBw YWdlSUQgb3Igb2JqZWN0SUQuIik7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBhdXRv IHRyZWUgPSBBWElzb2xhdGVkVHJlZTo6dHJlZUZvclBhZ2VJRCgqbV9wYWdlSUQpOworICAgIGlm ICghdHJlZSkgeworICAgICAgICBBWExPRygiTm8gaXNvbGF0ZWQgdHJlZSBmb3IgbV9wYWdlSUQi KTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKworICAgIHN3aXRjaCAobm90aWZpY2F0aW9uKSB7 CisgICAgY2FzZSBBWExvYWRpbmdGaW5pc2hlZDoKKyAgICAgICAgdHJlZS0+dXBkYXRlU3VidHJl ZShvYmplY3QpOworICAgICAgICBicmVhazsKKyAgICBkZWZhdWx0OgorICAgICAgICBicmVhazsK KyAgICB9Cit9CisKIC8vIEZJWE1FOiBzaG91bGQgYmUgYWRkZWQgdG8gV1RGOjpWZWN0b3IuCiB0 ZW1wbGF0ZTx0eXBlbmFtZSBULCB0eXBlbmFtZSBGPgogc3RhdGljIGJvb2wgYXBwZW5kSWZOb3RD b250YWluc01hdGNoaW5nKFZlY3RvcjxUPiYgdmVjdG9yLCBjb25zdCBUJiB2YWx1ZSwgRiBtYXRj aGVzKQpAQCAtMzE3OCwxOCArMzIxNCwxOCBAQCBzdGF0aWMgYm9vbCBhcHBlbmRJZk5vdENvbnRh aW5zTWF0Y2hpbmcoVmVjdG9yPFQ+JiB2ZWN0b3IsIGNvbnN0IFQmIHZhbHVlLCBGIG1hdAogdm9p ZCBBWE9iamVjdENhY2hlOjp1cGRhdGVJc29sYXRlZFRyZWUoY29uc3QgVmVjdG9yPHN0ZDo6cGFp cjxSZWZQdHI8QVhDb3JlT2JqZWN0PiwgQVhOb3RpZmljYXRpb24+PiYgbm90aWZpY2F0aW9ucykK IHsKICAgICBBWFRSQUNFKCJBWE9iamVjdENhY2hlOjp1cGRhdGVJc29sYXRlZFRyZWUiKTsKLQot ICAgIGlmICghaXNJc29sYXRlZFRyZWVFbmFibGVkKCkpCi0gICAgICAgIHJldHVybjsKLQogICAg IEFYTE9HKCp0aGlzKTsKIAotICAgIGlmICghbV9wYWdlSUQpCisgICAgaWYgKCFtX3BhZ2VJRCkg eworICAgICAgICBBWExPRygiTm8gcGFnZUlELiIpOwogICAgICAgICByZXR1cm47CisgICAgfQog CiAgICAgYXV0byB0cmVlID0gQVhJc29sYXRlZFRyZWU6OnRyZWVGb3JQYWdlSUQoKm1fcGFnZUlE KTsKLSAgICBpZiAoIXRyZWUpCisgICAgaWYgKCF0cmVlKSB7CisgICAgICAgIEFYTE9HKCJObyBp c29sYXRlZCB0cmVlIGZvciBtX3BhZ2VJRCIpOwogICAgICAgICByZXR1cm47CisgICAgfQogCiAg ICAgLy8gRmlsdGVyIG91dCBtdWx0aXBsZSBub3RpZmljYXRpb25zIGZvciB0aGUgc2FtZSBvYmpl Y3QuIFRoaXMgYXZvaWRzCiAgICAgLy8gdXBkYXRpbmcgdGhlIGlzb2xhdGVkIHRyZWUgbXVsdGlw bGUgdGltZXMgdW5uZWNlc3NhcmlseS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vz c2liaWxpdHkvQVhPYmplY3RDYWNoZS5oIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9B WE9iamVjdENhY2hlLmgKaW5kZXggMjQzMTQwZWI1N2YzOThiNGZlOTA3OGI3N2MxYzkxNjMzOGVi NzNlZi4uNGY0M2Y2MzhiODEzNDc1YWIzMGNiMThjMzU0YmI3NTdlMGQ5Njk0ZCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWE9iamVjdENhY2hlLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWE9iamVjdENhY2hlLmgKQEAgLTM3MCw2ICszNzAs NyBAQCBwcml2YXRlOgogICAgIHN0YXRpYyBSZWY8QVhJc29sYXRlZFRyZWU+IGdlbmVyYXRlSXNv bGF0ZWRUcmVlKFBhZ2VJZGVudGlmaWVyLCBEb2N1bWVudCYpOwogICAgIFJlZlB0cjxBWElzb2xh dGVkVHJlZT4gZ2V0T3JDcmVhdGVJc29sYXRlZFRyZWUoKSBjb25zdDsKICAgICB2b2lkIHVwZGF0 ZUlzb2xhdGVkVHJlZShBWENvcmVPYmplY3QmLCBBWE5vdGlmaWNhdGlvbik7CisgICAgdm9pZCB1 cGRhdGVJc29sYXRlZFRyZWUoQVhDb3JlT2JqZWN0JiwgQVhMb2FkaW5nRXZlbnQpOwogICAgIHZv aWQgdXBkYXRlSXNvbGF0ZWRUcmVlKGNvbnN0IFZlY3RvcjxzdGQ6OnBhaXI8UmVmUHRyPEFYQ29y ZU9iamVjdD4sIEFYTm90aWZpY2F0aW9uPj4mKTsKICAgICBzdGF0aWMgdm9pZCBpbml0aWFsaXpl U2Vjb25kYXJ5QVhUaHJlYWQoKTsKICNlbmRpZgo= 405064 2020-07-23 12:03:29 -0700 2020-07-23 13:00:47 -0700 Patch bug-214692-20200723150328.patch text/plain 6578 andresg_22 U3VidmVyc2lvbiBSZXZpc2lvbjogMjY0NDcxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWJlZjQ2NDUwOTZlMjIz YTUyZWE3NTJhNzNlZTNkNGViZDUxYjE3MC4uZWYzNjQxMWE2MDM2NzZlNjU3YWY4YTM2M2JjOGVh ZmQ5ZjU0Njc4NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDIwLTA3LTIzICBBbmRy ZXMgR29uemFsZXogIDxhbmRyZXNnXzIyQGFwcGxlLmNvbT4KKworICAgICAgICBVcGRhdGUgdGhl IGlzb2xhdGVkIHRyZWUgZXZlbiB3aGVuIHRoZXJlIGlzIG5vIGNsaWVudCByZXF1ZXN0LgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE0NjkyCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQVhPYmplY3RDYWNo ZTo6dXBkYXRlSXNvbGF0ZWRUcmVlIHdhcyBjaGVja2luZyBmb3IgaXNJc29sYXRlZFRyZWVFbmFi bGVkLAorICAgICAgICB3aGljaCBpbiB0dXJuIGNoZWNrcyBmb3Igd2hldGhlciB0aGUgY2xpZW50 U3VwcG9ydHNJc29sYXRlZFRyZWUuIE9mdGVuCisgICAgICAgIGF0IHRoZSB0aW1lIHVwZGF0ZUlz b2xhdGVkVHJlZSBpcyBjYWxsZWQsIHRoZXJlIGlzIG5vIGNsaWVudCByZXF1ZXN0CisgICAgICAg IHNpbmNlIGNsaWVudCByZXF1ZXN0cyBhbmQgdXBkYXRlcyBvY2N1ciBpbiBzZXBhcmF0ZSB0aHJl YWRzLAorICAgICAgICBpbmRlcGVuZGVudGx5IGZyb20gZWFjaCBvdGhlci4gVGh1cyB0aGUgaXNv bGF0ZWQgdHJlZSB3YXNuJ3QgYmVpbmcKKyAgICAgICAgdXBkYXRlZC4gVGhpcyBwYXRjaCByZW1v dmVzIHRoZSBjaGVjayBmb3IgaXNJc29sYXRlZFRyZWVFbmFibGVkIGFuZCByZWx5CisgICAgICAg IG9uIHRoZSBwcmVzZW5jZSBvZiBhbiBpc29sYXRlZCB0cmVlIGZvciB0aGUgZ2l2ZW4gUGFnZUlE IHRvIHBlcmZvcm0gdGhlCisgICAgICAgIHVwZGF0ZS4KKyAgICAgICAgSW4gYWRkaXRpb24sIGFk ZGVkIGFuIHVwZGF0ZSBvZiB0aGUgaXNvbGF0ZWQgdHJlZSBmb3IgQVhMb2FkaW5nRXZlbnQ6OkFY TG9hZGluZ0ZpbmlzaGVkLgorICAgICAgICBUaGlzIGZpeGVzIHNldmVyYWwgaW5zdGFuY2Ugb2Yg ZHluYW1pYyBjb250ZW50IHBhZ2UgY2hhbmdlcyB0aGF0IHdlcmUKKyAgICAgICAgbm90IGJlaW5n IHJlZmxlY3RlZCBvbiB0aGUgaXNvbGF0ZWQgdHJlZS4KKworICAgICAgICAqIGFjY2Vzc2liaWxp dHkvQVhPYmplY3RDYWNoZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpBWE9iamVjdENhY2hlOjpj bGllbnRTdXBwb3J0c0lzb2xhdGVkVHJlZSk6IFNvbWUgbG9nZ2luZy4KKyAgICAgICAgKFdlYkNv cmU6OkFYT2JqZWN0Q2FjaGU6OmlzSXNvbGF0ZWRUcmVlRW5hYmxlZCk6IFNvbWUgbG9nZ2luZy4K KyAgICAgICAgKFdlYkNvcmU6OkFYT2JqZWN0Q2FjaGU6OmZyYW1lTG9hZGluZ0V2ZW50Tm90aWZp Y2F0aW9uKTogQ2FsbHMgdXBkYXRlSXNvbGF0ZWRUcmVlLgorICAgICAgICAoV2ViQ29yZTo6QVhP YmplY3RDYWNoZTo6dXBkYXRlSXNvbGF0ZWRUcmVlKTogSGFuZGxlcyBBWExvYWRpbmdFdmVudHMu CisgICAgICAgICogYWNjZXNzaWJpbGl0eS9BWE9iamVjdENhY2hlLmg6CisKIDIwMjAtMDctMTYg IFBlbmcgTGl1ICA8cGVuZy5saXU2QGFwcGxlLmNvbT4KIAogICAgICAgICBEb3VibGUgdGFwcGlu ZyB0byB6b29tIG91dCBhIGZ1bGxzY3JlZW4gdmlkZW8gd2lsbCB6b29tIGluIHNsaWdodGx5IGJl Zm9yZSB6b29taW5nIG91dApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0 eS9BWE9iamVjdENhY2hlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhPYmpl Y3RDYWNoZS5jcHAKaW5kZXggZDgwMDRlMzFhOGE2NTgzZjkzNTQ5ZTU3MDE4MGQ3Nzg1NDE4MjQz Yy4uMjI0MDQyNDMwNzZkZTRhZDMwOWVmOWRkMDUzYjk3MTM2YWQ3MWRhMiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWE9iamVjdENhY2hlLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FYT2JqZWN0Q2FjaGUuY3BwCkBAIC03MDAsMTkgKzcw MCwyNSBAQCBBY2Nlc3NpYmlsaXR5T2JqZWN0KiBBWE9iamVjdENhY2hlOjpnZXRPckNyZWF0ZShS ZW5kZXJPYmplY3QqIHJlbmRlcmVyKQogI2lmIEVOQUJMRShBQ0NFU1NJQklMSVRZX0lTT0xBVEVE X1RSRUUpCiBib29sIEFYT2JqZWN0Q2FjaGU6OmNsaWVudFN1cHBvcnRzSXNvbGF0ZWRUcmVlKCkK IHsKKyAgICBBWFRSQUNFKCJBWE9iamVjdENhY2hlOjpjbGllbnRTdXBwb3J0c0lzb2xhdGVkVHJl ZSIpOworCiAgICAgaWYgKCFSdW50aW1lRW5hYmxlZEZlYXR1cmVzOjpzaGFyZWRGZWF0dXJlcygp LmlzQWNjZXNzaWJpbGl0eUlzb2xhdGVkVHJlZUVuYWJsZWQoKSkKICAgICAgICAgcmV0dXJuIGZh bHNlOwogCisgICAgQVhMT0cobWFrZVN0cmluZygiX0FYR2V0Q2xpZW50Rm9yQ3VycmVudFJlcXVl c3RVbnRydXN0ZWQgPSAiLCBzdGF0aWNfY2FzdDx1bnNpZ25lZD4oX0FYR2V0Q2xpZW50Rm9yQ3Vy cmVudFJlcXVlc3RVbnRydXN0ZWQoKSkpKTsKICAgICByZXR1cm4gX0FYR2V0Q2xpZW50Rm9yQ3Vy cmVudFJlcXVlc3RVbnRydXN0ZWQoKSA9PSBrQVhDbGllbnRUeXBlVm9pY2VPdmVyOwogfQogCiBi b29sIEFYT2JqZWN0Q2FjaGU6OmlzSXNvbGF0ZWRUcmVlRW5hYmxlZCgpCiB7CisgICAgQVhUUkFD RSgiQVhPYmplY3RDYWNoZTo6aXNJc29sYXRlZFRyZWVFbmFibGVkIik7CisKICAgICBpZiAoVU5M SUtFTFkoX0FYR2V0Q2xpZW50Rm9yQ3VycmVudFJlcXVlc3RVbnRydXN0ZWQoKSA9PSBrQVhDbGll bnRUeXBlV2ViS2l0VGVzdGluZykpCiAgICAgICAgIHJldHVybiB0cnVlOwogCiAgICAgLy8gSWYg aXNvbGF0ZWQgdHJlZSBtb2RlIGlzIG9uLCByZXR1cm4gdHJ1ZSB3aGV0aGVyIHRoZSBjbGllbnQg c3VwcG9ydHMKICAgICAvLyBpc29sYXRlZCB0cmVlIG1vZGUgb3IgdGhlIGNhbGwgaXMgb2ZmIG9m IHRoZSBtYWluIHRocmVhZC4KKyAgICBBWExPRyhtYWtlU3RyaW5nKCJfQVhTSXNvbGF0ZWRUcmVl TW9kZSA9ICIsIF9BWFNJc29sYXRlZFRyZWVNb2RlRnVuY3Rpb25Jc0F2YWlsYWJsZSgpID8gX0FY U0lzb2xhdGVkVHJlZU1vZGVfU29mdCgpIDogMCkpOwogICAgIHJldHVybiBfQVhTSXNvbGF0ZWRU cmVlTW9kZUZ1bmN0aW9uSXNBdmFpbGFibGUoKSAmJiBfQVhTSXNvbGF0ZWRUcmVlTW9kZV9Tb2Z0 KCkgIT0gQVhTSXNvbGF0ZWRUcmVlTW9kZU9mZgogICAgICAgICAmJiAoIWlzTWFpblRocmVhZCgp IHx8IGNsaWVudFN1cHBvcnRzSXNvbGF0ZWRUcmVlKCkpOwogfQpAQCAtMTU0MCw2ICsxNTQ2LDEx IEBAIHZvaWQgQVhPYmplY3RDYWNoZTo6ZnJhbWVMb2FkaW5nRXZlbnROb3RpZmljYXRpb24oRnJh bWUqIGZyYW1lLCBBWExvYWRpbmdFdmVudCBsCiAgICAgICAgIHJldHVybjsKIAogICAgIEFjY2Vz c2liaWxpdHlPYmplY3QqIG9iaiA9IGdldE9yQ3JlYXRlKGNvbnRlbnRSZW5kZXJlcik7CisKKyNp ZiBFTkFCTEUoQUNDRVNTSUJJTElUWV9JU09MQVRFRF9UUkVFKQorICAgIHVwZGF0ZUlzb2xhdGVk VHJlZSgqb2JqLCBsb2FkaW5nRXZlbnQpOworI2VuZGlmCisKICAgICBmcmFtZUxvYWRpbmdFdmVu dFBsYXRmb3JtTm90aWZpY2F0aW9uKG9iaiwgbG9hZGluZ0V2ZW50KTsKIH0KIApAQCAtMzEzNywx OSArMzE0OCwxOSBAQCBSZWY8QVhJc29sYXRlZFRyZWU+IEFYT2JqZWN0Q2FjaGU6OmdlbmVyYXRl SXNvbGF0ZWRUcmVlKFBhZ2VJZGVudGlmaWVyIHBhZ2VJRCwgRAogdm9pZCBBWE9iamVjdENhY2hl Ojp1cGRhdGVJc29sYXRlZFRyZWUoQVhDb3JlT2JqZWN0JiBvYmplY3QsIEFYTm90aWZpY2F0aW9u IG5vdGlmaWNhdGlvbikKIHsKICAgICBBWFRSQUNFKCJBWE9iamVjdENhY2hlOjp1cGRhdGVJc29s YXRlZFRyZWUiKTsKLQotICAgIGlmICghaXNJc29sYXRlZFRyZWVFbmFibGVkKCkpCi0gICAgICAg IHJldHVybjsKLQogICAgIEFYTE9HKHN0ZDo6bWFrZV9wYWlyKCZvYmplY3QsIG5vdGlmaWNhdGlv bikpOwogICAgIEFYTE9HKCp0aGlzKTsKIAotICAgIGlmICghbV9wYWdlSUQgfHwgb2JqZWN0Lm9i amVjdElEKCkgPT0gSW52YWxpZEFYSUQpCisgICAgaWYgKCFtX3BhZ2VJRCB8fCBvYmplY3Qub2Jq ZWN0SUQoKSA9PSBJbnZhbGlkQVhJRCkgeworICAgICAgICBBWExPRygiTm8gcGFnZUlEIG9yIG9i amVjdElEIik7CiAgICAgICAgIHJldHVybjsKKyAgICB9CiAKICAgICBhdXRvIHRyZWUgPSBBWElz b2xhdGVkVHJlZTo6dHJlZUZvclBhZ2VJRCgqbV9wYWdlSUQpOwotICAgIGlmICghdHJlZSkKKyAg ICBpZiAoIXRyZWUpIHsKKyAgICAgICAgQVhMT0coIk5vIGlzb2xhdGVkIHRyZWUgZm9yIG1fcGFn ZUlELiIpOwogICAgICAgICByZXR1cm47CisgICAgfQogCiAgICAgc3dpdGNoIChub3RpZmljYXRp b24pIHsKICAgICBjYXNlIEFYQ2hlY2tlZFN0YXRlQ2hhbmdlZDoKQEAgLTMxNjUsNiArMzE3Niwx MyBAQCB2b2lkIEFYT2JqZWN0Q2FjaGU6OnVwZGF0ZUlzb2xhdGVkVHJlZShBWENvcmVPYmplY3Qm IG9iamVjdCwgQVhOb3RpZmljYXRpb24gbm90aQogICAgIH0KIH0KIAordm9pZCBBWE9iamVjdENh Y2hlOjp1cGRhdGVJc29sYXRlZFRyZWUoQVhDb3JlT2JqZWN0JiBvYmplY3QsIEFYTG9hZGluZ0V2 ZW50IG5vdGlmaWNhdGlvbikKK3sKKyAgICBBWFRSQUNFKCJBWE9iamVjdENhY2hlOjp1cGRhdGVJ c29sYXRlZFRyZWUiKTsKKyAgICBpZiAobm90aWZpY2F0aW9uID09IEFYTG9hZGluZ0ZpbmlzaGVk KQorICAgICAgICB1cGRhdGVJc29sYXRlZFRyZWUob2JqZWN0LCBBWENoaWxkcmVuQ2hhbmdlZCk7 Cit9CisKIC8vIEZJWE1FOiBzaG91bGQgYmUgYWRkZWQgdG8gV1RGOjpWZWN0b3IuCiB0ZW1wbGF0 ZTx0eXBlbmFtZSBULCB0eXBlbmFtZSBGPgogc3RhdGljIGJvb2wgYXBwZW5kSWZOb3RDb250YWlu c01hdGNoaW5nKFZlY3RvcjxUPiYgdmVjdG9yLCBjb25zdCBUJiB2YWx1ZSwgRiBtYXRjaGVzKQpA QCAtMzE3OCwxOCArMzE5NiwxOCBAQCBzdGF0aWMgYm9vbCBhcHBlbmRJZk5vdENvbnRhaW5zTWF0 Y2hpbmcoVmVjdG9yPFQ+JiB2ZWN0b3IsIGNvbnN0IFQmIHZhbHVlLCBGIG1hdAogdm9pZCBBWE9i amVjdENhY2hlOjp1cGRhdGVJc29sYXRlZFRyZWUoY29uc3QgVmVjdG9yPHN0ZDo6cGFpcjxSZWZQ dHI8QVhDb3JlT2JqZWN0PiwgQVhOb3RpZmljYXRpb24+PiYgbm90aWZpY2F0aW9ucykKIHsKICAg ICBBWFRSQUNFKCJBWE9iamVjdENhY2hlOjp1cGRhdGVJc29sYXRlZFRyZWUiKTsKLQotICAgIGlm ICghaXNJc29sYXRlZFRyZWVFbmFibGVkKCkpCi0gICAgICAgIHJldHVybjsKLQogICAgIEFYTE9H KCp0aGlzKTsKIAotICAgIGlmICghbV9wYWdlSUQpCisgICAgaWYgKCFtX3BhZ2VJRCkgeworICAg ICAgICBBWExPRygiTm8gcGFnZUlELiIpOwogICAgICAgICByZXR1cm47CisgICAgfQogCiAgICAg YXV0byB0cmVlID0gQVhJc29sYXRlZFRyZWU6OnRyZWVGb3JQYWdlSUQoKm1fcGFnZUlEKTsKLSAg ICBpZiAoIXRyZWUpCisgICAgaWYgKCF0cmVlKSB7CisgICAgICAgIEFYTE9HKCJObyBpc29sYXRl ZCB0cmVlIGZvciBtX3BhZ2VJRCIpOwogICAgICAgICByZXR1cm47CisgICAgfQogCiAgICAgLy8g RmlsdGVyIG91dCBtdWx0aXBsZSBub3RpZmljYXRpb25zIGZvciB0aGUgc2FtZSBvYmplY3QuIFRo aXMgYXZvaWRzCiAgICAgLy8gdXBkYXRpbmcgdGhlIGlzb2xhdGVkIHRyZWUgbXVsdGlwbGUgdGlt ZXMgdW5uZWNlc3NhcmlseS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxp dHkvQVhPYmplY3RDYWNoZS5oIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWE9iamVj dENhY2hlLmgKaW5kZXggMjQzMTQwZWI1N2YzOThiNGZlOTA3OGI3N2MxYzkxNjMzOGViNzNlZi4u NGY0M2Y2MzhiODEzNDc1YWIzMGNiMThjMzU0YmI3NTdlMGQ5Njk0ZCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWE9iamVjdENhY2hlLmgKKysrIGIvU291cmNlL1dl YkNvcmUvYWNjZXNzaWJpbGl0eS9BWE9iamVjdENhY2hlLmgKQEAgLTM3MCw2ICszNzAsNyBAQCBw cml2YXRlOgogICAgIHN0YXRpYyBSZWY8QVhJc29sYXRlZFRyZWU+IGdlbmVyYXRlSXNvbGF0ZWRU cmVlKFBhZ2VJZGVudGlmaWVyLCBEb2N1bWVudCYpOwogICAgIFJlZlB0cjxBWElzb2xhdGVkVHJl ZT4gZ2V0T3JDcmVhdGVJc29sYXRlZFRyZWUoKSBjb25zdDsKICAgICB2b2lkIHVwZGF0ZUlzb2xh dGVkVHJlZShBWENvcmVPYmplY3QmLCBBWE5vdGlmaWNhdGlvbik7CisgICAgdm9pZCB1cGRhdGVJ c29sYXRlZFRyZWUoQVhDb3JlT2JqZWN0JiwgQVhMb2FkaW5nRXZlbnQpOwogICAgIHZvaWQgdXBk YXRlSXNvbGF0ZWRUcmVlKGNvbnN0IFZlY3RvcjxzdGQ6OnBhaXI8UmVmUHRyPEFYQ29yZU9iamVj dD4sIEFYTm90aWZpY2F0aW9uPj4mKTsKICAgICBzdGF0aWMgdm9pZCBpbml0aWFsaXplU2Vjb25k YXJ5QVhUaHJlYWQoKTsKICNlbmRpZgo=