236273 2022-02-07 16:53:22 -0800 AX: When updating the isolated tree with a remove and add of the same object, the wrapper is not re-attached 2022-02-08 08:09:23 -0800 1 1 1 Unclassified WebKit Accessibility WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 tyler_w tyler_w aboxhall andresg_22 apinheiro cfleizach dmazzoni ews-watchlist jcraig jdiggs samuel_white webkit-bug-importer oldest_to_newest 1838434 0 tyler_w 2022-02-07 16:53:22 -0800 In AXIsolatedTree::applyPendingChanges, we process node and subtree removals before tree additions. When doing these removals, we detach the object and wrapper from each other. This is fine unless that same object is slated to be added again (e.g. it was moved in the DOM), as we don't always re-attach a wrapper. [WebAccessibilityObjectWrapperBase axBackingObject] will always return nil for objects in this state. 1838435 1 webkit-bug-importer 2022-02-07 16:53:36 -0800 <rdar://problem/88601894> 1838436 2 451175 tyler_w 2022-02-07 17:00:41 -0800 Created attachment 451175 Patch 1838476 3 andresg_22 2022-02-07 18:20:25 -0800 (In reply to Tyler Wilcock from comment #2) > Created attachment 451175 [details] > Patch - if (!item.isolatedObject->wrapper()) { - // The new object hasn't been attached a wrapper yet, so attach it. + // If the new object hasn't been attached to a wrapper yet, or if it was detached from + // the wrapper when processing removals above, we must attach / re-attach it. + if (!item.isolatedObject->wrapper() || detachedObjectIDs.contains(axID)) item.isolatedObject->attachPlatformWrapper(wrapper.get()); Good catch! I think though that it would be a better solution to check for whether the wrapper has an isolatedObject, and if not, attach the isolated object to the wrapper, instead of creating this new collection and looking up the AXID. 1838515 4 451204 tyler_w 2022-02-07 20:53:40 -0800 Created attachment 451204 Patch 1838521 5 451206 tyler_w 2022-02-07 21:10:54 -0800 Created attachment 451206 Patch 1838629 6 ews-feeder 2022-02-08 05:26:30 -0800 Committed r289368 (246956@main): <https://commits.webkit.org/246956@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 451206. 451175 2022-02-07 17:00:41 -0800 2022-02-07 20:53:37 -0800 Patch bug-236273-20220207190040.patch text/plain 3615 tyler_w U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5MTEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDllNTM0N2ViNjhiMzU2 NGVlNDUwZGJmNzI0Y2VkMDVhNTA5MWMxZi4uNjkzOGNlNzQ2NTRkYzY2OGEzODg4ZjA3ZWI5N2Y5 ZGU3NDMwZGVkNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDIyLTAyLTA3ICBUeWxl ciBXaWxjb2NrICA8dHlsZXJfd0BhcHBsZS5jb20+CisKKyAgICAgICAgQVg6IFdoZW4gdXBkYXRp bmcgdGhlIGlzb2xhdGVkIHRyZWUgd2l0aCBhIHJlbW92ZSBhbmQgYWRkIG9mIHRoZSBzYW1lIG9i amVjdCwgdGhlIHdyYXBwZXIgaXMgbm90IHJlLWF0dGFjaGVkCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzYyNzMKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbiBBWElzb2xhdGVkVHJlZTo6YXBwbHlQZW5k aW5nQ2hhbmdlcywgd2UgcHJvY2VzcyBub2RlIGFuZCBzdWJ0cmVlCisgICAgICAgIHJlbW92YWxz IGJlZm9yZSB0cmVlIGFkZGl0aW9ucy4gV2hlbiBkb2luZyB0aGVzZSByZW1vdmFscywgd2UgZGV0 YWNoCisgICAgICAgIHRoZSBvYmplY3QgYW5kIHdyYXBwZXIgZnJvbSBlYWNoIG90aGVyLiBUaGlz IGlzIGZpbmUgdW5sZXNzIHRoYXQgc2FtZQorICAgICAgICBvYmplY3QgaXMgc2xhdGVkIHRvIGJl IGFkZGVkIGFnYWluIChlLmcuIGl0IHdhcyBtb3ZlZCBpbiB0aGUgRE9NKSwgYXMKKyAgICAgICAg d2UgZG9uJ3QgYWx3YXlzIHJlLWF0dGFjaCBhIHdyYXBwZXIuIFtXZWJBY2Nlc3NpYmlsaXR5T2Jq ZWN0V3JhcHBlckJhc2UgYXhCYWNraW5nT2JqZWN0XQorICAgICAgICB3aWxsIGFsd2F5cyByZXR1 cm4gbmlsIGZvciBvYmplY3RzIGluIHRoaXMgc3RhdGUuCisKKyAgICAgICAgVGhpcyBwYXRjaCBm aXhlcyB0aGlzIGJ5IGtlZXBpbmcgdHJhY2sgb2YgdGhlIG9iamVjdHMgd2UndmUgZGV0YWNoZWQK KyAgICAgICAgYW5kIHJlLWF0dGFjaGluZyB0aGVtIHdoZW4gcHJvY2Vzc2luZyBtX3BlbmRpbmdB cHBlbmRzLgorCisgICAgICAgIEZpeGVzIH4xNSB0ZXN0cyBpbiBpc29sYXRlZCB0cmVlIG1vZGUu CisKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZS5j cHA6CisgICAgICAgIChXZWJDb3JlOjpBWElzb2xhdGVkVHJlZTo6YXBwbHlQZW5kaW5nQ2hhbmdl cyk6CisKIDIwMjItMDItMDQgIEFsZWphbmRybyBHLiBDYXN0cm8gIDxhbGV4QGlnYWxpYS5jb20+ CiAKICAgICAgICAgW0dUS11bV1BFXSBVc2UgYSBWZWN0b3Igd2hlbiBkZWZpbmluZyB0aGUgRUdM SW1hZ2UgYXR0cmlidXRlcyBpbiB0aGUgY3JlYXRlSW1hZ2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmNw cAppbmRleCA1YThmMmM5MjhhY2EwZWFjYjMzNDBjZDhmNzc4NzFkMmVlMWU3YWQ4Li5jODZjMjFk NGFlOGQwY2NmZmZjZGY5ZDRhMTJmNjgxMjgwN2I3MDc2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZS5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUu Y3BwCkBAIC01MjYsMTAgKzUyNiwxMiBAQCB2b2lkIEFYSXNvbGF0ZWRUcmVlOjphcHBseVBlbmRp bmdDaGFuZ2VzKCkKICAgICAgICAgbV9mb2N1c2VkTm9kZUlEID0gbV9wZW5kaW5nRm9jdXNlZE5v ZGVJRDsKICAgICB9CiAKKyAgICBIYXNoU2V0PEFYSUQ+IGRldGFjaGVkT2JqZWN0SURzOwogICAg IHdoaWxlIChtX3BlbmRpbmdOb2RlUmVtb3ZhbHMuc2l6ZSgpKSB7CiAgICAgICAgIGF1dG8gYXhJ RCA9IG1fcGVuZGluZ05vZGVSZW1vdmFscy50YWtlTGFzdCgpOwogICAgICAgICBBWExPRyhtYWtl U3RyaW5nKCJyZW1vdmluZyBheElEICIsIGF4SUQubG9nZ2luZ1N0cmluZygpKSk7CiAgICAgICAg IGlmIChhdXRvIG9iamVjdCA9IG5vZGVGb3JJRChheElEKSkgeworICAgICAgICAgICAgZGV0YWNo ZWRPYmplY3RJRHMuYWRkKGF4SUQpOwogICAgICAgICAgICAgb2JqZWN0LT5kZXRhY2goQWNjZXNz aWJpbGl0eURldGFjaG1lbnRUeXBlOjpFbGVtZW50RGVzdHJveWVkKTsKICAgICAgICAgICAgIG1f cmVhZGVyVGhyZWFkTm9kZU1hcC5yZW1vdmUoYXhJRCk7CiAgICAgICAgIH0KQEAgLTUzOSw2ICs1 NDEsNyBAQCB2b2lkIEFYSXNvbGF0ZWRUcmVlOjphcHBseVBlbmRpbmdDaGFuZ2VzKCkKICAgICAg ICAgYXV0byBheElEID0gbV9wZW5kaW5nU3VidHJlZVJlbW92YWxzLnRha2VMYXN0KCk7CiAgICAg ICAgIEFYTE9HKG1ha2VTdHJpbmcoInJlbW92aW5nIHN1YnRyZWUgYXhJRCAiLCBheElELmxvZ2dp bmdTdHJpbmcoKSkpOwogICAgICAgICBpZiAoYXV0byBvYmplY3QgPSBub2RlRm9ySUQoYXhJRCkp IHsKKyAgICAgICAgICAgIGRldGFjaGVkT2JqZWN0SURzLmFkZChheElEKTsKICAgICAgICAgICAg IG9iamVjdC0+ZGV0YWNoKEFjY2Vzc2liaWxpdHlEZXRhY2htZW50VHlwZTo6RWxlbWVudERlc3Ry b3llZCk7CiAgICAgICAgICAgICBtX3BlbmRpbmdTdWJ0cmVlUmVtb3ZhbHMuYXBwZW5kVmVjdG9y KG9iamVjdC0+bV9jaGlsZHJlbklEcyk7CiAgICAgICAgICAgICBtX3JlYWRlclRocmVhZE5vZGVN YXAucmVtb3ZlKGF4SUQpOwpAQCAtNTY3LDEwICs1NzAsMTAgQEAgdm9pZCBBWElzb2xhdGVkVHJl ZTo6YXBwbHlQZW5kaW5nQ2hhbmdlcygpCiAgICAgICAgICAgICBtX3JlYWRlclRocmVhZE5vZGVN YXAucmVtb3ZlKGF4SUQpOwogICAgICAgICB9CiAKLSAgICAgICAgaWYgKCFpdGVtLmlzb2xhdGVk T2JqZWN0LT53cmFwcGVyKCkpIHsKLSAgICAgICAgICAgIC8vIFRoZSBuZXcgb2JqZWN0IGhhc24n dCBiZWVuIGF0dGFjaGVkIGEgd3JhcHBlciB5ZXQsIHNvIGF0dGFjaCBpdC4KKyAgICAgICAgLy8g SWYgdGhlIG5ldyBvYmplY3QgaGFzbid0IGJlZW4gYXR0YWNoZWQgdG8gYSB3cmFwcGVyIHlldCwg b3IgaWYgaXQgd2FzIGRldGFjaGVkIGZyb20KKyAgICAgICAgLy8gdGhlIHdyYXBwZXIgd2hlbiBw cm9jZXNzaW5nIHJlbW92YWxzIGFib3ZlLCB3ZSBtdXN0IGF0dGFjaCAvIHJlLWF0dGFjaCBpdC4K KyAgICAgICAgaWYgKCFpdGVtLmlzb2xhdGVkT2JqZWN0LT53cmFwcGVyKCkgfHwgZGV0YWNoZWRP YmplY3RJRHMuY29udGFpbnMoYXhJRCkpCiAgICAgICAgICAgICBpdGVtLmlzb2xhdGVkT2JqZWN0 LT5hdHRhY2hQbGF0Zm9ybVdyYXBwZXIod3JhcHBlci5nZXQoKSk7Ci0gICAgICAgIH0KIAogICAg ICAgICBhdXRvIGFkZFJlc3VsdCA9IG1fcmVhZGVyVGhyZWFkTm9kZU1hcC5hZGQoYXhJRCwgaXRl bS5pc29sYXRlZE9iamVjdC5nZXQoKSk7CiAgICAgICAgIC8vIFRoZSBuZXdseSBhZGRlZCBvYmpl Y3QgbXVzdCBoYXZlIGEgd3JhcHBlci4K 451204 2022-02-07 20:53:40 -0800 2022-02-07 21:10:50 -0800 Patch bug-236273-20220207225339.patch text/plain 4254 tyler_w U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5MzU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGFlN2Q0ZWY4OGNlMmMx ZmU3OTljNTMwYmU0OWMxZWJjMzc4MDlhMy4uYWJjMDA2MzYzNmIzNjViODE1ZGNmMmY3Y2E3NzRm MDllY2M4N2MwYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDIyLTAyLTA3ICBUeWxl ciBXaWxjb2NrICA8dHlsZXJfd0BhcHBsZS5jb20+CisKKyAgICAgICAgQVg6IFdoZW4gdXBkYXRp bmcgdGhlIGlzb2xhdGVkIHRyZWUgd2l0aCBhIHJlbW92ZSBhbmQgYWRkIG9mIHRoZSBzYW1lIG9i amVjdCwgdGhlIHdyYXBwZXIgaXMgbm90IHJlLWF0dGFjaGVkCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzYyNzMKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbiBBWElzb2xhdGVkVHJlZTo6YXBwbHlQZW5k aW5nQ2hhbmdlcywgd2UgcHJvY2VzcyBub2RlIGFuZCBzdWJ0cmVlCisgICAgICAgIHJlbW92YWxz IGJlZm9yZSB0cmVlIGFkZGl0aW9ucy4gV2hlbiBkb2luZyB0aGVzZSByZW1vdmFscywgd2UgZGV0 YWNoCisgICAgICAgIHRoZSBvYmplY3QgYW5kIHdyYXBwZXIgZnJvbSBlYWNoIG90aGVyLiBUaGlz IGlzIGZpbmUgdW5sZXNzIHRoYXQgc2FtZQorICAgICAgICBvYmplY3QgaXMgc2xhdGVkIHRvIGJl IGFkZGVkIGFnYWluIChlLmcuIGl0IHdhcyBtb3ZlZCBpbiB0aGUgRE9NKSwgYXMKKyAgICAgICAg d2UgZG9uJ3QgYWx3YXlzIHJlLWF0dGFjaCBhIHdyYXBwZXIuIFtXZWJBY2Nlc3NpYmlsaXR5T2Jq ZWN0V3JhcHBlckJhc2UgYXhCYWNraW5nT2JqZWN0XQorICAgICAgICB3aWxsIGFsd2F5cyByZXR1 cm4gbmlsIGZvciBvYmplY3RzIGluIHRoaXMgc3RhdGUuCisKKyAgICAgICAgSW4gdGhpcyBwYXRj aCwgd2hlbiBwcm9jZXNzaW5nIG1fcGVuZGluZ0FwcGVuZHMsIHdlIG5vdyBhdHRhY2ggYQorCQl3 cmFwcGVyIHRvIGFueSBvYmplY3QgdGhhdCBoYXMgYmVjb21lIGBpc0RldGFjaGVkYCAoaS5lLiB0 aGUgb2JqZWN0CisJCWhhcyBubyB3cmFwcGVyLCBvciB0aGUgb2JqZWN0IGhhcyBhIHdyYXBwZXIg YnV0IHRoZSB3cmFwcGVyIGRvZXMgbm90CisJCXBvaW50IGF0IHRoZSBvYmplY3QpLgorCisgICAg ICAgIEZpeGVzIH4xNSB0ZXN0cyBpbiBpc29sYXRlZCB0cmVlIG1vZGUuCisKKyAgICAgICAgKiBh Y2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkT2JqZWN0LmNwcDoKKyAgICAgICAg KiBhY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZS5jcHA6CisgICAgICAg IChXZWJDb3JlOjpBWElzb2xhdGVkVHJlZTo6YXBwbHlQZW5kaW5nQ2hhbmdlcyk6CisgICAgICAg ICogYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvbWFjL0FYSXNvbGF0ZWRPYmplY3RNYWMubW06 CisgICAgICAgIChXZWJDb3JlOjpBWElzb2xhdGVkT2JqZWN0Ojppc0RldGFjaGVkIGNvbnN0KToK KwogMjAyMi0wMi0wNyAgQW5kcmVzIEdvbnphbGV6ICA8YW5kcmVzZ18yMkBhcHBsZS5jb20+CiAK ICAgICAgICAgUHJldmVudCByZW1vdmFsIG9mIGlzb2xhdGVkIG9iamVjdHMgZnJvbSBhIGRpZmZl cmVudCBwYXJlbnQgdGhhbiB0aGUgY3VycmVudCBwYXJlbnQuCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkT2JqZWN0LmNwcCBi L1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmpl Y3QuY3BwCmluZGV4IDVjNmIxMTZiNjEwYzlhNDIxZDY2M2Y3MjFlODdkOGRjNTA5OTk0MzMuLmJk MDRjOWUyMzFhNTg4NGU0ZmQ3YzQ0ODhkNjgwNTdmMjU1MTkxNjggMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3QuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0 ZWRPYmplY3QuY3BwCkBAIC01MTIsMTEgKzUxMiwxMyBAQCB2b2lkIEFYSXNvbGF0ZWRPYmplY3Q6 OmRldGFjaFJlbW90ZVBhcnRzKEFjY2Vzc2liaWxpdHlEZXRhY2htZW50VHlwZSkKICAgICBtX2No aWxkcmVuSURzLmNsZWFyKCk7CiB9CiAKKyNpZiAhUExBVEZPUk0oTUFDKQogYm9vbCBBWElzb2xh dGVkT2JqZWN0Ojppc0RldGFjaGVkKCkgY29uc3QKIHsKICAgICBBU1NFUlRfTk9UX1JFQUNIRUQo KTsKICAgICByZXR1cm4gZmFsc2U7CiB9CisjZW5kaWYKIAogdm9pZCBBWElzb2xhdGVkT2JqZWN0 OjpkZXRhY2hGcm9tUGFyZW50KCkKIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vz c2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmNwcAppbmRleCA2MTI1 MjQ5N2ViNzdhNjdkZDVlOWUxZGRlYTcyNmMxMDVmOGE2OWI2Li41YjA4ZTJiNzA5ZTE1MzY0MjQz NDdjZTcxYWU0NDlmOGYwZTI5MGI2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3Np YmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZS5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUuY3BwCkBAIC02MDgs MTAgKzYwOCwxMCBAQCB2b2lkIEFYSXNvbGF0ZWRUcmVlOjphcHBseVBlbmRpbmdDaGFuZ2VzKCkK ICAgICAgICAgICAgIG1fcmVhZGVyVGhyZWFkTm9kZU1hcC5yZW1vdmUoYXhJRCk7CiAgICAgICAg IH0KIAotICAgICAgICBpZiAoIWl0ZW0uaXNvbGF0ZWRPYmplY3QtPndyYXBwZXIoKSkgewotICAg ICAgICAgICAgLy8gVGhlIG5ldyBvYmplY3QgaGFzbid0IGJlZW4gYXR0YWNoZWQgYSB3cmFwcGVy IHlldCwgc28gYXR0YWNoIGl0LgorICAgICAgICAvLyBJZiB0aGUgbmV3IG9iamVjdCBoYXNuJ3Qg YmVlbiBhdHRhY2hlZCB0byBhIHdyYXBwZXIgeWV0LCBvciBpZiBpdCB3YXMgZGV0YWNoZWQgZnJv bQorICAgICAgICAvLyB0aGUgd3JhcHBlciB3aGVuIHByb2Nlc3NpbmcgcmVtb3ZhbHMgYWJvdmUs IHdlIG11c3QgYXR0YWNoIC8gcmUtYXR0YWNoIGl0LgorICAgICAgICBpZiAoaXRlbS5pc29sYXRl ZE9iamVjdC0+aXNEZXRhY2hlZCgpKQogICAgICAgICAgICAgaXRlbS5pc29sYXRlZE9iamVjdC0+ YXR0YWNoUGxhdGZvcm1XcmFwcGVyKHdyYXBwZXIuZ2V0KCkpOwotICAgICAgICB9CiAKICAgICAg ICAgYXV0byBhZGRSZXN1bHQgPSBtX3JlYWRlclRocmVhZE5vZGVNYXAuYWRkKGF4SUQsIGl0ZW0u aXNvbGF0ZWRPYmplY3QuZ2V0KCkpOwogICAgICAgICAvLyBUaGUgbmV3bHkgYWRkZWQgb2JqZWN0 IG11c3QgaGF2ZSBhIHdyYXBwZXIuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3Np YmlsaXR5L2lzb2xhdGVkdHJlZS9tYWMvQVhJc29sYXRlZE9iamVjdE1hYy5tbSBiL1NvdXJjZS9X ZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL21hYy9BWElzb2xhdGVkT2JqZWN0TWFj Lm1tCmluZGV4IDNjODViODBlZTNhODA1YmVlODViNTA0NDQ5OGNiMjUxYTQyZjhlYmUuLjg4MTdj ODNhNzgzNzA4NjM5MjJmNmVkMjdhNDNiYmEwOTUyZWMyMDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL21hYy9BWElzb2xhdGVkT2JqZWN0TWFj Lm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL21hYy9B WElzb2xhdGVkT2JqZWN0TWFjLm1tCkBAIC02NSw2ICs2NSwxMSBAQCBGbG9hdFJlY3QgQVhJc29s YXRlZE9iamVjdDo6Y29udmVydFJlY3RUb1BsYXRmb3JtU3BhY2UoY29uc3QgRmxvYXRSZWN0JiBy ZWN0LCBBYwogICAgIH0pOwogfQogCitib29sIEFYSXNvbGF0ZWRPYmplY3Q6OmlzRGV0YWNoZWQo KSBjb25zdAoreworICAgIHJldHVybiAhd3JhcHBlcigpIHx8IFt3cmFwcGVyKCkgYXhCYWNraW5n T2JqZWN0XSAhPSB0aGlzOworfQorCiB2b2lkIEFYSXNvbGF0ZWRPYmplY3Q6OmF0dGFjaFBsYXRm b3JtV3JhcHBlcihBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlciogd3JhcHBlcikKIHsKICAgICBb d3JhcHBlciBhdHRhY2hJc29sYXRlZE9iamVjdDp0aGlzXTsK 451206 2022-02-07 21:10:54 -0800 2022-02-08 08:09:23 -0800 Patch bug-236273-20220207231053.patch text/plain 4272 tyler_w U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5MzU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGFlN2Q0ZWY4OGNlMmMx ZmU3OTljNTMwYmU0OWMxZWJjMzc4MDlhMy4uMjc3M2Y2ODgxMzExNDcxYWY5ZDNmOThjOGExNTJi YjgxYzFiMmVhMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDIyLTAyLTA3ICBUeWxl ciBXaWxjb2NrICA8dHlsZXJfd0BhcHBsZS5jb20+CisKKyAgICAgICAgQVg6IFdoZW4gdXBkYXRp bmcgdGhlIGlzb2xhdGVkIHRyZWUgd2l0aCBhIHJlbW92ZSBhbmQgYWRkIG9mIHRoZSBzYW1lIG9i amVjdCwgdGhlIHdyYXBwZXIgaXMgbm90IHJlLWF0dGFjaGVkCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzYyNzMKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbiBBWElzb2xhdGVkVHJlZTo6YXBwbHlQZW5k aW5nQ2hhbmdlcywgd2UgcHJvY2VzcyBub2RlIGFuZCBzdWJ0cmVlCisgICAgICAgIHJlbW92YWxz IGJlZm9yZSB0cmVlIGFkZGl0aW9ucy4gV2hlbiBkb2luZyB0aGVzZSByZW1vdmFscywgd2UgZGV0 YWNoCisgICAgICAgIHRoZSBvYmplY3QgYW5kIHdyYXBwZXIgZnJvbSBlYWNoIG90aGVyLiBUaGlz IGlzIGZpbmUgdW5sZXNzIHRoYXQgc2FtZQorICAgICAgICBvYmplY3QgaXMgc2xhdGVkIHRvIGJl IGFkZGVkIGFnYWluIChlLmcuIGl0IHdhcyBtb3ZlZCBpbiB0aGUgRE9NKSwgYXMKKyAgICAgICAg d2UgZG9uJ3QgYWx3YXlzIHJlLWF0dGFjaCBhIHdyYXBwZXIuIFtXZWJBY2Nlc3NpYmlsaXR5T2Jq ZWN0V3JhcHBlckJhc2UgYXhCYWNraW5nT2JqZWN0XQorICAgICAgICB3aWxsIGFsd2F5cyByZXR1 cm4gbmlsIGZvciBvYmplY3RzIGluIHRoaXMgc3RhdGUuCisKKyAgICAgICAgSW4gdGhpcyBwYXRj aCwgd2hlbiBwcm9jZXNzaW5nIG1fcGVuZGluZ0FwcGVuZHMsIHdlIG5vdyBhdHRhY2ggYQorICAg ICAgICB3cmFwcGVyIHRvIGFueSBvYmplY3QgdGhhdCBoYXMgYmVjb21lIGBpc0RldGFjaGVkYCAo aS5lLiB0aGUgb2JqZWN0CisgICAgICAgIGhhcyBubyB3cmFwcGVyLCBvciB0aGUgb2JqZWN0IGhh cyBhIHdyYXBwZXIgYnV0IHRoZSB3cmFwcGVyIGRvZXMgbm90CisgICAgICAgIHBvaW50IGF0IHRo ZSBvYmplY3QpLgorCisgICAgICAgIEZpeGVzIH4xNSB0ZXN0cyBpbiBpc29sYXRlZCB0cmVlIG1v ZGUuCisKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkT2Jq ZWN0LmNwcDoKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVk VHJlZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpBWElzb2xhdGVkVHJlZTo6YXBwbHlQZW5kaW5n Q2hhbmdlcyk6CisgICAgICAgICogYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvbWFjL0FYSXNv bGF0ZWRPYmplY3RNYWMubW06CisgICAgICAgIChXZWJDb3JlOjpBWElzb2xhdGVkT2JqZWN0Ojpp c0RldGFjaGVkIGNvbnN0KToKKwogMjAyMi0wMi0wNyAgQW5kcmVzIEdvbnphbGV6ICA8YW5kcmVz Z18yMkBhcHBsZS5jb20+CiAKICAgICAgICAgUHJldmVudCByZW1vdmFsIG9mIGlzb2xhdGVkIG9i amVjdHMgZnJvbSBhIGRpZmZlcmVudCBwYXJlbnQgdGhhbiB0aGUgY3VycmVudCBwYXJlbnQuCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElz b2xhdGVkT2JqZWN0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0 cmVlL0FYSXNvbGF0ZWRPYmplY3QuY3BwCmluZGV4IDVjNmIxMTZiNjEwYzlhNDIxZDY2M2Y3MjFl ODdkOGRjNTA5OTk0MzMuLmJkMDRjOWUyMzFhNTg4NGU0ZmQ3YzQ0ODhkNjgwNTdmMjU1MTkxNjgg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FY SXNvbGF0ZWRPYmplY3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNv bGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3QuY3BwCkBAIC01MTIsMTEgKzUxMiwxMyBAQCB2b2lk IEFYSXNvbGF0ZWRPYmplY3Q6OmRldGFjaFJlbW90ZVBhcnRzKEFjY2Vzc2liaWxpdHlEZXRhY2ht ZW50VHlwZSkKICAgICBtX2NoaWxkcmVuSURzLmNsZWFyKCk7CiB9CiAKKyNpZiAhUExBVEZPUk0o TUFDKQogYm9vbCBBWElzb2xhdGVkT2JqZWN0Ojppc0RldGFjaGVkKCkgY29uc3QKIHsKICAgICBB U1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICByZXR1cm4gZmFsc2U7CiB9CisjZW5kaWYKIAogdm9p ZCBBWElzb2xhdGVkT2JqZWN0OjpkZXRhY2hGcm9tUGFyZW50KCkKIHsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmNw cCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRU cmVlLmNwcAppbmRleCA2MTI1MjQ5N2ViNzdhNjdkZDVlOWUxZGRlYTcyNmMxMDVmOGE2OWI2Li41 YjA4ZTJiNzA5ZTE1MzY0MjQzNDdjZTcxYWU0NDlmOGYwZTI5MGI2IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZS5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRl ZFRyZWUuY3BwCkBAIC02MDgsMTAgKzYwOCwxMCBAQCB2b2lkIEFYSXNvbGF0ZWRUcmVlOjphcHBs eVBlbmRpbmdDaGFuZ2VzKCkKICAgICAgICAgICAgIG1fcmVhZGVyVGhyZWFkTm9kZU1hcC5yZW1v dmUoYXhJRCk7CiAgICAgICAgIH0KIAotICAgICAgICBpZiAoIWl0ZW0uaXNvbGF0ZWRPYmplY3Qt PndyYXBwZXIoKSkgewotICAgICAgICAgICAgLy8gVGhlIG5ldyBvYmplY3QgaGFzbid0IGJlZW4g YXR0YWNoZWQgYSB3cmFwcGVyIHlldCwgc28gYXR0YWNoIGl0LgorICAgICAgICAvLyBJZiB0aGUg bmV3IG9iamVjdCBoYXNuJ3QgYmVlbiBhdHRhY2hlZCB0byBhIHdyYXBwZXIgeWV0LCBvciBpZiBp dCB3YXMgZGV0YWNoZWQgZnJvbQorICAgICAgICAvLyB0aGUgd3JhcHBlciB3aGVuIHByb2Nlc3Np bmcgcmVtb3ZhbHMgYWJvdmUsIHdlIG11c3QgYXR0YWNoIC8gcmUtYXR0YWNoIGl0LgorICAgICAg ICBpZiAoaXRlbS5pc29sYXRlZE9iamVjdC0+aXNEZXRhY2hlZCgpKQogICAgICAgICAgICAgaXRl bS5pc29sYXRlZE9iamVjdC0+YXR0YWNoUGxhdGZvcm1XcmFwcGVyKHdyYXBwZXIuZ2V0KCkpOwot ICAgICAgICB9CiAKICAgICAgICAgYXV0byBhZGRSZXN1bHQgPSBtX3JlYWRlclRocmVhZE5vZGVN YXAuYWRkKGF4SUQsIGl0ZW0uaXNvbGF0ZWRPYmplY3QuZ2V0KCkpOwogICAgICAgICAvLyBUaGUg bmV3bHkgYWRkZWQgb2JqZWN0IG11c3QgaGF2ZSBhIHdyYXBwZXIuCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9tYWMvQVhJc29sYXRlZE9iamVj dE1hYy5tbSBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL21hYy9B WElzb2xhdGVkT2JqZWN0TWFjLm1tCmluZGV4IDNjODViODBlZTNhODA1YmVlODViNTA0NDQ5OGNi MjUxYTQyZjhlYmUuLjg4MTdjODNhNzgzNzA4NjM5MjJmNmVkMjdhNDNiYmEwOTUyZWMyMDggMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL21hYy9B WElzb2xhdGVkT2JqZWN0TWFjLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkv aXNvbGF0ZWR0cmVlL21hYy9BWElzb2xhdGVkT2JqZWN0TWFjLm1tCkBAIC02NSw2ICs2NSwxMSBA QCBGbG9hdFJlY3QgQVhJc29sYXRlZE9iamVjdDo6Y29udmVydFJlY3RUb1BsYXRmb3JtU3BhY2Uo Y29uc3QgRmxvYXRSZWN0JiByZWN0LCBBYwogICAgIH0pOwogfQogCitib29sIEFYSXNvbGF0ZWRP YmplY3Q6OmlzRGV0YWNoZWQoKSBjb25zdAoreworICAgIHJldHVybiAhd3JhcHBlcigpIHx8IFt3 cmFwcGVyKCkgYXhCYWNraW5nT2JqZWN0XSAhPSB0aGlzOworfQorCiB2b2lkIEFYSXNvbGF0ZWRP YmplY3Q6OmF0dGFjaFBsYXRmb3JtV3JhcHBlcihBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlciog d3JhcHBlcikKIHsKICAgICBbd3JhcHBlciBhdHRhY2hJc29sYXRlZE9iamVjdDp0aGlzXTsK