262941 2023-10-09 21:45:03 -0700 AX: -[WebAccessibilityObjectWrapper accessibilityIndexOfChild:] unnecessarily allocates an NSArray 2023-10-10 21:04:53 -0700 1 1 1 Unclassified WebKit Accessibility Other Unspecified Unspecified 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 1983920 0 tyler_w 2023-10-09 21:45:03 -0700 This shows up on samples for some sites. 1983921 1 webkit-bug-importer 2023-10-09 21:45:15 -0700 <rdar://problem/116717845> 1983922 2 468142 tyler_w 2023-10-09 21:53:31 -0700 Created attachment 468142 Patch 1983978 3 andresg_22 2023-10-10 06:21:45 -0700 (In reply to Tyler Wilcock from comment #2) > Created attachment 468142 [details] > Patch diff --git a/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm b/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm index f39430c64827..48916783a1f4 100644 --- a/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm +++ b/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm @@ -3596,7 +3596,7 @@ - (BOOL)accessibilityShouldUseUniqueId } // API that AppKit uses for faster access -- (NSUInteger)accessibilityIndexOfChild:(id)child +- (NSUInteger)accessibilityIndexOfChild:(id)targetChild { RefPtr<AXCoreObject> backingObject = self.updateObjectBackingStore; if (!backingObject) @@ -3605,29 +3605,27 @@ - (NSUInteger)accessibilityIndexOfChild:(id)child // Tree objects return their rows as their children. We can use the original method // here, because we won't gain any speed up. if (backingObject->isTree()) - return [super accessibilityIndexOfChild:child]; + return [super accessibilityIndexOfChild:targetChild]; - NSArray *children = self.childrenVectorArray; - if (!children.count) { + const auto& children = backingObject->children(); + if (!children.size()) { if (auto *renderWidgetChildren = [self renderWidgetChildren]) - return [renderWidgetChildren indexOfObject:child]; + return [renderWidgetChildren indexOfObject:targetChild]; #if ENABLE(MODEL_ELEMENT) if (backingObject->isModel()) - return backingObject->modelElementChildren().find(child); + return backingObject->modelElementChildren().find(targetChild); #endif } - NSUInteger count = [children count]; - for (NSUInteger i = 0; i < count; ++i) { - WebAccessibilityObjectWrapper *wrapper = children[i]; - auto* object = wrapper.axBackingObject; - if (!object) + size_t childCount = children.size(); + for (size_t i = 0; i < childCount; i++) { + RefPtr child = children[i]; AG: you can use children[i] without this temp and the additional ref count. Also it wouldn't be needed to name the param targetChild and then keep the original child. + if (!child) continue; - - if (wrapper == child || (object->isAttachment() && [wrapper attachmentView] == child)) + WebAccessibilityObjectWrapper *childWrapper = child->wrapper(); + if (childWrapper == targetChild || (child->isAttachment() && [childWrapper attachmentView] == targetChild)) return i; } - return NSNotFound; } 1984038 4 468152 tyler_w 2023-10-10 10:30:25 -0700 Created attachment 468152 Patch 1984043 5 tyler_w 2023-10-10 10:34:47 -0700 > - NSUInteger count = [children count]; > - for (NSUInteger i = 0; i < count; ++i) { > - WebAccessibilityObjectWrapper *wrapper = children[i]; > - auto* object = wrapper.axBackingObject; > - if (!object) > + size_t childCount = children.size(); > + for (size_t i = 0; i < childCount; i++) { > + RefPtr child = children[i]; > > AG: you can use children[i] without this temp and the additional ref count. > Also it wouldn't be needed to name the param targetChild and then keep the > original child. Removed the unnecessary RefPtr as you mentioned. I decided to keep the targetChild rename because I think it makes reading the code easier (otherwise we'd be comparing, e.g., childWrapper == child which doesn't read well in my opinion). 1984075 6 468152 cfleizach 2023-10-10 11:30:58 -0700 Comment on attachment 468152 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=468152&action=review > Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm:3624 > + WebAccessibilityObjectWrapper *childWrapper = children[i]->wrapper(); won't this incur a function call into Vector::indexedObject (whatever) the method name is each time? is that faster than making a local variable? feel like we should know the answer to that before deciding which is better 1984076 7 cfleizach 2023-10-10 11:31:05 -0700 View in context: https://bugs.webkit.org/attachment.cgi?id=468152&action=review > Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm:3624 > + WebAccessibilityObjectWrapper *childWrapper = children[i]->wrapper(); won't this incur a function call into Vector::indexedObject (whatever) the method name is each time? is that faster than making a local variable? feel like we should know the answer to that before deciding which is better 1984081 8 andresg_22 2023-10-10 11:38:11 -0700 (In reply to chris fleizach from comment #7) > View in context: > https://bugs.webkit.org/attachment.cgi?id=468152&action=review > > > Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm:3624 > > + WebAccessibilityObjectWrapper *childWrapper = children[i]->wrapper(); > > won't this incur a function call into Vector::indexedObject (whatever) the > method name is each time? is that faster than making a local variable? > feel like we should know the answer to that before deciding which is better Vector::operator[] is an inline, random access method, so I think this is better than creating a new RefPtr. 1984087 9 andresg_22 2023-10-10 11:59:03 -0700 (In reply to Andres Gonzalez from comment #8) > (In reply to chris fleizach from comment #7) > > View in context: > > https://bugs.webkit.org/attachment.cgi?id=468152&action=review > > > > > Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm:3624 > > > + WebAccessibilityObjectWrapper *childWrapper = children[i]->wrapper(); > > > > won't this incur a function call into Vector::indexedObject (whatever) the > > method name is each time? is that faster than making a local variable? > > feel like we should know the answer to that before deciding which is better > > Vector::operator[] is an inline, random access method, so I think this is > better than creating a new RefPtr. we can also do + auto& child = children[i]; that doesn't creat a new RefPtr, and you don't have to write children[i] evetywhere. 1984097 10 468157 tyler_w 2023-10-10 13:14:14 -0700 Created attachment 468157 Patch 1984099 11 tyler_w 2023-10-10 13:15:23 -0700 (In reply to Andres Gonzalez from comment #9) > (In reply to Andres Gonzalez from comment #8) > > (In reply to chris fleizach from comment #7) > > > View in context: > > > https://bugs.webkit.org/attachment.cgi?id=468152&action=review > > > > > > > Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm:3624 > > > > + WebAccessibilityObjectWrapper *childWrapper = children[i]->wrapper(); > > > > > > won't this incur a function call into Vector::indexedObject (whatever) the > > > method name is each time? is that faster than making a local variable? > > > feel like we should know the answer to that before deciding which is better > > > > Vector::operator[] is an inline, random access method, so I think this is > > better than creating a new RefPtr. > > we can also do > > + auto& child = children[i]; > > that doesn't creat a new RefPtr, and you don't have to write children[i] > evetywhere. Fixed. 1984210 12 ews-feeder 2023-10-10 21:04:50 -0700 Committed 269187@main (f36f30e2e548): <https://commits.webkit.org/269187@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 468157. 468142 2023-10-09 21:53:31 -0700 2023-10-10 10:30:23 -0700 Patch bug-262941-20231009215330.patch text/plain 4271 tyler_w RnJvbSA5ZmM4NTg0NWE3MTYxYjFjZDljN2Y2MGQ5MTNkOGM2OGQ3M2NiNTIyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBUeWxlciBXaWxjb2NrIDx0eWxlcl93QGFwcGxlLmNvbT4KRGF0 ZTogTW9uLCA5IE9jdCAyMDIzIDIxOjQ2OjE1IC0wNzAwClN1YmplY3Q6IFtQQVRDSF0gQVg6IC1b V2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXIKIGFjY2Vzc2liaWxpdHlJbmRleE9mQ2hpbGQ6 XSB1bm5lY2Vzc2FyaWx5IGFsbG9jYXRlcyBhbiBOU0FycmF5CiBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjYyOTQxIHJkYXI6Ly9wcm9ibGVtLzExNjcxNzg0NQoKUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgpQcmlvciB0byB0aGlzIHBhdGNoLCBhY2Nlc3NpYmls aXR5SW5kZXhPZkNoaWxkIGNhbGxzIGNoaWxkcmVuVmVjdG9yQXJyYXksIHdoaWNoIHR1cm5zIEFY Q29yZU9iamVjdDo6Y2hpbGRyZW4oKQppbnRvIGFuIE5TQXJyYXkgb2YgdGhlIGNvcnJlc3BvbmRp bmcgd3JhcHBlcnMuIFRoaXMgaXMgYmFkIHRvIHVzZSBpbiBhY2Nlc3NpYmlsaXR5SW5kZXhPZkNo aWxkIGZvciB0d28gcmVhc29uczoKCiAgMS4gVGhpcyBOU0FycmF5IGFsbG9jYXRpb24gc2hvd3Mg dXAgaW4gdGhlIHRob3VzYW5kcyBvZiBzYW1wbGVzIG9uIHNvbWUgc2l0ZXMKICAyLiBjaGlsZHJl blZlY3RvckFycmF5IGVhZ2VybHkgcmVzb2x2ZXMgYXR0YWNobWVudHMsIHdoaWNoIChmb3Igbm93 KSByZXF1aXJlcyBhIG1haW4tdGhyZWFkIGhpdCwKICAgICBldmVuIGlmIGFjY2Vzc2liaWxpdHlJ bmRleE9mQ2hpbGQgZG9lc24ndCB1c2UgdGhlIGF0dGFjaG1lbnQKCldpdGggdGhpcyBwYXRjaCwg d2UgaXRlcmF0ZSBvdmVyIHRoZSBjaGlsZHJlbiBkaXJlY3RseSB3aXRob3V0IGFsbG9jYXRpbmcg dGhlIE5TQXJyYXkuIFRoaXMgc2F2ZXMgN2sgc2FtcGxlcwpvbiBhbiBpbnRlcm5hbCB3ZWJwYWdl LiBTbmlwcGV0IGZyb20gdGhlIHNhbXBsZToKCjY5NTIgLVtXZWJBY2Nlc3NpYmlsaXR5T2JqZWN0 V3JhcHBlciBhY2Nlc3NpYmlsaXR5QXR0cmlidXRlVmFsdWU6Zm9yUGFyYW1ldGVyOl0KISA2ODYx IC1bTlNPYmplY3QoTlNPYmplY3RBY2Nlc3NpYmlsaXR5QXR0cmlidXRlQWNjZXNzQWRkaXRpb25z KSBhY2Nlc3NpYmlsaXR5SW5kZXhGb3JDaGlsZFVJRWxlbWVudEF0dHJpYnV0ZUZvclBhcmFtZXRl cjpdCiEgOiA2Njk4IC1bV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXIgYWNjZXNzaWJpbGl0 eUluZGV4T2ZDaGlsZDpdCiEgOiB8IDUwMTYgbWFrZU5TQXJyYXkoV1RGOjpWZWN0b3I8Li4uPiBj b25zdCYpCiEgOiB8ICsgNDAyMCBvYmpjX21zZ1NlbmQgIChpbiBsaWJvYmpjLkEuZHlsaWIpCiEg OiB8ICsgNjg0IC1bX19OU0FycmF5TSBhZGRPYmplY3Q6XQohIDogfCArIDEzMyAtW19fTlNBcnJh eU0gaW5zZXJ0T2JqZWN0OmF0SW5kZXg6XQohIDogfCArIDY2IG9iamNfbXNnU2VuZCRhZGRPYmpl Y3Q6CiEgOiB8ICsgNjEgb2JqY19yZXRhaW4KISA6IHwgKyAyOCBvYmpjX21zZ1NlbmQkaW5zZXJ0 T2JqZWN0OmF0SW5kZXg6CiEgOiB8ICsgMjQgRFlMRC1TVFVCJCRvYmpjX3JldGFpbgohIDogfCAx MTYzIG1ha2VOU0FycmF5KFdURjo6VmVjdG9yPC4uLj4gY29uc3QmKQoKKiBTb3VyY2UvV2ViQ29y ZS9hY2Nlc3NpYmlsaXR5L21hYy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlck1hYy5tbToK KC1bV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXIgYWNjZXNzaWJpbGl0eUluZGV4T2ZDaGls ZDpdKToKLS0tCiAuLi4vbWFjL1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyTWFjLm1tICAg fCAyNiArKysrKysrKystLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTIgaW5zZXJ0aW9ucygr KSwgMTQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJp bGl0eS9tYWMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJNYWMubW0gYi9Tb3VyY2UvV2Vi Q29yZS9hY2Nlc3NpYmlsaXR5L21hYy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlck1hYy5t bQppbmRleCBmMzk0MzBjNjQ4MjcuLjQ4OTE2NzgzYTFmNCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvYWNjZXNzaWJpbGl0eS9tYWMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJNYWMu bW0KKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9tYWMvV2ViQWNjZXNzaWJpbGl0 eU9iamVjdFdyYXBwZXJNYWMubW0KQEAgLTM1OTYsNyArMzU5Niw3IEBAIC0gKEJPT0wpYWNjZXNz aWJpbGl0eVNob3VsZFVzZVVuaXF1ZUlkCiB9CiAKIC8vIEFQSSB0aGF0IEFwcEtpdCB1c2VzIGZv ciBmYXN0ZXIgYWNjZXNzCi0tIChOU1VJbnRlZ2VyKWFjY2Vzc2liaWxpdHlJbmRleE9mQ2hpbGQ6 KGlkKWNoaWxkCistIChOU1VJbnRlZ2VyKWFjY2Vzc2liaWxpdHlJbmRleE9mQ2hpbGQ6KGlkKXRh cmdldENoaWxkCiB7CiAgICAgUmVmUHRyPEFYQ29yZU9iamVjdD4gYmFja2luZ09iamVjdCA9IHNl bGYudXBkYXRlT2JqZWN0QmFja2luZ1N0b3JlOwogICAgIGlmICghYmFja2luZ09iamVjdCkKQEAg LTM2MDUsMjkgKzM2MDUsMjcgQEAgLSAoTlNVSW50ZWdlcilhY2Nlc3NpYmlsaXR5SW5kZXhPZkNo aWxkOihpZCljaGlsZAogICAgIC8vIFRyZWUgb2JqZWN0cyByZXR1cm4gdGhlaXIgcm93cyBhcyB0 aGVpciBjaGlsZHJlbi4gV2UgY2FuIHVzZSB0aGUgb3JpZ2luYWwgbWV0aG9kCiAgICAgLy8gaGVy ZSwgYmVjYXVzZSB3ZSB3b24ndCBnYWluIGFueSBzcGVlZCB1cC4KICAgICBpZiAoYmFja2luZ09i amVjdC0+aXNUcmVlKCkpCi0gICAgICAgIHJldHVybiBbc3VwZXIgYWNjZXNzaWJpbGl0eUluZGV4 T2ZDaGlsZDpjaGlsZF07CisgICAgICAgIHJldHVybiBbc3VwZXIgYWNjZXNzaWJpbGl0eUluZGV4 T2ZDaGlsZDp0YXJnZXRDaGlsZF07CiAKLSAgICBOU0FycmF5ICpjaGlsZHJlbiA9IHNlbGYuY2hp bGRyZW5WZWN0b3JBcnJheTsKLSAgICBpZiAoIWNoaWxkcmVuLmNvdW50KSB7CisgICAgY29uc3Qg YXV0byYgY2hpbGRyZW4gPSBiYWNraW5nT2JqZWN0LT5jaGlsZHJlbigpOworICAgIGlmICghY2hp bGRyZW4uc2l6ZSgpKSB7CiAgICAgICAgIGlmIChhdXRvICpyZW5kZXJXaWRnZXRDaGlsZHJlbiA9 IFtzZWxmIHJlbmRlcldpZGdldENoaWxkcmVuXSkKLSAgICAgICAgICAgIHJldHVybiBbcmVuZGVy V2lkZ2V0Q2hpbGRyZW4gaW5kZXhPZk9iamVjdDpjaGlsZF07CisgICAgICAgICAgICByZXR1cm4g W3JlbmRlcldpZGdldENoaWxkcmVuIGluZGV4T2ZPYmplY3Q6dGFyZ2V0Q2hpbGRdOwogI2lmIEVO QUJMRShNT0RFTF9FTEVNRU5UKQogICAgICAgICBpZiAoYmFja2luZ09iamVjdC0+aXNNb2RlbCgp KQotICAgICAgICAgICAgcmV0dXJuIGJhY2tpbmdPYmplY3QtPm1vZGVsRWxlbWVudENoaWxkcmVu KCkuZmluZChjaGlsZCk7CisgICAgICAgICAgICByZXR1cm4gYmFja2luZ09iamVjdC0+bW9kZWxF bGVtZW50Q2hpbGRyZW4oKS5maW5kKHRhcmdldENoaWxkKTsKICNlbmRpZgogICAgIH0KIAotICAg IE5TVUludGVnZXIgY291bnQgPSBbY2hpbGRyZW4gY291bnRdOwotICAgIGZvciAoTlNVSW50ZWdl ciBpID0gMDsgaSA8IGNvdW50OyArK2kpIHsKLSAgICAgICAgV2ViQWNjZXNzaWJpbGl0eU9iamVj dFdyYXBwZXIgKndyYXBwZXIgPSBjaGlsZHJlbltpXTsKLSAgICAgICAgYXV0byogb2JqZWN0ID0g d3JhcHBlci5heEJhY2tpbmdPYmplY3Q7Ci0gICAgICAgIGlmICghb2JqZWN0KQorICAgIHNpemVf dCBjaGlsZENvdW50ID0gY2hpbGRyZW4uc2l6ZSgpOworICAgIGZvciAoc2l6ZV90IGkgPSAwOyBp IDwgY2hpbGRDb3VudDsgaSsrKSB7CisgICAgICAgIFJlZlB0ciBjaGlsZCA9IGNoaWxkcmVuW2ld OworICAgICAgICBpZiAoIWNoaWxkKQogICAgICAgICAgICAgY29udGludWU7Ci0KLSAgICAgICAg aWYgKHdyYXBwZXIgPT0gY2hpbGQgfHwgKG9iamVjdC0+aXNBdHRhY2htZW50KCkgJiYgW3dyYXBw ZXIgYXR0YWNobWVudFZpZXddID09IGNoaWxkKSkKKyAgICAgICAgV2ViQWNjZXNzaWJpbGl0eU9i amVjdFdyYXBwZXIgKmNoaWxkV3JhcHBlciA9IGNoaWxkLT53cmFwcGVyKCk7CisgICAgICAgIGlm IChjaGlsZFdyYXBwZXIgPT0gdGFyZ2V0Q2hpbGQgfHwgKGNoaWxkLT5pc0F0dGFjaG1lbnQoKSAm JiBbY2hpbGRXcmFwcGVyIGF0dGFjaG1lbnRWaWV3XSA9PSB0YXJnZXRDaGlsZCkpCiAgICAgICAg ICAgICByZXR1cm4gaTsKICAgICB9Ci0KICAgICByZXR1cm4gTlNOb3RGb3VuZDsKIH0KIAo= 468152 2023-10-10 10:30:25 -0700 2023-10-10 13:14:13 -0700 Patch bug-262941-20231010103025.patch text/plain 4252 tyler_w RnJvbSAyMTk0OTNjYTdlZGZlMzRjOThmODYwODk4Nzg2MTZkMDA5ODJkZmIxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBUeWxlciBXaWxjb2NrIDx0eWxlcl93QGFwcGxlLmNvbT4KRGF0 ZTogTW9uLCA5IE9jdCAyMDIzIDIxOjQ2OjE1IC0wNzAwClN1YmplY3Q6IFtQQVRDSF0gQVg6IC1b V2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXIKIGFjY2Vzc2liaWxpdHlJbmRleE9mQ2hpbGQ6 XSB1bm5lY2Vzc2FyaWx5IGFsbG9jYXRlcyBhbiBOU0FycmF5CiBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjYyOTQxIHJkYXI6Ly9wcm9ibGVtLzExNjcxNzg0NQoKUmV2 aWV3ZWQgYnkgQ2hyaXMgRmxlaXphY2guCgpQcmlvciB0byB0aGlzIHBhdGNoLCBhY2Nlc3NpYmls aXR5SW5kZXhPZkNoaWxkIGNhbGxzIGNoaWxkcmVuVmVjdG9yQXJyYXksIHdoaWNoIHR1cm5zIEFY Q29yZU9iamVjdDo6Y2hpbGRyZW4oKQppbnRvIGFuIE5TQXJyYXkgb2YgdGhlIGNvcnJlc3BvbmRp bmcgd3JhcHBlcnMuIFRoaXMgaXMgYmFkIHRvIHVzZSBpbiBhY2Nlc3NpYmlsaXR5SW5kZXhPZkNo aWxkIGZvciB0d28gcmVhc29uczoKCiAgMS4gVGhpcyBOU0FycmF5IGFsbG9jYXRpb24gc2hvd3Mg dXAgaW4gdGhlIHRob3VzYW5kcyBvZiBzYW1wbGVzIG9uIHNvbWUgc2l0ZXMKICAyLiBjaGlsZHJl blZlY3RvckFycmF5IGVhZ2VybHkgcmVzb2x2ZXMgYXR0YWNobWVudHMsIHdoaWNoIChmb3Igbm93 KSByZXF1aXJlcyBhIG1haW4tdGhyZWFkIGhpdCwKICAgICBldmVuIGlmIGFjY2Vzc2liaWxpdHlJ bmRleE9mQ2hpbGQgZG9lc24ndCB1c2UgdGhlIGF0dGFjaG1lbnQKCldpdGggdGhpcyBwYXRjaCwg d2UgaXRlcmF0ZSBvdmVyIHRoZSBjaGlsZHJlbiBkaXJlY3RseSB3aXRob3V0IGFsbG9jYXRpbmcg dGhlIE5TQXJyYXkuIFRoaXMgc2F2ZXMgN2sgc2FtcGxlcwpvbiBhbiBpbnRlcm5hbCB3ZWJwYWdl LiBTbmlwcGV0IGZyb20gdGhlIHNhbXBsZToKCjY5NTIgLVtXZWJBY2Nlc3NpYmlsaXR5T2JqZWN0 V3JhcHBlciBhY2Nlc3NpYmlsaXR5QXR0cmlidXRlVmFsdWU6Zm9yUGFyYW1ldGVyOl0KISA2ODYx IC1bTlNPYmplY3QoTlNPYmplY3RBY2Nlc3NpYmlsaXR5QXR0cmlidXRlQWNjZXNzQWRkaXRpb25z KSBhY2Nlc3NpYmlsaXR5SW5kZXhGb3JDaGlsZFVJRWxlbWVudEF0dHJpYnV0ZUZvclBhcmFtZXRl cjpdCiEgOiA2Njk4IC1bV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXIgYWNjZXNzaWJpbGl0 eUluZGV4T2ZDaGlsZDpdCiEgOiB8IDUwMTYgbWFrZU5TQXJyYXkoV1RGOjpWZWN0b3I8Li4uPiBj b25zdCYpCiEgOiB8ICsgNDAyMCBvYmpjX21zZ1NlbmQgIChpbiBsaWJvYmpjLkEuZHlsaWIpCiEg OiB8ICsgNjg0IC1bX19OU0FycmF5TSBhZGRPYmplY3Q6XQohIDogfCArIDEzMyAtW19fTlNBcnJh eU0gaW5zZXJ0T2JqZWN0OmF0SW5kZXg6XQohIDogfCArIDY2IG9iamNfbXNnU2VuZCRhZGRPYmpl Y3Q6CiEgOiB8ICsgNjEgb2JqY19yZXRhaW4KISA6IHwgKyAyOCBvYmpjX21zZ1NlbmQkaW5zZXJ0 T2JqZWN0OmF0SW5kZXg6CiEgOiB8ICsgMjQgRFlMRC1TVFVCJCRvYmpjX3JldGFpbgohIDogfCAx MTYzIG1ha2VOU0FycmF5KFdURjo6VmVjdG9yPC4uLj4gY29uc3QmKQoKKiBTb3VyY2UvV2ViQ29y ZS9hY2Nlc3NpYmlsaXR5L21hYy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlck1hYy5tbToK KC1bV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXIgYWNjZXNzaWJpbGl0eUluZGV4T2ZDaGls ZDpdKToKLS0tCiAuLi4vbWFjL1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyTWFjLm1tICAg fCAyNSArKysrKysrKy0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTEgaW5zZXJ0aW9ucygr KSwgMTQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJp bGl0eS9tYWMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJNYWMubW0gYi9Tb3VyY2UvV2Vi Q29yZS9hY2Nlc3NpYmlsaXR5L21hYy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlck1hYy5t bQppbmRleCBmMzk0MzBjNjQ4MjcuLjE1YmJmZjAwNDE3ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvYWNjZXNzaWJpbGl0eS9tYWMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJNYWMu bW0KKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9tYWMvV2ViQWNjZXNzaWJpbGl0 eU9iamVjdFdyYXBwZXJNYWMubW0KQEAgLTM1OTYsNyArMzU5Niw3IEBAIC0gKEJPT0wpYWNjZXNz aWJpbGl0eVNob3VsZFVzZVVuaXF1ZUlkCiB9CiAKIC8vIEFQSSB0aGF0IEFwcEtpdCB1c2VzIGZv ciBmYXN0ZXIgYWNjZXNzCi0tIChOU1VJbnRlZ2VyKWFjY2Vzc2liaWxpdHlJbmRleE9mQ2hpbGQ6 KGlkKWNoaWxkCistIChOU1VJbnRlZ2VyKWFjY2Vzc2liaWxpdHlJbmRleE9mQ2hpbGQ6KGlkKXRh cmdldENoaWxkCiB7CiAgICAgUmVmUHRyPEFYQ29yZU9iamVjdD4gYmFja2luZ09iamVjdCA9IHNl bGYudXBkYXRlT2JqZWN0QmFja2luZ1N0b3JlOwogICAgIGlmICghYmFja2luZ09iamVjdCkKQEAg LTM2MDUsMjkgKzM2MDUsMjYgQEAgLSAoTlNVSW50ZWdlcilhY2Nlc3NpYmlsaXR5SW5kZXhPZkNo aWxkOihpZCljaGlsZAogICAgIC8vIFRyZWUgb2JqZWN0cyByZXR1cm4gdGhlaXIgcm93cyBhcyB0 aGVpciBjaGlsZHJlbi4gV2UgY2FuIHVzZSB0aGUgb3JpZ2luYWwgbWV0aG9kCiAgICAgLy8gaGVy ZSwgYmVjYXVzZSB3ZSB3b24ndCBnYWluIGFueSBzcGVlZCB1cC4KICAgICBpZiAoYmFja2luZ09i amVjdC0+aXNUcmVlKCkpCi0gICAgICAgIHJldHVybiBbc3VwZXIgYWNjZXNzaWJpbGl0eUluZGV4 T2ZDaGlsZDpjaGlsZF07CisgICAgICAgIHJldHVybiBbc3VwZXIgYWNjZXNzaWJpbGl0eUluZGV4 T2ZDaGlsZDp0YXJnZXRDaGlsZF07CiAKLSAgICBOU0FycmF5ICpjaGlsZHJlbiA9IHNlbGYuY2hp bGRyZW5WZWN0b3JBcnJheTsKLSAgICBpZiAoIWNoaWxkcmVuLmNvdW50KSB7CisgICAgY29uc3Qg YXV0byYgY2hpbGRyZW4gPSBiYWNraW5nT2JqZWN0LT5jaGlsZHJlbigpOworICAgIGlmICghY2hp bGRyZW4uc2l6ZSgpKSB7CiAgICAgICAgIGlmIChhdXRvICpyZW5kZXJXaWRnZXRDaGlsZHJlbiA9 IFtzZWxmIHJlbmRlcldpZGdldENoaWxkcmVuXSkKLSAgICAgICAgICAgIHJldHVybiBbcmVuZGVy V2lkZ2V0Q2hpbGRyZW4gaW5kZXhPZk9iamVjdDpjaGlsZF07CisgICAgICAgICAgICByZXR1cm4g W3JlbmRlcldpZGdldENoaWxkcmVuIGluZGV4T2ZPYmplY3Q6dGFyZ2V0Q2hpbGRdOwogI2lmIEVO QUJMRShNT0RFTF9FTEVNRU5UKQogICAgICAgICBpZiAoYmFja2luZ09iamVjdC0+aXNNb2RlbCgp KQotICAgICAgICAgICAgcmV0dXJuIGJhY2tpbmdPYmplY3QtPm1vZGVsRWxlbWVudENoaWxkcmVu KCkuZmluZChjaGlsZCk7CisgICAgICAgICAgICByZXR1cm4gYmFja2luZ09iamVjdC0+bW9kZWxF bGVtZW50Q2hpbGRyZW4oKS5maW5kKHRhcmdldENoaWxkKTsKICNlbmRpZgogICAgIH0KIAotICAg IE5TVUludGVnZXIgY291bnQgPSBbY2hpbGRyZW4gY291bnRdOwotICAgIGZvciAoTlNVSW50ZWdl ciBpID0gMDsgaSA8IGNvdW50OyArK2kpIHsKLSAgICAgICAgV2ViQWNjZXNzaWJpbGl0eU9iamVj dFdyYXBwZXIgKndyYXBwZXIgPSBjaGlsZHJlbltpXTsKLSAgICAgICAgYXV0byogb2JqZWN0ID0g d3JhcHBlci5heEJhY2tpbmdPYmplY3Q7Ci0gICAgICAgIGlmICghb2JqZWN0KQorICAgIHNpemVf dCBjaGlsZENvdW50ID0gY2hpbGRyZW4uc2l6ZSgpOworICAgIGZvciAoc2l6ZV90IGkgPSAwOyBp IDwgY2hpbGRDb3VudDsgaSsrKSB7CisgICAgICAgIGlmICghY2hpbGRyZW5baV0pCiAgICAgICAg ICAgICBjb250aW51ZTsKLQotICAgICAgICBpZiAod3JhcHBlciA9PSBjaGlsZCB8fCAob2JqZWN0 LT5pc0F0dGFjaG1lbnQoKSAmJiBbd3JhcHBlciBhdHRhY2htZW50Vmlld10gPT0gY2hpbGQpKQor ICAgICAgICBXZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlciAqY2hpbGRXcmFwcGVyID0gY2hp bGRyZW5baV0tPndyYXBwZXIoKTsKKyAgICAgICAgaWYgKGNoaWxkV3JhcHBlciA9PSB0YXJnZXRD aGlsZCB8fCAoY2hpbGRyZW5baV0tPmlzQXR0YWNobWVudCgpICYmIFtjaGlsZFdyYXBwZXIgYXR0 YWNobWVudFZpZXddID09IHRhcmdldENoaWxkKSkKICAgICAgICAgICAgIHJldHVybiBpOwogICAg IH0KLQogICAgIHJldHVybiBOU05vdEZvdW5kOwogfQogCg== 468157 2023-10-10 13:14:14 -0700 2023-10-10 21:04:52 -0700 Patch bug-262941-20231010131414.patch text/plain 4276 tyler_w RnJvbSA0ODY2MjhkM2FmZjA4MzA0ZTg0Mzk5OTZmYTNmZGZjOWQ0MDgxZTY1IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBUeWxlciBXaWxjb2NrIDx0eWxlcl93QGFwcGxlLmNvbT4KRGF0 ZTogTW9uLCA5IE9jdCAyMDIzIDIxOjQ2OjE1IC0wNzAwClN1YmplY3Q6IFtQQVRDSF0gQVg6IC1b V2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXIKIGFjY2Vzc2liaWxpdHlJbmRleE9mQ2hpbGQ6 XSB1bm5lY2Vzc2FyaWx5IGFsbG9jYXRlcyBhbiBOU0FycmF5CiBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjYyOTQxIHJkYXI6Ly9wcm9ibGVtLzExNjcxNzg0NQoKUmV2 aWV3ZWQgYnkgQ2hyaXMgRmxlaXphY2guCgpQcmlvciB0byB0aGlzIHBhdGNoLCBhY2Nlc3NpYmls aXR5SW5kZXhPZkNoaWxkIGNhbGxzIGNoaWxkcmVuVmVjdG9yQXJyYXksIHdoaWNoIHR1cm5zIEFY Q29yZU9iamVjdDo6Y2hpbGRyZW4oKQppbnRvIGFuIE5TQXJyYXkgb2YgdGhlIGNvcnJlc3BvbmRp bmcgd3JhcHBlcnMuIFRoaXMgaXMgYmFkIHRvIHVzZSBpbiBhY2Nlc3NpYmlsaXR5SW5kZXhPZkNo aWxkIGZvciB0d28gcmVhc29uczoKCiAgMS4gVGhpcyBOU0FycmF5IGFsbG9jYXRpb24gc2hvd3Mg dXAgaW4gdGhlIHRob3VzYW5kcyBvZiBzYW1wbGVzIG9uIHNvbWUgc2l0ZXMKICAyLiBjaGlsZHJl blZlY3RvckFycmF5IGVhZ2VybHkgcmVzb2x2ZXMgYXR0YWNobWVudHMsIHdoaWNoIChmb3Igbm93 KSByZXF1aXJlcyBhIG1haW4tdGhyZWFkIGhpdCwKICAgICBldmVuIGlmIGFjY2Vzc2liaWxpdHlJ bmRleE9mQ2hpbGQgZG9lc24ndCB1c2UgdGhlIGF0dGFjaG1lbnQKCldpdGggdGhpcyBwYXRjaCwg d2UgaXRlcmF0ZSBvdmVyIHRoZSBjaGlsZHJlbiBkaXJlY3RseSB3aXRob3V0IGFsbG9jYXRpbmcg dGhlIE5TQXJyYXkuIFRoaXMgc2F2ZXMgN2sgc2FtcGxlcwpvbiBhbiBpbnRlcm5hbCB3ZWJwYWdl LiBTbmlwcGV0IGZyb20gdGhlIHNhbXBsZToKCjY5NTIgLVtXZWJBY2Nlc3NpYmlsaXR5T2JqZWN0 V3JhcHBlciBhY2Nlc3NpYmlsaXR5QXR0cmlidXRlVmFsdWU6Zm9yUGFyYW1ldGVyOl0KISA2ODYx IC1bTlNPYmplY3QoTlNPYmplY3RBY2Nlc3NpYmlsaXR5QXR0cmlidXRlQWNjZXNzQWRkaXRpb25z KSBhY2Nlc3NpYmlsaXR5SW5kZXhGb3JDaGlsZFVJRWxlbWVudEF0dHJpYnV0ZUZvclBhcmFtZXRl cjpdCiEgOiA2Njk4IC1bV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXIgYWNjZXNzaWJpbGl0 eUluZGV4T2ZDaGlsZDpdCiEgOiB8IDUwMTYgbWFrZU5TQXJyYXkoV1RGOjpWZWN0b3I8Li4uPiBj b25zdCYpCiEgOiB8ICsgNDAyMCBvYmpjX21zZ1NlbmQgIChpbiBsaWJvYmpjLkEuZHlsaWIpCiEg OiB8ICsgNjg0IC1bX19OU0FycmF5TSBhZGRPYmplY3Q6XQohIDogfCArIDEzMyAtW19fTlNBcnJh eU0gaW5zZXJ0T2JqZWN0OmF0SW5kZXg6XQohIDogfCArIDY2IG9iamNfbXNnU2VuZCRhZGRPYmpl Y3Q6CiEgOiB8ICsgNjEgb2JqY19yZXRhaW4KISA6IHwgKyAyOCBvYmpjX21zZ1NlbmQkaW5zZXJ0 T2JqZWN0OmF0SW5kZXg6CiEgOiB8ICsgMjQgRFlMRC1TVFVCJCRvYmpjX3JldGFpbgohIDogfCAx MTYzIG1ha2VOU0FycmF5KFdURjo6VmVjdG9yPC4uLj4gY29uc3QmKQoKKiBTb3VyY2UvV2ViQ29y ZS9hY2Nlc3NpYmlsaXR5L21hYy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlck1hYy5tbToK KC1bV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXIgYWNjZXNzaWJpbGl0eUluZGV4T2ZDaGls ZDpdKToKLS0tCiAuLi4vbWFjL1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyTWFjLm1tICAg fCAyNiArKysrKysrKystLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTIgaW5zZXJ0aW9ucygr KSwgMTQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJp bGl0eS9tYWMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJNYWMubW0gYi9Tb3VyY2UvV2Vi Q29yZS9hY2Nlc3NpYmlsaXR5L21hYy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlck1hYy5t bQppbmRleCBmMzk0MzBjNjQ4MjcuLmNkMzg5MGE1MGE2OCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvYWNjZXNzaWJpbGl0eS9tYWMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJNYWMu bW0KKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9tYWMvV2ViQWNjZXNzaWJpbGl0 eU9iamVjdFdyYXBwZXJNYWMubW0KQEAgLTM1OTYsNyArMzU5Niw3IEBAIC0gKEJPT0wpYWNjZXNz aWJpbGl0eVNob3VsZFVzZVVuaXF1ZUlkCiB9CiAKIC8vIEFQSSB0aGF0IEFwcEtpdCB1c2VzIGZv ciBmYXN0ZXIgYWNjZXNzCi0tIChOU1VJbnRlZ2VyKWFjY2Vzc2liaWxpdHlJbmRleE9mQ2hpbGQ6 KGlkKWNoaWxkCistIChOU1VJbnRlZ2VyKWFjY2Vzc2liaWxpdHlJbmRleE9mQ2hpbGQ6KGlkKXRh cmdldENoaWxkCiB7CiAgICAgUmVmUHRyPEFYQ29yZU9iamVjdD4gYmFja2luZ09iamVjdCA9IHNl bGYudXBkYXRlT2JqZWN0QmFja2luZ1N0b3JlOwogICAgIGlmICghYmFja2luZ09iamVjdCkKQEAg LTM2MDUsMjkgKzM2MDUsMjcgQEAgLSAoTlNVSW50ZWdlcilhY2Nlc3NpYmlsaXR5SW5kZXhPZkNo aWxkOihpZCljaGlsZAogICAgIC8vIFRyZWUgb2JqZWN0cyByZXR1cm4gdGhlaXIgcm93cyBhcyB0 aGVpciBjaGlsZHJlbi4gV2UgY2FuIHVzZSB0aGUgb3JpZ2luYWwgbWV0aG9kCiAgICAgLy8gaGVy ZSwgYmVjYXVzZSB3ZSB3b24ndCBnYWluIGFueSBzcGVlZCB1cC4KICAgICBpZiAoYmFja2luZ09i amVjdC0+aXNUcmVlKCkpCi0gICAgICAgIHJldHVybiBbc3VwZXIgYWNjZXNzaWJpbGl0eUluZGV4 T2ZDaGlsZDpjaGlsZF07CisgICAgICAgIHJldHVybiBbc3VwZXIgYWNjZXNzaWJpbGl0eUluZGV4 T2ZDaGlsZDp0YXJnZXRDaGlsZF07CiAKLSAgICBOU0FycmF5ICpjaGlsZHJlbiA9IHNlbGYuY2hp bGRyZW5WZWN0b3JBcnJheTsKLSAgICBpZiAoIWNoaWxkcmVuLmNvdW50KSB7CisgICAgY29uc3Qg YXV0byYgY2hpbGRyZW4gPSBiYWNraW5nT2JqZWN0LT5jaGlsZHJlbigpOworICAgIGlmICghY2hp bGRyZW4uc2l6ZSgpKSB7CiAgICAgICAgIGlmIChhdXRvICpyZW5kZXJXaWRnZXRDaGlsZHJlbiA9 IFtzZWxmIHJlbmRlcldpZGdldENoaWxkcmVuXSkKLSAgICAgICAgICAgIHJldHVybiBbcmVuZGVy V2lkZ2V0Q2hpbGRyZW4gaW5kZXhPZk9iamVjdDpjaGlsZF07CisgICAgICAgICAgICByZXR1cm4g W3JlbmRlcldpZGdldENoaWxkcmVuIGluZGV4T2ZPYmplY3Q6dGFyZ2V0Q2hpbGRdOwogI2lmIEVO QUJMRShNT0RFTF9FTEVNRU5UKQogICAgICAgICBpZiAoYmFja2luZ09iamVjdC0+aXNNb2RlbCgp KQotICAgICAgICAgICAgcmV0dXJuIGJhY2tpbmdPYmplY3QtPm1vZGVsRWxlbWVudENoaWxkcmVu KCkuZmluZChjaGlsZCk7CisgICAgICAgICAgICByZXR1cm4gYmFja2luZ09iamVjdC0+bW9kZWxF bGVtZW50Q2hpbGRyZW4oKS5maW5kKHRhcmdldENoaWxkKTsKICNlbmRpZgogICAgIH0KIAotICAg IE5TVUludGVnZXIgY291bnQgPSBbY2hpbGRyZW4gY291bnRdOwotICAgIGZvciAoTlNVSW50ZWdl ciBpID0gMDsgaSA8IGNvdW50OyArK2kpIHsKLSAgICAgICAgV2ViQWNjZXNzaWJpbGl0eU9iamVj dFdyYXBwZXIgKndyYXBwZXIgPSBjaGlsZHJlbltpXTsKLSAgICAgICAgYXV0byogb2JqZWN0ID0g d3JhcHBlci5heEJhY2tpbmdPYmplY3Q7Ci0gICAgICAgIGlmICghb2JqZWN0KQorICAgIHNpemVf dCBjaGlsZENvdW50ID0gY2hpbGRyZW4uc2l6ZSgpOworICAgIGZvciAoc2l6ZV90IGkgPSAwOyBp IDwgY2hpbGRDb3VudDsgaSsrKSB7CisgICAgICAgIGNvbnN0IGF1dG8mIGNoaWxkID0gY2hpbGRy ZW5baV07CisgICAgICAgIGlmICghY2hpbGQpCiAgICAgICAgICAgICBjb250aW51ZTsKLQotICAg ICAgICBpZiAod3JhcHBlciA9PSBjaGlsZCB8fCAob2JqZWN0LT5pc0F0dGFjaG1lbnQoKSAmJiBb d3JhcHBlciBhdHRhY2htZW50Vmlld10gPT0gY2hpbGQpKQorICAgICAgICBXZWJBY2Nlc3NpYmls aXR5T2JqZWN0V3JhcHBlciAqY2hpbGRXcmFwcGVyID0gY2hpbGQtPndyYXBwZXIoKTsKKyAgICAg ICAgaWYgKGNoaWxkV3JhcHBlciA9PSB0YXJnZXRDaGlsZCB8fCAoY2hpbGQtPmlzQXR0YWNobWVu dCgpICYmIFtjaGlsZFdyYXBwZXIgYXR0YWNobWVudFZpZXddID09IHRhcmdldENoaWxkKSkKICAg ICAgICAgICAgIHJldHVybiBpOwogICAgIH0KLQogICAgIHJldHVybiBOU05vdEZvdW5kOwogfQog Cg==