235481 2022-01-22 09:01:28 -0800 AX: Remove duplication in AXObjectCache::updateIsolatedTree implementations 2022-01-23 08:51:33 -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 1833014 0 tyler_w 2022-01-22 09:01:28 -0800 The singular-object versions (AXObjectCache::updateIsolatedTree(AXCoreObject&, AXNotification)) and multiple-object version (AXObjectCache::updateIsolatedTree(const Vector<std::pair<RefPtr<AXCoreObject>, AXNotification>>&)) duplicate a lot of code, and make it possible to forget to add new notification handling in one place or the other. 1833015 1 webkit-bug-importer 2022-01-22 09:01:37 -0800 <rdar://problem/87926354> 1833016 2 449733 tyler_w 2022-01-22 09:08:11 -0800 Created attachment 449733 Patch 1833093 3 ews-feeder 2022-01-23 08:51:30 -0800 Committed r288419 (246310@main): <https://commits.webkit.org/246310@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 449733. 449733 2022-01-22 09:08:11 -0800 2022-01-23 08:51:32 -0800 Patch bug-235481-20220122110810.patch text/plain 5452 tyler_w U3VidmVyc2lvbiBSZXZpc2lvbjogMjg4MzkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDRjZTI1YjA3YWVjOGU2 ODIzMTE1YTliZWUzMzI0ZDAwZmUwYzg3MC4uNTg0MjAyYjMzNGY5M2E0M2U3OTljMTQ3MDZlMDFh ZTQ2ODFhNzI5ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIyLTAxLTIyICBUeWxl ciBXaWxjb2NrICA8dHlsZXJfd0BhcHBsZS5jb20+CisKKyAgICAgICAgQVg6IFJlZmFjdG9yIG5l YXItZHVwbGljYXRlIEFYT2JqZWN0Q2FjaGU6OnVwZGF0ZUlzb2xhdGVkVHJlZSBpbXBsZW1lbnRh dGlvbnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIz NTQ4MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFY T2JqZWN0Q2FjaGU6OnVwZGF0ZUlzb2xhdGVkVHJlZShBWENvcmVPYmplY3QmLCBBWE5vdGlmaWNh dGlvbikgYW5kCisgICAgICAgIEFYT2JqZWN0Q2FjaGU6OnVwZGF0ZUlzb2xhdGVkVHJlZShjb25z dCBWZWN0b3I8c3RkOjpwYWlyPFJlZlB0cjxBWENvcmVPYmplY3Q+LCBBWE5vdGlmaWNhdGlvbj4+ JikKKyAgICAgICAgZHVwbGljYXRlIGEgbG90IG9mIGNvZGUsIGFuZCBtYWtlIGl0IHBvc3NpYmxl IHRvIGZvcmdldCB0byBhZGQgbmV3CisgICAgICAgIG5vdGlmaWNhdGlvbiBoYW5kbGluZyBpbiBv bmUgcGxhY2Ugb3IgdGhlIG90aGVyLiBUaGlzIHBhdGNoIHJlZmFjdG9ycworICAgICAgICB0aGlz IGJ5IG1ha2luZyB0aGUgc2luZ2xlLW9iamVjdCB2ZXJzaW9ucyBvZiB0aGlzIG1ldGhvZCBkZWZl ciB0byB0aGUKKyAgICAgICAgbXVsdGlwbGUtb2JqZWN0IHZlcnNpb24gYnkgd3JhcHBpbmcgdGhl IHNpbmdsZSBjaGFuZ2UgaW4gYSBWZWN0b3IuCisKKyAgICAgICAgTm8gdGVzdHMgYWRkZWQgYmVj YXVzZSB0aGVyZSBpcyBubyBiZWhhdmlvciBjaGFuZ2UuCisKKyAgICAgICAgKiBhY2Nlc3NpYmls aXR5L0FYT2JqZWN0Q2FjaGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6YXBwZW5kSWZOb3RDb250 YWluc01hdGNoaW5nKToKKyAgICAgICAgTW92ZWQgdGhpcyBmdW5jdGlvbiBhYm92ZSB1cGRhdGVJ c29sYXRlZFRyZWUgbWV0aG9kcy4gTm8gb3RoZXIgY2hhbmdlLgorICAgICAgICAoV2ViQ29yZTo6 QVhPYmplY3RDYWNoZTo6dXBkYXRlSXNvbGF0ZWRUcmVlKToKKwogMjAyMi0wMS0yMSAgVHlsZXIg V2lsY29jayAgPHR5bGVyX3dAYXBwbGUuY29tPgogCiAgICAgICAgIEFYOiBNb3ZlIE1hYyBzdWJy b2xlIGxvZ2ljIHRvIG5ldyBzdWJyb2xlUGxhdGZvcm1TdHJpbmcgQVhDb3JlT2JqZWN0IGludGVy ZmFjZSBtZXRob2QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhP YmplY3RDYWNoZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FYT2JqZWN0Q2Fj aGUuY3BwCmluZGV4IDE3NjlhN2Y3OGQwYmNlZDI3Nzk0N2RlN2NkYzE2NGI2YjU1OWUwZDAuLjdh NDI4YWJjYjQ4MDE5ZWY2MzBhMzJjYjcwN2I0MDAwZmM5YTBhNTggMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhPYmplY3RDYWNoZS5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvYWNjZXNzaWJpbGl0eS9BWE9iamVjdENhY2hlLmNwcApAQCAtMzI3Niw1NSArMzI3Niwx NCBAQCB2b2lkIEFYT2JqZWN0Q2FjaGU6OnBlcmZvcm1EZWZlcnJlZENhY2hlVXBkYXRlKCkKIH0K ICAgICAKICNpZiBFTkFCTEUoQUNDRVNTSUJJTElUWV9JU09MQVRFRF9UUkVFKQotdm9pZCBBWE9i amVjdENhY2hlOjp1cGRhdGVJc29sYXRlZFRyZWUoQVhDb3JlT2JqZWN0JiBvYmplY3QsIEFYTm90 aWZpY2F0aW9uIG5vdGlmaWNhdGlvbikKKy8vIEZJWE1FOiBzaG91bGQgYmUgYWRkZWQgdG8gV1RG OjpWZWN0b3IuCit0ZW1wbGF0ZTx0eXBlbmFtZSBULCB0eXBlbmFtZSBGPgorc3RhdGljIGJvb2wg YXBwZW5kSWZOb3RDb250YWluc01hdGNoaW5nKFZlY3RvcjxUPiYgdmVjdG9yLCBjb25zdCBUJiB2 YWx1ZSwgRiBtYXRjaGVzKQogewotICAgIEFYVFJBQ0UoIkFYT2JqZWN0Q2FjaGU6OnVwZGF0ZUlz b2xhdGVkVHJlZSIpOwotICAgIEFYTE9HKHN0ZDo6bWFrZV9wYWlyKCZvYmplY3QsIG5vdGlmaWNh dGlvbikpOwotICAgIEFYTE9HKCp0aGlzKTsKLQotICAgIGlmICghbV9wYWdlSUQgfHwgIW9iamVj dC5vYmplY3RJRCgpLmlzVmFsaWQoKSkgewotICAgICAgICBBWExPRygiTm8gcGFnZUlEIG9yIG9i amVjdElEIik7Ci0gICAgICAgIHJldHVybjsKLSAgICB9Ci0KLSAgICBhdXRvIHRyZWUgPSBBWElz b2xhdGVkVHJlZTo6dHJlZUZvclBhZ2VJRCgqbV9wYWdlSUQpOwotICAgIGlmICghdHJlZSkgewot ICAgICAgICBBWExPRygiTm8gaXNvbGF0ZWQgdHJlZSBmb3IgbV9wYWdlSUQuIik7Ci0gICAgICAg IHJldHVybjsKLSAgICB9Ci0KLSAgICBzd2l0Y2ggKG5vdGlmaWNhdGlvbikgewotICAgIGNhc2Ug QVhBcmlhUm9sZUNoYW5nZWQ6Ci0gICAgICAgIHRyZWUtPnVwZGF0ZU5vZGUob2JqZWN0KTsKLSAg ICAgICAgYnJlYWs7Ci0gICAgY2FzZSBBWENoZWNrZWRTdGF0ZUNoYW5nZWQ6Ci0gICAgICAgIHRy ZWUtPnVwZGF0ZU5vZGVQcm9wZXJ0eShvYmplY3QsIEFYUHJvcGVydHlOYW1lOjpJc0NoZWNrZWQp OwotICAgICAgICBicmVhazsKLSAgICBjYXNlIEFYRGlzYWJsZWRTdGF0ZUNoYW5nZWQ6Ci0gICAg ICAgIHRyZWUtPnVwZGF0ZU5vZGVQcm9wZXJ0eShvYmplY3QsIEFYUHJvcGVydHlOYW1lOjpDYW5T ZXRGb2N1c0F0dHJpYnV0ZSk7Ci0gICAgICAgIGJyZWFrOwotICAgIGNhc2UgQVhTb3J0RGlyZWN0 aW9uQ2hhbmdlZDoKLSAgICAgICAgdHJlZS0+dXBkYXRlTm9kZVByb3BlcnR5KG9iamVjdCwgQVhQ cm9wZXJ0eU5hbWU6OlNvcnREaXJlY3Rpb24pOwotICAgICAgICBicmVhazsKLSAgICBjYXNlIEFY SWRBdHRyaWJ1dGVDaGFuZ2VkOgotICAgICAgICB0cmVlLT51cGRhdGVOb2RlUHJvcGVydHkob2Jq ZWN0LCBBWFByb3BlcnR5TmFtZTo6SWRlbnRpZmllckF0dHJpYnV0ZSk7Ci0gICAgICAgIGJyZWFr OwotICAgIGNhc2UgQVhBY3RpdmVEZXNjZW5kYW50Q2hhbmdlZDoKLSAgICBjYXNlIEFYU2VsZWN0 ZWRDaGlsZHJlbkNoYW5nZWQ6Ci0gICAgY2FzZSBBWFZhbHVlQ2hhbmdlZDoKLSAgICAgICAgdHJl ZS0+dXBkYXRlTm9kZShvYmplY3QpOwotICAgICAgICBicmVhazsKLSAgICBjYXNlIEFYQ2hpbGRy ZW5DaGFuZ2VkOgotICAgIGNhc2UgQVhMYW5ndWFnZUNoYW5nZWQ6Ci0gICAgY2FzZSBBWFJvd0Nv dW50Q2hhbmdlZDoKLSAgICBjYXNlIEFYUm93Q29sbGFwc2VkOgotICAgIGNhc2UgQVhSb3dFeHBh bmRlZDoKLSAgICBjYXNlIEFYRXhwYW5kZWRDaGFuZ2VkOgotICAgICAgICB0cmVlLT51cGRhdGVD aGlsZHJlbihvYmplY3QpOwotICAgICAgICBicmVhazsKLSAgICBkZWZhdWx0OgotICAgICAgICBi cmVhazsKLSAgICB9CisgICAgaWYgKHZlY3Rvci5maW5kTWF0Y2hpbmcobWF0Y2hlcykgIT0gbm90 Rm91bmQpCisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICB2ZWN0b3IuYXBwZW5kKHZhbHVlKTsK KyAgICByZXR1cm4gdHJ1ZTsKIH0KIAogdm9pZCBBWE9iamVjdENhY2hlOjp1cGRhdGVJc29sYXRl ZFRyZWUoQVhDb3JlT2JqZWN0KiBvYmplY3QsIEFYTm90aWZpY2F0aW9uIG5vdGlmaWNhdGlvbikK QEAgLTMzMzMsMTQgKzMyOTIsOSBAQCB2b2lkIEFYT2JqZWN0Q2FjaGU6OnVwZGF0ZUlzb2xhdGVk VHJlZShBWENvcmVPYmplY3QqIG9iamVjdCwgQVhOb3RpZmljYXRpb24gbm90aQogICAgICAgICB1 cGRhdGVJc29sYXRlZFRyZWUoKm9iamVjdCwgbm90aWZpY2F0aW9uKTsKIH0KIAotLy8gRklYTUU6 IHNob3VsZCBiZSBhZGRlZCB0byBXVEY6OlZlY3Rvci4KLXRlbXBsYXRlPHR5cGVuYW1lIFQsIHR5 cGVuYW1lIEY+Ci1zdGF0aWMgYm9vbCBhcHBlbmRJZk5vdENvbnRhaW5zTWF0Y2hpbmcoVmVjdG9y PFQ+JiB2ZWN0b3IsIGNvbnN0IFQmIHZhbHVlLCBGIG1hdGNoZXMpCit2b2lkIEFYT2JqZWN0Q2Fj aGU6OnVwZGF0ZUlzb2xhdGVkVHJlZShBWENvcmVPYmplY3QmIG9iamVjdCwgQVhOb3RpZmljYXRp b24gbm90aWZpY2F0aW9uKQogewotICAgIGlmICh2ZWN0b3IuZmluZE1hdGNoaW5nKG1hdGNoZXMp ICE9IG5vdEZvdW5kKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgdmVjdG9yLmFwcGVuZCh2 YWx1ZSk7Ci0gICAgcmV0dXJuIHRydWU7CisgICAgdXBkYXRlSXNvbGF0ZWRUcmVlKHsgc3RkOjpt YWtlX3BhaXIoJm9iamVjdCwgbm90aWZpY2F0aW9uKSB9KTsKIH0KIAogdm9pZCBBWE9iamVjdENh Y2hlOjp1cGRhdGVJc29sYXRlZFRyZWUoY29uc3QgVmVjdG9yPHN0ZDo6cGFpcjxSZWZQdHI8QVhD b3JlT2JqZWN0PiwgQVhOb3RpZmljYXRpb24+PiYgbm90aWZpY2F0aW9ucykKQEAgLTMzNjgsOSAr MzMyMiw2IEBAIHZvaWQgQVhPYmplY3RDYWNoZTo6dXBkYXRlSXNvbGF0ZWRUcmVlKGNvbnN0IFZl Y3RvcjxzdGQ6OnBhaXI8UmVmUHRyPEFYQ29yZU9iamVjCiAgICAgICAgICAgICBjb250aW51ZTsK IAogICAgICAgICBzd2l0Y2ggKG5vdGlmaWNhdGlvbi5zZWNvbmQpIHsKLSAgICAgICAgY2FzZSBB WEFyaWFSb2xlQ2hhbmdlZDoKLSAgICAgICAgICAgIHRyZWUtPnVwZGF0ZU5vZGUoKm5vdGlmaWNh dGlvbi5maXJzdCk7Ci0gICAgICAgICAgICBicmVhazsKICAgICAgICAgY2FzZSBBWENoZWNrZWRT dGF0ZUNoYW5nZWQ6CiAgICAgICAgICAgICB0cmVlLT51cGRhdGVOb2RlUHJvcGVydHkoKm5vdGlm aWNhdGlvbi5maXJzdCwgQVhQcm9wZXJ0eU5hbWU6OklzQ2hlY2tlZCk7CiAgICAgICAgICAgICBi cmVhazsKQEAgLTMzODQsNiArMzMzNSw3IEBAIHZvaWQgQVhPYmplY3RDYWNoZTo6dXBkYXRlSXNv bGF0ZWRUcmVlKGNvbnN0IFZlY3RvcjxzdGQ6OnBhaXI8UmVmUHRyPEFYQ29yZU9iamVjCiAgICAg ICAgICAgICB0cmVlLT51cGRhdGVOb2RlUHJvcGVydHkoKm5vdGlmaWNhdGlvbi5maXJzdCwgQVhQ cm9wZXJ0eU5hbWU6OklkZW50aWZpZXJBdHRyaWJ1dGUpOwogICAgICAgICAgICAgYnJlYWs7CiAg ICAgICAgIGNhc2UgQVhBY3RpdmVEZXNjZW5kYW50Q2hhbmdlZDoKKyAgICAgICAgY2FzZSBBWEFy aWFSb2xlQ2hhbmdlZDoKICAgICAgICAgY2FzZSBBWFNlbGVjdGVkQ2hpbGRyZW5DaGFuZ2VkOgog ICAgICAgICBjYXNlIEFYVmFsdWVDaGFuZ2VkOiB7CiAgICAgICAgICAgICBib29sIG5lZWRzVXBk YXRlID0gYXBwZW5kSWZOb3RDb250YWluc01hdGNoaW5nKGZpbHRlcmVkTm90aWZpY2F0aW9ucywg bm90aWZpY2F0aW9uLCBbJm5vdGlmaWNhdGlvbl0gKGNvbnN0IHN0ZDo6cGFpcjxSZWZQdHI8QVhD b3JlT2JqZWN0PiwgQVhOb3RpZmljYXRpb24+JiBub3RlKSB7Cg==