210610 2020-04-16 10:13:10 -0700 Clean up VectorCocoa createNSArray overloads and add documentation for createNSArray taking a map function 2020-04-16 11:31:16 -0700 1 1 1 Unclassified WebKit Web Template Framework WebKit Local Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=210398 InRadar P2 Normal --- 1 dbates dbates benjamin cdumez cmarcelo darin ews-watchlist webkit-bug-importer oldest_to_newest 1642308 0 dbates 2020-04-16 10:13:10 -0700 Clean up VectorCocoa createNSArray overloads and add documentation for createNSArray taking a map function. 1642310 1 396661 dbates 2020-04-16 10:17:43 -0700 Created attachment 396661 Patch 1642311 2 396662 dbates 2020-04-16 10:18:41 -0700 Created attachment 396662 Patch 1642314 3 396665 dbates 2020-04-16 10:25:30 -0700 Created attachment 396665 Patch 1642321 4 396665 dbates 2020-04-16 10:32:00 -0700 Comment on attachment 396665 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=396665&action=review > Source/WTF/ChangeLog:8 > + Remove unncessary local variable. Rename "map" type in createNSArray function for clarity unncessary => unnecessary 1642322 5 396665 dbates 2020-04-16 10:32:00 -0700 Comment on attachment 396665 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=396665&action=review > Source/WTF/ChangeLog:8 > + Remove unncessary local variable. Rename "map" type in createNSArray function for clarity unncessary => unnecessary 1642323 6 396667 dbates 2020-04-16 10:36:08 -0700 Created attachment 396667 Patch 1642344 7 396667 darin 2020-04-16 11:07:47 -0700 Comment on attachment 396667 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=396667&action=review > Source/WTF/wtf/cocoa/VectorCocoa.h:56 > +// An overload that takes a map function and returns a NSArray whose elements are the > +// result of calling the map function on each vector element. Like the makeNSArrayElement > +// function, the map function can return either a RetainPtr<id> or an id if the value > +// is autoreleased. When the map function is makeNSArrayElement then this function > +// behaves identically to createNSArray function that does not take a map function. I’m not thrilled with this comment. Here’s my cut: // This overload of createNSArray takes a function to map each vector element to an Objective-C object. // The map function has the same interface as the makeVectorElement function above, but can be any // function including a lambda, a function-like object, or Function<>. I’m sure you can do even better. > Source/WTF/wtf/cocoa/VectorCocoa.h:83 > - constexpr const VectorElementType* typedNull = nullptr; > + constexpr VectorElementType* typedNull = nullptr; Please don’t make this change. The const there is about the type of the pointed-to item. This const should not be removed. In some coding styles it would be written as "constexpr VectorElementType const *", in case that makes it clearer to you. If this was not a pointer type, then the change would make sense to me, removing a redundant const, but that’s based on a misunderstanding here. 1642352 8 396667 dbates 2020-04-16 11:17:46 -0700 Comment on attachment 396667 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=396667&action=review >> Source/WTF/wtf/cocoa/VectorCocoa.h:56 >> +// behaves identically to createNSArray function that does not take a map function. > > I’m not thrilled with this comment. Here’s my cut: > > // This overload of createNSArray takes a function to map each vector element to an Objective-C object. > // The map function has the same interface as the makeVectorElement function above, but can be any > // function including a lambda, a function-like object, or Function<>. > > I’m sure you can do even better. You're tempting me...I'll just take your cut. >> Source/WTF/wtf/cocoa/VectorCocoa.h:83 >> + constexpr VectorElementType* typedNull = nullptr; > > Please don’t make this change. The const there is about the type of the pointed-to item. This const should not be removed. In some coding styles it would be written as "constexpr VectorElementType const *", in case that makes it clearer to you. If this was not a pointer type, then the change would make sense to me, removing a redundant const, but that’s based on a misunderstanding here. You're right, I'm wrong. I misread the code. 1642353 9 dbates 2020-04-16 11:18:10 -0700 Thanks for the review, btw 1642358 10 396667 dbates 2020-04-16 11:26:31 -0700 Comment on attachment 396667 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=396667&action=review >>> Source/WTF/wtf/cocoa/VectorCocoa.h:56 >>> +// behaves identically to createNSArray function that does not take a map function. >> >> I’m not thrilled with this comment. Here’s my cut: >> >> // This overload of createNSArray takes a function to map each vector element to an Objective-C object. >> // The map function has the same interface as the makeVectorElement function above, but can be any >> // function including a lambda, a function-like object, or Function<>. >> >> I’m sure you can do even better. > > You're tempting me...I'll just take your cut. The same interface as makeVectorElement? The same interface as makeNSArrayElement 1642359 11 396675 dbates 2020-04-16 11:28:51 -0700 Created attachment 396675 To Land 1642362 12 396675 dbates 2020-04-16 11:30:34 -0700 Comment on attachment 396675 To Land Clearing flags on attachment: 396675 Committed r260202: <https://trac.webkit.org/changeset/260202> 1642363 13 dbates 2020-04-16 11:30:36 -0700 All reviewed patches have been landed. Closing bug. 1642364 14 webkit-bug-importer 2020-04-16 11:31:16 -0700 <rdar://problem/61895756> 396661 2020-04-16 10:17:43 -0700 2020-04-16 10:18:40 -0700 Patch bug-210610-20200416101742.patch text/plain 3563 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMjYwMDc2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDY2MDU5OTgxZjE3NmFjMjRkOTJhNjUx NTQzYzQzYTgxY2U2Nzk0MWYuLjE1OTAwODUyMTJmNGEyYzdlOTU2YmRjNTdiODQzNTM3ZjRlZDUx MmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMjAtMDQtMTYgIERhbmllbCBCYXRlcyAgPGRhYmF0 ZXNAYXBwbGUuY29tPgorCisgICAgICAgIENsZWFuIHVwIFZlY3RvckNvY29hIGNyZWF0ZU5TQXJy YXkgb3ZlcmxvYWRzIGFuZCBhZGQgZG9jdW1lbnRhdGlvbiBmb3IgY3JlYXRlTlNBcnJheSB0YWtp bmcgYSBtYXAgZnVuY3Rpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIxMDYxMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFJlbW92ZSB1bm5jZXNzYXJ5IGxvY2FsIHZhcmlhYmxlLiBSZW5hbWUgIm1hcCIg dHlwZSBpbiBjcmVhdGVOU0FycmF5IGZ1bmN0aW9uIGZvciBjbGFyaXR5CisgICAgICAgIGFuZCBh ZGQgZG9jdW1lbnRhdGlvbiBmb3IgY3JlYXRlTlNBcnJheSBmdW5jdGlvbiB0aGF0IHRha2VzIGEg bWFwIGZ1bmN0aW9uLgorCisgICAgICAgIEkgd2FzIHRlbXB0ZWQsIGJ1dCBkZWNpZGVkIG5vdCB0 byB3cml0ZSB0aGUgY3JlYXRlTlNBcnJheSBmdW5jdGlvbiB0aGF0IGRvZXMgbm90IHRha2UgYQor ICAgICAgICBtYXAgZnVuY3Rpb24gaW4gdGVybXMgb2YgdGhlIG9uZSB0aGF0IGRpZC4gV2l0aCB0 aGUgInJpZ2h0IiBvcHRpbWl6YXRpb24gc2V0dGluZ3MgdGhlCisgICAgICAgIGNvbXBpbGVyIHNo b3VsZCBlbWl0IHRoZSBzYW1lIGNvZGUsIGJ1dCBJIGRpZG4ndCB2ZXJpZnkgdGhpcy4gU28sIEkg ZGlkbid0IGRvIGl0LgorCisgICAgICAgICogd3RmL2NvY29hL1ZlY3RvckNvY29hLmg6CisgICAg ICAgIChXVEY6OmNyZWF0ZU5TQXJyYXkpOgorCiAyMDIwLTA0LTE2ICBEYW5pZWwgQmF0ZXMgIDxk YWJhdGVzQGFwcGxlLmNvbT4KIAogICAgICAgICBNb3ZlIC1fcmVxdWVzdFRleHRJbnB1dENvbnRl eHRzSW5SZWN0IHRvIFdLQ29udGVudFZpZXcgdG8gc2ltcGxpZnkgaW1wbGVtZW50YXRpb24KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL2NvY29hL1ZlY3RvckNvY29hLmggYi9Tb3VyY2UvV1RG L3d0Zi9jb2NvYS9WZWN0b3JDb2NvYS5oCmluZGV4IGRiNWRhMzAwNzA1OTU0ZTI3MTQzNjA5NGNl MzYwZGZmNjA1OTJmYWQuLjMyNDM2NmYxMTlhYzFhODU1YmQwYTZkNDYwNTA2MDdjOWI1Nzc4NmYg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL2NvY29hL1ZlY3RvckNvY29hLmgKKysrIGIvU291 cmNlL1dURi93dGYvY29jb2EvVmVjdG9yQ29jb2EuaApAQCAtNDcsMjYgKzQ3LDMxIEBAIG5hbWVz cGFjZSBXVEYgewogLy8gICAgT3B0aW9uYWw8VmVjdG9yRWxlbWVudFR5cGU+IG1ha2VWZWN0b3JF bGVtZW50KGNvbnN0IFZlY3RvckVsZW1lbnRUeXBlKiwgaWQgYXJyYXlFbGVtZW50KTsKIAogdGVt cGxhdGU8dHlwZW5hbWUgVmVjdG9yVHlwZT4gUmV0YWluUHRyPE5TQXJyYXk+IGNyZWF0ZU5TQXJy YXkoY29uc3QgVmVjdG9yVHlwZSYpOwotdGVtcGxhdGU8dHlwZW5hbWUgVmVjdG9yVHlwZSwgdHlw ZW5hbWUgTWFwRnVuY3Rpb24+IFJldGFpblB0cjxOU0FycmF5PiBjcmVhdGVOU0FycmF5KGNvbnN0 IFZlY3RvclR5cGUmLCBNYXBGdW5jdGlvbik7CiB0ZW1wbGF0ZTx0eXBlbmFtZSBWZWN0b3JFbGVt ZW50VHlwZT4gVmVjdG9yPFZlY3RvckVsZW1lbnRUeXBlPiBtYWtlVmVjdG9yKE5TQXJyYXkgKik7 CiAKKy8vIEFuIG92ZXJsb2FkIHRoYXQgdGFrZXMgYSBtYXAgZnVuY3Rpb24gYW5kIHJldHVybnMg YW4gTlNBcnJheSB3aG9zZSBlbGVtZW50cyBhcmUKKy8vIHJlc3VsdCBvZiBjYWxsaW5nIHRoZSBt YXAgZnVuY3Rpb24gb24gZWFjaCB2ZWN0b3IgZWxlbWVudC4gTGlrZSB0aGUgbWFrZU5TQXJyYXlF bGVtZW50CisvLyBmdW5jdGlvbiwgdGhlIG1hcCBmdW5jdGlvbiBjYW4gcmV0dXJuIGVpdGhlciBh IFJldGFpblB0cjxpZD4gb3IgYW4gaWQgaWYgdGhlIHZhbHVlCisvLyBpcyBhdXRvcmVsZWFzZWQu IFdoZW4gdGhlIG1hcCBmdW5jdGlvbiBpcyBtYWtlTlNBcnJheUVsZW1lbnQgdGhlbiB0aGlzIGZ1 bmN0aW9uCisvLyBiZWhhdmVzIGlkZW50aWNhbGx5IHRvIGNyZWF0ZU5TQXJyYXkgZnVuY3Rpb24g dGhhdCBkb2VzIG5vdCB0YWtlIGEgbWFwIGZ1bmN0aW9uLgorCit0ZW1wbGF0ZTx0eXBlbmFtZSBW ZWN0b3JUeXBlLCB0eXBlbmFtZSBNYXBGdW5jdGlvblR5cGU+IFJldGFpblB0cjxOU0FycmF5PiBj cmVhdGVOU0FycmF5KGNvbnN0IFZlY3RvclR5cGUmLCBNYXBGdW5jdGlvblR5cGUpOworCiAvLyBJ bXBsZW1lbnRhdGlvbiBkZXRhaWxzIG9mIHRoZSBmdW5jdGlvbiB0ZW1wbGF0ZXMgYWJvdmUuCiAK IHRlbXBsYXRlPHR5cGVuYW1lIFZlY3RvclR5cGU+IFJldGFpblB0cjxOU0FycmF5PiBjcmVhdGVO U0FycmF5KGNvbnN0IFZlY3RvclR5cGUmIHZlY3RvcikKIHsKLSAgICBhdXRvIHNpemUgPSB2ZWN0 b3Iuc2l6ZSgpOwotICAgIGF1dG8gYXJyYXkgPSBhZG9wdE5TKFtbTlNNdXRhYmxlQXJyYXkgYWxs b2NdIGluaXRXaXRoQ2FwYWNpdHk6c2l6ZV0pOworICAgIGF1dG8gYXJyYXkgPSBhZG9wdE5TKFtb TlNNdXRhYmxlQXJyYXkgYWxsb2NdIGluaXRXaXRoQ2FwYWNpdHk6dmVjdG9yLnNpemUoKV0pOwog ICAgIGZvciAoYXV0byYgZWxlbWVudCA6IHZlY3RvcikKICAgICAgICAgW2FycmF5IGFkZE9iamVj dDpnZXRQdHIobWFrZU5TQXJyYXlFbGVtZW50KGVsZW1lbnQpKV07CiAgICAgcmV0dXJuIGFycmF5 OwogfQogCi10ZW1wbGF0ZTx0eXBlbmFtZSBWZWN0b3JUeXBlLCB0eXBlbmFtZSBNYXBGdW5jdGlv bj4gUmV0YWluUHRyPE5TQXJyYXk+IGNyZWF0ZU5TQXJyYXkoY29uc3QgVmVjdG9yVHlwZSYgdmVj dG9yLCBNYXBGdW5jdGlvbiBtYXBGdW5jdGlvbikKK3RlbXBsYXRlPHR5cGVuYW1lIFZlY3RvclR5 cGUsIHR5cGVuYW1lIE1hcEZ1bmN0aW9uVHlwZT4gUmV0YWluUHRyPE5TQXJyYXk+IGNyZWF0ZU5T QXJyYXkoY29uc3QgVmVjdG9yVHlwZSYgdmVjdG9yLCBjb25zdCBNYXBGdW5jdGlvblR5cGUmIGZ1 bmN0aW9uKQogewotICAgIGF1dG8gc2l6ZSA9IHZlY3Rvci5zaXplKCk7Ci0gICAgYXV0byBhcnJh eSA9IGFkb3B0TlMoW1tOU011dGFibGVBcnJheSBhbGxvY10gaW5pdFdpdGhDYXBhY2l0eTpzaXpl XSk7CisgICAgYXV0byBhcnJheSA9IGFkb3B0TlMoW1tOU011dGFibGVBcnJheSBhbGxvY10gaW5p dFdpdGhDYXBhY2l0eTp2ZWN0b3Iuc2l6ZSgpXSk7CiAgICAgZm9yIChhdXRvJiBlbGVtZW50IDog dmVjdG9yKQotICAgICAgICBbYXJyYXkgYWRkT2JqZWN0OmdldFB0cihtYXBGdW5jdGlvbihlbGVt ZW50KSldOworICAgICAgICBbYXJyYXkgYWRkT2JqZWN0OmdldFB0cihmdW5jdGlvbihlbGVtZW50 KSldOwogICAgIHJldHVybiBhcnJheTsKIH0KIAo= 396662 2020-04-16 10:18:41 -0700 2020-04-16 10:25:29 -0700 Patch bug-210610-20200416101841.patch text/plain 3566 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMjYwMDc2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDY2MDU5OTgxZjE3NmFjMjRkOTJhNjUx NTQzYzQzYTgxY2U2Nzk0MWYuLjE1OTAwODUyMTJmNGEyYzdlOTU2YmRjNTdiODQzNTM3ZjRlZDUx MmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMjAtMDQtMTYgIERhbmllbCBCYXRlcyAgPGRhYmF0 ZXNAYXBwbGUuY29tPgorCisgICAgICAgIENsZWFuIHVwIFZlY3RvckNvY29hIGNyZWF0ZU5TQXJy YXkgb3ZlcmxvYWRzIGFuZCBhZGQgZG9jdW1lbnRhdGlvbiBmb3IgY3JlYXRlTlNBcnJheSB0YWtp bmcgYSBtYXAgZnVuY3Rpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIxMDYxMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFJlbW92ZSB1bm5jZXNzYXJ5IGxvY2FsIHZhcmlhYmxlLiBSZW5hbWUgIm1hcCIg dHlwZSBpbiBjcmVhdGVOU0FycmF5IGZ1bmN0aW9uIGZvciBjbGFyaXR5CisgICAgICAgIGFuZCBh ZGQgZG9jdW1lbnRhdGlvbiBmb3IgY3JlYXRlTlNBcnJheSBmdW5jdGlvbiB0aGF0IHRha2VzIGEg bWFwIGZ1bmN0aW9uLgorCisgICAgICAgIEkgd2FzIHRlbXB0ZWQsIGJ1dCBkZWNpZGVkIG5vdCB0 byB3cml0ZSB0aGUgY3JlYXRlTlNBcnJheSBmdW5jdGlvbiB0aGF0IGRvZXMgbm90IHRha2UgYQor ICAgICAgICBtYXAgZnVuY3Rpb24gaW4gdGVybXMgb2YgdGhlIG9uZSB0aGF0IGRpZC4gV2l0aCB0 aGUgInJpZ2h0IiBvcHRpbWl6YXRpb24gc2V0dGluZ3MgdGhlCisgICAgICAgIGNvbXBpbGVyIHNo b3VsZCBlbWl0IHRoZSBzYW1lIGNvZGUsIGJ1dCBJIGRpZG4ndCB2ZXJpZnkgdGhpcy4gU28sIEkg ZGlkbid0IGRvIGl0LgorCisgICAgICAgICogd3RmL2NvY29hL1ZlY3RvckNvY29hLmg6CisgICAg ICAgIChXVEY6OmNyZWF0ZU5TQXJyYXkpOgorCiAyMDIwLTA0LTE2ICBEYW5pZWwgQmF0ZXMgIDxk YWJhdGVzQGFwcGxlLmNvbT4KIAogICAgICAgICBNb3ZlIC1fcmVxdWVzdFRleHRJbnB1dENvbnRl eHRzSW5SZWN0IHRvIFdLQ29udGVudFZpZXcgdG8gc2ltcGxpZnkgaW1wbGVtZW50YXRpb24KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL2NvY29hL1ZlY3RvckNvY29hLmggYi9Tb3VyY2UvV1RG L3d0Zi9jb2NvYS9WZWN0b3JDb2NvYS5oCmluZGV4IGRiNWRhMzAwNzA1OTU0ZTI3MTQzNjA5NGNl MzYwZGZmNjA1OTJmYWQuLjY3MTRjMzg2ZTBmNjI1MTEyOGRiN2U1YTIzYmRjMjg1NDhlZDk0Y2Ug MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL2NvY29hL1ZlY3RvckNvY29hLmgKKysrIGIvU291 cmNlL1dURi93dGYvY29jb2EvVmVjdG9yQ29jb2EuaApAQCAtNDcsMjYgKzQ3LDMxIEBAIG5hbWVz cGFjZSBXVEYgewogLy8gICAgT3B0aW9uYWw8VmVjdG9yRWxlbWVudFR5cGU+IG1ha2VWZWN0b3JF bGVtZW50KGNvbnN0IFZlY3RvckVsZW1lbnRUeXBlKiwgaWQgYXJyYXlFbGVtZW50KTsKIAogdGVt cGxhdGU8dHlwZW5hbWUgVmVjdG9yVHlwZT4gUmV0YWluUHRyPE5TQXJyYXk+IGNyZWF0ZU5TQXJy YXkoY29uc3QgVmVjdG9yVHlwZSYpOwotdGVtcGxhdGU8dHlwZW5hbWUgVmVjdG9yVHlwZSwgdHlw ZW5hbWUgTWFwRnVuY3Rpb24+IFJldGFpblB0cjxOU0FycmF5PiBjcmVhdGVOU0FycmF5KGNvbnN0 IFZlY3RvclR5cGUmLCBNYXBGdW5jdGlvbik7CiB0ZW1wbGF0ZTx0eXBlbmFtZSBWZWN0b3JFbGVt ZW50VHlwZT4gVmVjdG9yPFZlY3RvckVsZW1lbnRUeXBlPiBtYWtlVmVjdG9yKE5TQXJyYXkgKik7 CiAKKy8vIEFuIG92ZXJsb2FkIHRoYXQgdGFrZXMgYSBtYXAgZnVuY3Rpb24gYW5kIHJldHVybnMg YSBOU0FycmF5IHdob3NlIGVsZW1lbnRzIGFyZSB0aGUKKy8vIHJlc3VsdCBvZiBjYWxsaW5nIHRo ZSBtYXAgZnVuY3Rpb24gb24gZWFjaCB2ZWN0b3IgZWxlbWVudC4gTGlrZSB0aGUgbWFrZU5TQXJy YXlFbGVtZW50CisvLyBmdW5jdGlvbiwgdGhlIG1hcCBmdW5jdGlvbiBjYW4gcmV0dXJuIGVpdGhl ciBhIFJldGFpblB0cjxpZD4gb3IgYW4gaWQgaWYgdGhlIHZhbHVlCisvLyBpcyBhdXRvcmVsZWFz ZWQuIFdoZW4gdGhlIG1hcCBmdW5jdGlvbiBpcyBtYWtlTlNBcnJheUVsZW1lbnQgdGhlbiB0aGlz IGZ1bmN0aW9uCisvLyBiZWhhdmVzIGlkZW50aWNhbGx5IHRvIGNyZWF0ZU5TQXJyYXkgZnVuY3Rp b24gdGhhdCBkb2VzIG5vdCB0YWtlIGEgbWFwIGZ1bmN0aW9uLgorCit0ZW1wbGF0ZTx0eXBlbmFt ZSBWZWN0b3JUeXBlLCB0eXBlbmFtZSBNYXBGdW5jdGlvblR5cGU+IFJldGFpblB0cjxOU0FycmF5 PiBjcmVhdGVOU0FycmF5KGNvbnN0IFZlY3RvclR5cGUmLCBNYXBGdW5jdGlvblR5cGUpOworCiAv LyBJbXBsZW1lbnRhdGlvbiBkZXRhaWxzIG9mIHRoZSBmdW5jdGlvbiB0ZW1wbGF0ZXMgYWJvdmUu CiAKIHRlbXBsYXRlPHR5cGVuYW1lIFZlY3RvclR5cGU+IFJldGFpblB0cjxOU0FycmF5PiBjcmVh dGVOU0FycmF5KGNvbnN0IFZlY3RvclR5cGUmIHZlY3RvcikKIHsKLSAgICBhdXRvIHNpemUgPSB2 ZWN0b3Iuc2l6ZSgpOwotICAgIGF1dG8gYXJyYXkgPSBhZG9wdE5TKFtbTlNNdXRhYmxlQXJyYXkg YWxsb2NdIGluaXRXaXRoQ2FwYWNpdHk6c2l6ZV0pOworICAgIGF1dG8gYXJyYXkgPSBhZG9wdE5T KFtbTlNNdXRhYmxlQXJyYXkgYWxsb2NdIGluaXRXaXRoQ2FwYWNpdHk6dmVjdG9yLnNpemUoKV0p OwogICAgIGZvciAoYXV0byYgZWxlbWVudCA6IHZlY3RvcikKICAgICAgICAgW2FycmF5IGFkZE9i amVjdDpnZXRQdHIobWFrZU5TQXJyYXlFbGVtZW50KGVsZW1lbnQpKV07CiAgICAgcmV0dXJuIGFy cmF5OwogfQogCi10ZW1wbGF0ZTx0eXBlbmFtZSBWZWN0b3JUeXBlLCB0eXBlbmFtZSBNYXBGdW5j dGlvbj4gUmV0YWluUHRyPE5TQXJyYXk+IGNyZWF0ZU5TQXJyYXkoY29uc3QgVmVjdG9yVHlwZSYg dmVjdG9yLCBNYXBGdW5jdGlvbiBtYXBGdW5jdGlvbikKK3RlbXBsYXRlPHR5cGVuYW1lIFZlY3Rv clR5cGUsIHR5cGVuYW1lIE1hcEZ1bmN0aW9uVHlwZT4gUmV0YWluUHRyPE5TQXJyYXk+IGNyZWF0 ZU5TQXJyYXkoY29uc3QgVmVjdG9yVHlwZSYgdmVjdG9yLCBjb25zdCBNYXBGdW5jdGlvblR5cGUm IGZ1bmN0aW9uKQogewotICAgIGF1dG8gc2l6ZSA9IHZlY3Rvci5zaXplKCk7Ci0gICAgYXV0byBh cnJheSA9IGFkb3B0TlMoW1tOU011dGFibGVBcnJheSBhbGxvY10gaW5pdFdpdGhDYXBhY2l0eTpz aXplXSk7CisgICAgYXV0byBhcnJheSA9IGFkb3B0TlMoW1tOU011dGFibGVBcnJheSBhbGxvY10g aW5pdFdpdGhDYXBhY2l0eTp2ZWN0b3Iuc2l6ZSgpXSk7CiAgICAgZm9yIChhdXRvJiBlbGVtZW50 IDogdmVjdG9yKQotICAgICAgICBbYXJyYXkgYWRkT2JqZWN0OmdldFB0cihtYXBGdW5jdGlvbihl bGVtZW50KSldOworICAgICAgICBbYXJyYXkgYWRkT2JqZWN0OmdldFB0cihmdW5jdGlvbihlbGVt ZW50KSldOwogICAgIHJldHVybiBhcnJheTsKIH0KIAo= 396665 2020-04-16 10:25:30 -0700 2020-04-16 10:36:07 -0700 Patch bug-210610-20200416102530.patch text/plain 4186 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMjYwMDc2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDY2MDU5OTgxZjE3NmFjMjRkOTJhNjUx NTQzYzQzYTgxY2U2Nzk0MWYuLmZkOTMwMjNkZmJjODJmMzRiNzU1ZjgyOWY2NmZjNWNjNTEwOTRh OTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjUgQEAKKzIwMjAtMDQtMTYgIERhbmllbCBCYXRlcyAgPGRhYmF0 ZXNAYXBwbGUuY29tPgorCisgICAgICAgIENsZWFuIHVwIFZlY3RvckNvY29hIGNyZWF0ZU5TQXJy YXkgb3ZlcmxvYWRzIGFuZCBhZGQgZG9jdW1lbnRhdGlvbiBmb3IgY3JlYXRlTlNBcnJheSB0YWtp bmcgYSBtYXAgZnVuY3Rpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIxMDYxMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFJlbW92ZSB1bm5jZXNzYXJ5IGxvY2FsIHZhcmlhYmxlLiBSZW5hbWUgIm1hcCIg dHlwZSBpbiBjcmVhdGVOU0FycmF5IGZ1bmN0aW9uIGZvciBjbGFyaXR5CisgICAgICAgIGFuZCBh ZGQgZG9jdW1lbnRhdGlvbiBmb3IgY3JlYXRlTlNBcnJheSBmdW5jdGlvbiB0aGF0IHRha2VzIGEg bWFwIGZ1bmN0aW9uLgorCisgICAgICAgIEkgd2FzIHRlbXB0ZWQsIGJ1dCBkZWNpZGVkIG5vdCB0 byB3cml0ZSB0aGUgY3JlYXRlTlNBcnJheSBmdW5jdGlvbiB0aGF0IGRvZXMgbm90IHRha2UgYQor ICAgICAgICBtYXAgZnVuY3Rpb24gaW4gdGVybXMgb2YgdGhlIG9uZSB0aGF0IGRpZC4gV2l0aCB0 aGUgInJpZ2h0IiBvcHRpbWl6YXRpb24gc2V0dGluZ3MgdGhlCisgICAgICAgIGNvbXBpbGVyIHNo b3VsZCBlbWl0IHRoZSBzYW1lIGNvZGUsIGJ1dCBJIGRpZG4ndCB2ZXJpZnkgdGhpcy4gU28sIEkg ZGlkbid0IGRvIGl0LgorCisgICAgICAgIFdoaWxlIEkgYW0gaGVyZSwgdXBkYXRlICBtYWtlVmVj dG9yKCkgdG8gY2FsbCBzaHJpbmtUb0ZpdCgpIHRvIHJlZHVjZSB0aGUgbWVtb3J5IGZvb3Rwcmlu dAorICAgICAgICBvZiB0aGUgcmV0dXJuZWQgdmVjdG9yIHNob3VsZCBpdCBlbmQgb2YgaGF2aW5n IGxlc3MgZW50cmllcywgZHVlIHRvIGZpbHRlcmluZywgdGhhbiBpdHMKKyAgICAgICAgaW5pdGlh bCBjYXBhY2l0eS4KKworICAgICAgICAqIHd0Zi9jb2NvYS9WZWN0b3JDb2NvYS5oOgorICAgICAg ICAoV1RGOjpjcmVhdGVOU0FycmF5KTogU2VlIGFib3ZlIGRlc2NyaXB0aW9uLgorICAgICAgICAo V1RGOjptYWtlVmVjdG9yKTogU2hyaW5rIHRvIGZpdCBiZWZvcmUgcmV0dXJuaW5nIHRoZSB2ZWN0 b3IuCisKIDIwMjAtMDQtMTYgIERhbmllbCBCYXRlcyAgPGRhYmF0ZXNAYXBwbGUuY29tPgogCiAg ICAgICAgIE1vdmUgLV9yZXF1ZXN0VGV4dElucHV0Q29udGV4dHNJblJlY3QgdG8gV0tDb250ZW50 VmlldyB0byBzaW1wbGlmeSBpbXBsZW1lbnRhdGlvbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93 dGYvY29jb2EvVmVjdG9yQ29jb2EuaCBiL1NvdXJjZS9XVEYvd3RmL2NvY29hL1ZlY3RvckNvY29h LmgKaW5kZXggZGI1ZGEzMDA3MDU5NTRlMjcxNDM2MDk0Y2UzNjBkZmY2MDU5MmZhZC4uMjgxODY2 MTFlZjAwZWU2NDIyY2JkNTllZDEwOGUzOTRjOGUxZjJmNiAxMDA2NDQKLS0tIGEvU291cmNlL1dU Ri93dGYvY29jb2EvVmVjdG9yQ29jb2EuaAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9jb2NvYS9WZWN0 b3JDb2NvYS5oCkBAIC00NywyNiArNDcsMzEgQEAgbmFtZXNwYWNlIFdURiB7CiAvLyAgICBPcHRp b25hbDxWZWN0b3JFbGVtZW50VHlwZT4gbWFrZVZlY3RvckVsZW1lbnQoY29uc3QgVmVjdG9yRWxl bWVudFR5cGUqLCBpZCBhcnJheUVsZW1lbnQpOwogCiB0ZW1wbGF0ZTx0eXBlbmFtZSBWZWN0b3JU eXBlPiBSZXRhaW5QdHI8TlNBcnJheT4gY3JlYXRlTlNBcnJheShjb25zdCBWZWN0b3JUeXBlJik7 Ci10ZW1wbGF0ZTx0eXBlbmFtZSBWZWN0b3JUeXBlLCB0eXBlbmFtZSBNYXBGdW5jdGlvbj4gUmV0 YWluUHRyPE5TQXJyYXk+IGNyZWF0ZU5TQXJyYXkoY29uc3QgVmVjdG9yVHlwZSYsIE1hcEZ1bmN0 aW9uKTsKIHRlbXBsYXRlPHR5cGVuYW1lIFZlY3RvckVsZW1lbnRUeXBlPiBWZWN0b3I8VmVjdG9y RWxlbWVudFR5cGU+IG1ha2VWZWN0b3IoTlNBcnJheSAqKTsKIAorLy8gQW4gb3ZlcmxvYWQgdGhh dCB0YWtlcyBhIG1hcCBmdW5jdGlvbiBhbmQgcmV0dXJucyBhIE5TQXJyYXkgd2hvc2UgZWxlbWVu dHMgYXJlIHRoZQorLy8gcmVzdWx0IG9mIGNhbGxpbmcgdGhlIG1hcCBmdW5jdGlvbiBvbiBlYWNo IHZlY3RvciBlbGVtZW50LiBMaWtlIHRoZSBtYWtlTlNBcnJheUVsZW1lbnQKKy8vIGZ1bmN0aW9u LCB0aGUgbWFwIGZ1bmN0aW9uIGNhbiByZXR1cm4gZWl0aGVyIGEgUmV0YWluUHRyPGlkPiBvciBh biBpZCBpZiB0aGUgdmFsdWUKKy8vIGlzIGF1dG9yZWxlYXNlZC4gV2hlbiB0aGUgbWFwIGZ1bmN0 aW9uIGlzIG1ha2VOU0FycmF5RWxlbWVudCB0aGVuIHRoaXMgZnVuY3Rpb24KKy8vIGJlaGF2ZXMg aWRlbnRpY2FsbHkgdG8gY3JlYXRlTlNBcnJheSBmdW5jdGlvbiB0aGF0IGRvZXMgbm90IHRha2Ug YSBtYXAgZnVuY3Rpb24uCisKK3RlbXBsYXRlPHR5cGVuYW1lIFZlY3RvclR5cGUsIHR5cGVuYW1l IE1hcEZ1bmN0aW9uVHlwZT4gUmV0YWluUHRyPE5TQXJyYXk+IGNyZWF0ZU5TQXJyYXkoY29uc3Qg VmVjdG9yVHlwZSYsIGNvbnN0IE1hcEZ1bmN0aW9uVHlwZSYpOworCiAvLyBJbXBsZW1lbnRhdGlv biBkZXRhaWxzIG9mIHRoZSBmdW5jdGlvbiB0ZW1wbGF0ZXMgYWJvdmUuCiAKIHRlbXBsYXRlPHR5 cGVuYW1lIFZlY3RvclR5cGU+IFJldGFpblB0cjxOU0FycmF5PiBjcmVhdGVOU0FycmF5KGNvbnN0 IFZlY3RvclR5cGUmIHZlY3RvcikKIHsKLSAgICBhdXRvIHNpemUgPSB2ZWN0b3Iuc2l6ZSgpOwot ICAgIGF1dG8gYXJyYXkgPSBhZG9wdE5TKFtbTlNNdXRhYmxlQXJyYXkgYWxsb2NdIGluaXRXaXRo Q2FwYWNpdHk6c2l6ZV0pOworICAgIGF1dG8gYXJyYXkgPSBhZG9wdE5TKFtbTlNNdXRhYmxlQXJy YXkgYWxsb2NdIGluaXRXaXRoQ2FwYWNpdHk6dmVjdG9yLnNpemUoKV0pOwogICAgIGZvciAoYXV0 byYgZWxlbWVudCA6IHZlY3RvcikKICAgICAgICAgW2FycmF5IGFkZE9iamVjdDpnZXRQdHIobWFr ZU5TQXJyYXlFbGVtZW50KGVsZW1lbnQpKV07CiAgICAgcmV0dXJuIGFycmF5OwogfQogCi10ZW1w bGF0ZTx0eXBlbmFtZSBWZWN0b3JUeXBlLCB0eXBlbmFtZSBNYXBGdW5jdGlvbj4gUmV0YWluUHRy PE5TQXJyYXk+IGNyZWF0ZU5TQXJyYXkoY29uc3QgVmVjdG9yVHlwZSYgdmVjdG9yLCBNYXBGdW5j dGlvbiBtYXBGdW5jdGlvbikKK3RlbXBsYXRlPHR5cGVuYW1lIFZlY3RvclR5cGUsIHR5cGVuYW1l IE1hcEZ1bmN0aW9uVHlwZT4gUmV0YWluUHRyPE5TQXJyYXk+IGNyZWF0ZU5TQXJyYXkoY29uc3Qg VmVjdG9yVHlwZSYgdmVjdG9yLCBjb25zdCBNYXBGdW5jdGlvblR5cGUmIGZ1bmN0aW9uKQogewot ICAgIGF1dG8gc2l6ZSA9IHZlY3Rvci5zaXplKCk7Ci0gICAgYXV0byBhcnJheSA9IGFkb3B0TlMo W1tOU011dGFibGVBcnJheSBhbGxvY10gaW5pdFdpdGhDYXBhY2l0eTpzaXplXSk7CisgICAgYXV0 byBhcnJheSA9IGFkb3B0TlMoW1tOU011dGFibGVBcnJheSBhbGxvY10gaW5pdFdpdGhDYXBhY2l0 eTp2ZWN0b3Iuc2l6ZSgpXSk7CiAgICAgZm9yIChhdXRvJiBlbGVtZW50IDogdmVjdG9yKQotICAg ICAgICBbYXJyYXkgYWRkT2JqZWN0OmdldFB0cihtYXBGdW5jdGlvbihlbGVtZW50KSldOworICAg ICAgICBbYXJyYXkgYWRkT2JqZWN0OmdldFB0cihmdW5jdGlvbihlbGVtZW50KSldOwogICAgIHJl dHVybiBhcnJheTsKIH0KIApAQCAtNzksNiArODQsNyBAQCB0ZW1wbGF0ZTx0eXBlbmFtZSBWZWN0 b3JFbGVtZW50VHlwZT4gVmVjdG9yPFZlY3RvckVsZW1lbnRUeXBlPiBtYWtlVmVjdG9yKE5TQXJy YQogICAgICAgICBpZiAoYXV0byB2ZWN0b3JFbGVtZW50ID0gbWFrZVZlY3RvckVsZW1lbnQodHlw ZWROdWxsLCBlbGVtZW50KSkKICAgICAgICAgICAgIHZlY3Rvci51bmNoZWNrZWRBcHBlbmQoV1RG TW92ZSgqdmVjdG9yRWxlbWVudCkpOwogICAgIH0KKyAgICB2ZWN0b3Iuc2hyaW5rVG9GaXQoKTsK ICAgICByZXR1cm4gdmVjdG9yOwogfQogCg== 396667 2020-04-16 10:36:08 -0700 2020-04-16 11:28:50 -0700 Patch bug-210610-20200416103608.patch text/plain 4529 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMjYwMDc2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDY2MDU5OTgxZjE3NmFjMjRkOTJhNjUx NTQzYzQzYTgxY2U2Nzk0MWYuLjhhNDY0OTQ4MDNhNjU3NzQyNWI1YzhkYTM2MjA5MjAyNWM4OWFh ZDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjUgQEAKKzIwMjAtMDQtMTYgIERhbmllbCBCYXRlcyAgPGRhYmF0 ZXNAYXBwbGUuY29tPgorCisgICAgICAgIENsZWFuIHVwIFZlY3RvckNvY29hIGNyZWF0ZU5TQXJy YXkgb3ZlcmxvYWRzIGFuZCBhZGQgZG9jdW1lbnRhdGlvbiBmb3IgY3JlYXRlTlNBcnJheSB0YWtp bmcgYSBtYXAgZnVuY3Rpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIxMDYxMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFJlbW92ZSB1bm5lY2Vzc2FyeSBsb2NhbCB2YXJpYWJsZS4gUmVuYW1lICJtYXAi IHR5cGUgaW4gY3JlYXRlTlNBcnJheSBmdW5jdGlvbiBmb3IgY2xhcml0eQorICAgICAgICBhbmQg YWRkIGRvY3VtZW50YXRpb24gZm9yIGNyZWF0ZU5TQXJyYXkgZnVuY3Rpb24gdGhhdCB0YWtlcyBh IG1hcCBmdW5jdGlvbi4KKworICAgICAgICBJIHdhcyB0ZW1wdGVkLCBidXQgZGVjaWRlZCBub3Qg dG8gd3JpdGUgdGhlIGNyZWF0ZU5TQXJyYXkgZnVuY3Rpb24gdGhhdCBkb2VzIG5vdCB0YWtlIGEK KyAgICAgICAgbWFwIGZ1bmN0aW9uIGluIHRlcm1zIG9mIHRoZSBvbmUgdGhhdCBkaWQuIFdpdGgg dGhlICJyaWdodCIgb3B0aW1pemF0aW9uIHNldHRpbmdzIHRoZQorICAgICAgICBjb21waWxlciBz aG91bGQgZW1pdCB0aGUgc2FtZSBjb2RlLCBidXQgSSBkaWRuJ3QgdmVyaWZ5IHRoaXMuIFNvLCBJ IGRpZG4ndCBkbyBpdC4KKworICAgICAgICBXaGlsZSBJIGFtIGhlcmUsIHVwZGF0ZSAgbWFrZVZl Y3RvcigpIHRvIGNhbGwgc2hyaW5rVG9GaXQoKSB0byByZWR1Y2UgdGhlIG1lbW9yeSBmb290cHJp bnQKKyAgICAgICAgb2YgdGhlIHJldHVybmVkIHZlY3RvciBzaG91bGQgaXQgZW5kIG9mIGhhdmlu ZyBsZXNzIGVudHJpZXMsIGR1ZSB0byBmaWx0ZXJpbmcsIHRoYW4gaXRzCisgICAgICAgIGluaXRp YWwgY2FwYWNpdHkuIEFsc28gY2hhbmdlIGNvbnN0ZXhwciBjb25zdCB0byBjb25zdGV4cHIsIHdo aWNoIGlzIG1vcmUgaWRpb21hdGljLgorCisgICAgICAgICogd3RmL2NvY29hL1ZlY3RvckNvY29h Lmg6CisgICAgICAgIChXVEY6OmNyZWF0ZU5TQXJyYXkpOiBTZWUgYWJvdmUgZGVzY3JpcHRpb24u CisgICAgICAgIChXVEY6Om1ha2VWZWN0b3IpOiBTaHJpbmsgdG8gZml0IGJlZm9yZSByZXR1cm5p bmcgdGhlIHZlY3Rvci4gU2VlIGFib3ZlIGZvciBtb3JlIGRldGFpbHMuCisKIDIwMjAtMDQtMTYg IERhbmllbCBCYXRlcyAgPGRhYmF0ZXNAYXBwbGUuY29tPgogCiAgICAgICAgIE1vdmUgLV9yZXF1 ZXN0VGV4dElucHV0Q29udGV4dHNJblJlY3QgdG8gV0tDb250ZW50VmlldyB0byBzaW1wbGlmeSBp bXBsZW1lbnRhdGlvbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93dGYvY29jb2EvVmVjdG9yQ29j b2EuaCBiL1NvdXJjZS9XVEYvd3RmL2NvY29hL1ZlY3RvckNvY29hLmgKaW5kZXggZGI1ZGEzMDA3 MDU5NTRlMjcxNDM2MDk0Y2UzNjBkZmY2MDU5MmZhZC4uODZlYmE3ZDFlOWRiZTkwOTY1ZmEwODVj Yjk0M2NkYmQ5NjE4ZjA2YSAxMDA2NDQKLS0tIGEvU291cmNlL1dURi93dGYvY29jb2EvVmVjdG9y Q29jb2EuaAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9jb2NvYS9WZWN0b3JDb2NvYS5oCkBAIC00Nywy NiArNDcsMzEgQEAgbmFtZXNwYWNlIFdURiB7CiAvLyAgICBPcHRpb25hbDxWZWN0b3JFbGVtZW50 VHlwZT4gbWFrZVZlY3RvckVsZW1lbnQoY29uc3QgVmVjdG9yRWxlbWVudFR5cGUqLCBpZCBhcnJh eUVsZW1lbnQpOwogCiB0ZW1wbGF0ZTx0eXBlbmFtZSBWZWN0b3JUeXBlPiBSZXRhaW5QdHI8TlNB cnJheT4gY3JlYXRlTlNBcnJheShjb25zdCBWZWN0b3JUeXBlJik7Ci10ZW1wbGF0ZTx0eXBlbmFt ZSBWZWN0b3JUeXBlLCB0eXBlbmFtZSBNYXBGdW5jdGlvbj4gUmV0YWluUHRyPE5TQXJyYXk+IGNy ZWF0ZU5TQXJyYXkoY29uc3QgVmVjdG9yVHlwZSYsIE1hcEZ1bmN0aW9uKTsKIHRlbXBsYXRlPHR5 cGVuYW1lIFZlY3RvckVsZW1lbnRUeXBlPiBWZWN0b3I8VmVjdG9yRWxlbWVudFR5cGU+IG1ha2VW ZWN0b3IoTlNBcnJheSAqKTsKIAorLy8gQW4gb3ZlcmxvYWQgdGhhdCB0YWtlcyBhIG1hcCBmdW5j dGlvbiBhbmQgcmV0dXJucyBhIE5TQXJyYXkgd2hvc2UgZWxlbWVudHMgYXJlIHRoZQorLy8gcmVz dWx0IG9mIGNhbGxpbmcgdGhlIG1hcCBmdW5jdGlvbiBvbiBlYWNoIHZlY3RvciBlbGVtZW50LiBM aWtlIHRoZSBtYWtlTlNBcnJheUVsZW1lbnQKKy8vIGZ1bmN0aW9uLCB0aGUgbWFwIGZ1bmN0aW9u IGNhbiByZXR1cm4gZWl0aGVyIGEgUmV0YWluUHRyPGlkPiBvciBhbiBpZCBpZiB0aGUgdmFsdWUK Ky8vIGlzIGF1dG9yZWxlYXNlZC4gV2hlbiB0aGUgbWFwIGZ1bmN0aW9uIGlzIG1ha2VOU0FycmF5 RWxlbWVudCB0aGVuIHRoaXMgZnVuY3Rpb24KKy8vIGJlaGF2ZXMgaWRlbnRpY2FsbHkgdG8gY3Jl YXRlTlNBcnJheSBmdW5jdGlvbiB0aGF0IGRvZXMgbm90IHRha2UgYSBtYXAgZnVuY3Rpb24uCisK K3RlbXBsYXRlPHR5cGVuYW1lIFZlY3RvclR5cGUsIHR5cGVuYW1lIE1hcEZ1bmN0aW9uVHlwZT4g UmV0YWluUHRyPE5TQXJyYXk+IGNyZWF0ZU5TQXJyYXkoY29uc3QgVmVjdG9yVHlwZSYsIGNvbnN0 IE1hcEZ1bmN0aW9uVHlwZSYpOworCiAvLyBJbXBsZW1lbnRhdGlvbiBkZXRhaWxzIG9mIHRoZSBm dW5jdGlvbiB0ZW1wbGF0ZXMgYWJvdmUuCiAKIHRlbXBsYXRlPHR5cGVuYW1lIFZlY3RvclR5cGU+ IFJldGFpblB0cjxOU0FycmF5PiBjcmVhdGVOU0FycmF5KGNvbnN0IFZlY3RvclR5cGUmIHZlY3Rv cikKIHsKLSAgICBhdXRvIHNpemUgPSB2ZWN0b3Iuc2l6ZSgpOwotICAgIGF1dG8gYXJyYXkgPSBh ZG9wdE5TKFtbTlNNdXRhYmxlQXJyYXkgYWxsb2NdIGluaXRXaXRoQ2FwYWNpdHk6c2l6ZV0pOwor ICAgIGF1dG8gYXJyYXkgPSBhZG9wdE5TKFtbTlNNdXRhYmxlQXJyYXkgYWxsb2NdIGluaXRXaXRo Q2FwYWNpdHk6dmVjdG9yLnNpemUoKV0pOwogICAgIGZvciAoYXV0byYgZWxlbWVudCA6IHZlY3Rv cikKICAgICAgICAgW2FycmF5IGFkZE9iamVjdDpnZXRQdHIobWFrZU5TQXJyYXlFbGVtZW50KGVs ZW1lbnQpKV07CiAgICAgcmV0dXJuIGFycmF5OwogfQogCi10ZW1wbGF0ZTx0eXBlbmFtZSBWZWN0 b3JUeXBlLCB0eXBlbmFtZSBNYXBGdW5jdGlvbj4gUmV0YWluUHRyPE5TQXJyYXk+IGNyZWF0ZU5T QXJyYXkoY29uc3QgVmVjdG9yVHlwZSYgdmVjdG9yLCBNYXBGdW5jdGlvbiBtYXBGdW5jdGlvbikK K3RlbXBsYXRlPHR5cGVuYW1lIFZlY3RvclR5cGUsIHR5cGVuYW1lIE1hcEZ1bmN0aW9uVHlwZT4g UmV0YWluUHRyPE5TQXJyYXk+IGNyZWF0ZU5TQXJyYXkoY29uc3QgVmVjdG9yVHlwZSYgdmVjdG9y LCBjb25zdCBNYXBGdW5jdGlvblR5cGUmIGZ1bmN0aW9uKQogewotICAgIGF1dG8gc2l6ZSA9IHZl Y3Rvci5zaXplKCk7Ci0gICAgYXV0byBhcnJheSA9IGFkb3B0TlMoW1tOU011dGFibGVBcnJheSBh bGxvY10gaW5pdFdpdGhDYXBhY2l0eTpzaXplXSk7CisgICAgYXV0byBhcnJheSA9IGFkb3B0TlMo W1tOU011dGFibGVBcnJheSBhbGxvY10gaW5pdFdpdGhDYXBhY2l0eTp2ZWN0b3Iuc2l6ZSgpXSk7 CiAgICAgZm9yIChhdXRvJiBlbGVtZW50IDogdmVjdG9yKQotICAgICAgICBbYXJyYXkgYWRkT2Jq ZWN0OmdldFB0cihtYXBGdW5jdGlvbihlbGVtZW50KSldOworICAgICAgICBbYXJyYXkgYWRkT2Jq ZWN0OmdldFB0cihmdW5jdGlvbihlbGVtZW50KSldOwogICAgIHJldHVybiBhcnJheTsKIH0KIApA QCAtNzUsMTAgKzgwLDExIEBAIHRlbXBsYXRlPHR5cGVuYW1lIFZlY3RvckVsZW1lbnRUeXBlPiBW ZWN0b3I8VmVjdG9yRWxlbWVudFR5cGU+IG1ha2VWZWN0b3IoTlNBcnJhCiAgICAgVmVjdG9yPFZl Y3RvckVsZW1lbnRUeXBlPiB2ZWN0b3I7CiAgICAgdmVjdG9yLnJlc2VydmVJbml0aWFsQ2FwYWNp dHkoYXJyYXkuY291bnQpOwogICAgIGZvciAoaWQgZWxlbWVudCBpbiBhcnJheSkgewotICAgICAg ICBjb25zdGV4cHIgY29uc3QgVmVjdG9yRWxlbWVudFR5cGUqIHR5cGVkTnVsbCA9IG51bGxwdHI7 CisgICAgICAgIGNvbnN0ZXhwciBWZWN0b3JFbGVtZW50VHlwZSogdHlwZWROdWxsID0gbnVsbHB0 cjsKICAgICAgICAgaWYgKGF1dG8gdmVjdG9yRWxlbWVudCA9IG1ha2VWZWN0b3JFbGVtZW50KHR5 cGVkTnVsbCwgZWxlbWVudCkpCiAgICAgICAgICAgICB2ZWN0b3IudW5jaGVja2VkQXBwZW5kKFdU Rk1vdmUoKnZlY3RvckVsZW1lbnQpKTsKICAgICB9CisgICAgdmVjdG9yLnNocmlua1RvRml0KCk7 CiAgICAgcmV0dXJuIHZlY3RvcjsKIH0KIAo= 396675 2020-04-16 11:28:51 -0700 2020-04-16 11:28:51 -0700 To Land bug-210610-20200416112850.patch text/plain 4054 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMjYwMDc2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDY2MDU5OTgxZjE3NmFjMjRkOTJhNjUx NTQzYzQzYTgxY2U2Nzk0MWYuLmNlYWIwNGExYjBkYzI0ZmFlMDZkMjU5NjVkZjFhYTUwNmZlNGZh MzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjUgQEAKKzIwMjAtMDQtMTYgIERhbmllbCBCYXRlcyAgPGRhYmF0 ZXNAYXBwbGUuY29tPgorCisgICAgICAgIENsZWFuIHVwIFZlY3RvckNvY29hIGNyZWF0ZU5TQXJy YXkgb3ZlcmxvYWRzIGFuZCBhZGQgZG9jdW1lbnRhdGlvbiBmb3IgY3JlYXRlTlNBcnJheSB0YWtp bmcgYSBtYXAgZnVuY3Rpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIxMDYxMAorCisgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgorCisg ICAgICAgIFJlbW92ZSB1bm5lY2Vzc2FyeSBsb2NhbCB2YXJpYWJsZS4gUmVuYW1lICJtYXAiIHR5 cGUgaW4gY3JlYXRlTlNBcnJheSBmdW5jdGlvbiBmb3IgY2xhcml0eQorICAgICAgICBhbmQgYWRk IGRvY3VtZW50YXRpb24gZm9yIGNyZWF0ZU5TQXJyYXkgZnVuY3Rpb24gdGhhdCB0YWtlcyBhIG1h cCBmdW5jdGlvbi4KKworICAgICAgICBJIHdhcyB0ZW1wdGVkLCBidXQgZGVjaWRlZCBub3QgdG8g d3JpdGUgdGhlIGNyZWF0ZU5TQXJyYXkgZnVuY3Rpb24gdGhhdCBkb2VzIG5vdCB0YWtlIGEKKyAg ICAgICAgbWFwIGZ1bmN0aW9uIGluIHRlcm1zIG9mIHRoZSBvbmUgdGhhdCBkaWQuIFdpdGggdGhl ICJyaWdodCIgb3B0aW1pemF0aW9uIHNldHRpbmdzIHRoZQorICAgICAgICBjb21waWxlciBzaG91 bGQgZW1pdCB0aGUgc2FtZSBjb2RlLCBidXQgSSBkaWRuJ3QgdmVyaWZ5IHRoaXMuIFNvLCBJIGRp ZG4ndCBkbyBpdC4KKworICAgICAgICBXaGlsZSBJIGFtIGhlcmUsIHVwZGF0ZSAgbWFrZVZlY3Rv cigpIHRvIGNhbGwgc2hyaW5rVG9GaXQoKSB0byByZWR1Y2UgdGhlIG1lbW9yeSBmb290cHJpbnQK KyAgICAgICAgb2YgdGhlIHJldHVybmVkIHZlY3RvciBzaG91bGQgaXQgZW5kIG9mIGhhdmluZyBs ZXNzIGVudHJpZXMsIGR1ZSB0byBmaWx0ZXJpbmcsIHRoYW4gaXRzCisgICAgICAgIGluaXRpYWwg Y2FwYWNpdHkuCisKKyAgICAgICAgKiB3dGYvY29jb2EvVmVjdG9yQ29jb2EuaDoKKyAgICAgICAg KFdURjo6Y3JlYXRlTlNBcnJheSk6IFNlZSBhYm92ZSBkZXNjcmlwdGlvbi4KKyAgICAgICAgKFdU Rjo6bWFrZVZlY3Rvcik6IFNocmluayB0byBmaXQgYmVmb3JlIHJldHVybmluZyB0aGUgdmVjdG9y LiBTZWUgYWJvdmUgZm9yIG1vcmUgZGV0YWlscy4KKwogMjAyMC0wNC0xNiAgRGFuaWVsIEJhdGVz ICA8ZGFiYXRlc0BhcHBsZS5jb20+CiAKICAgICAgICAgTW92ZSAtX3JlcXVlc3RUZXh0SW5wdXRD b250ZXh0c0luUmVjdCB0byBXS0NvbnRlbnRWaWV3IHRvIHNpbXBsaWZ5IGltcGxlbWVudGF0aW9u CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi9jb2NvYS9WZWN0b3JDb2NvYS5oIGIvU291cmNl L1dURi93dGYvY29jb2EvVmVjdG9yQ29jb2EuaAppbmRleCBkYjVkYTMwMDcwNTk1NGUyNzE0MzYw OTRjZTM2MGRmZjYwNTkyZmFkLi5iOGM5NTZhNjhhNDM0MzE1M2YxNmEzYzg4YmFkNjM1NTVjNjNk N2M4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9jb2NvYS9WZWN0b3JDb2NvYS5oCisrKyBi L1NvdXJjZS9XVEYvd3RmL2NvY29hL1ZlY3RvckNvY29hLmgKQEAgLTQ3LDI2ICs0NywyOCBAQCBu YW1lc3BhY2UgV1RGIHsKIC8vICAgIE9wdGlvbmFsPFZlY3RvckVsZW1lbnRUeXBlPiBtYWtlVmVj dG9yRWxlbWVudChjb25zdCBWZWN0b3JFbGVtZW50VHlwZSosIGlkIGFycmF5RWxlbWVudCk7CiAK IHRlbXBsYXRlPHR5cGVuYW1lIFZlY3RvclR5cGU+IFJldGFpblB0cjxOU0FycmF5PiBjcmVhdGVO U0FycmF5KGNvbnN0IFZlY3RvclR5cGUmKTsKLXRlbXBsYXRlPHR5cGVuYW1lIFZlY3RvclR5cGUs IHR5cGVuYW1lIE1hcEZ1bmN0aW9uPiBSZXRhaW5QdHI8TlNBcnJheT4gY3JlYXRlTlNBcnJheShj b25zdCBWZWN0b3JUeXBlJiwgTWFwRnVuY3Rpb24pOwogdGVtcGxhdGU8dHlwZW5hbWUgVmVjdG9y RWxlbWVudFR5cGU+IFZlY3RvcjxWZWN0b3JFbGVtZW50VHlwZT4gbWFrZVZlY3RvcihOU0FycmF5 ICopOwogCisvLyBUaGlzIG92ZXJsb2FkIG9mIGNyZWF0ZU5TQXJyYXkgdGFrZXMgYSBmdW5jdGlv biB0byBtYXAgZWFjaCB2ZWN0b3IgZWxlbWVudCB0byBhbiBPYmplY3RpdmUtQyBvYmplY3QuCisv LyBUaGUgbWFwIGZ1bmN0aW9uIGhhcyB0aGUgc2FtZSBpbnRlcmZhY2UgYXMgdGhlIG1ha2VOU0Fy cmF5RWxlbWVudCBmdW5jdGlvbiBhYm92ZSwgYnV0IGNhbiBiZSBhbnkKKy8vIGZ1bmN0aW9uIGlu Y2x1ZGluZyBhIGxhbWJkYSwgYSBmdW5jdGlvbi1saWtlIG9iamVjdCwgb3IgRnVuY3Rpb248Pi4K K3RlbXBsYXRlPHR5cGVuYW1lIFZlY3RvclR5cGUsIHR5cGVuYW1lIE1hcEZ1bmN0aW9uVHlwZT4g UmV0YWluUHRyPE5TQXJyYXk+IGNyZWF0ZU5TQXJyYXkoY29uc3QgVmVjdG9yVHlwZSYsIGNvbnN0 IE1hcEZ1bmN0aW9uVHlwZSYpOworCiAvLyBJbXBsZW1lbnRhdGlvbiBkZXRhaWxzIG9mIHRoZSBm dW5jdGlvbiB0ZW1wbGF0ZXMgYWJvdmUuCiAKIHRlbXBsYXRlPHR5cGVuYW1lIFZlY3RvclR5cGU+ IFJldGFpblB0cjxOU0FycmF5PiBjcmVhdGVOU0FycmF5KGNvbnN0IFZlY3RvclR5cGUmIHZlY3Rv cikKIHsKLSAgICBhdXRvIHNpemUgPSB2ZWN0b3Iuc2l6ZSgpOwotICAgIGF1dG8gYXJyYXkgPSBh ZG9wdE5TKFtbTlNNdXRhYmxlQXJyYXkgYWxsb2NdIGluaXRXaXRoQ2FwYWNpdHk6c2l6ZV0pOwor ICAgIGF1dG8gYXJyYXkgPSBhZG9wdE5TKFtbTlNNdXRhYmxlQXJyYXkgYWxsb2NdIGluaXRXaXRo Q2FwYWNpdHk6dmVjdG9yLnNpemUoKV0pOwogICAgIGZvciAoYXV0byYgZWxlbWVudCA6IHZlY3Rv cikKICAgICAgICAgW2FycmF5IGFkZE9iamVjdDpnZXRQdHIobWFrZU5TQXJyYXlFbGVtZW50KGVs ZW1lbnQpKV07CiAgICAgcmV0dXJuIGFycmF5OwogfQogCi10ZW1wbGF0ZTx0eXBlbmFtZSBWZWN0 b3JUeXBlLCB0eXBlbmFtZSBNYXBGdW5jdGlvbj4gUmV0YWluUHRyPE5TQXJyYXk+IGNyZWF0ZU5T QXJyYXkoY29uc3QgVmVjdG9yVHlwZSYgdmVjdG9yLCBNYXBGdW5jdGlvbiBtYXBGdW5jdGlvbikK K3RlbXBsYXRlPHR5cGVuYW1lIFZlY3RvclR5cGUsIHR5cGVuYW1lIE1hcEZ1bmN0aW9uVHlwZT4g UmV0YWluUHRyPE5TQXJyYXk+IGNyZWF0ZU5TQXJyYXkoY29uc3QgVmVjdG9yVHlwZSYgdmVjdG9y LCBjb25zdCBNYXBGdW5jdGlvblR5cGUmIGZ1bmN0aW9uKQogewotICAgIGF1dG8gc2l6ZSA9IHZl Y3Rvci5zaXplKCk7Ci0gICAgYXV0byBhcnJheSA9IGFkb3B0TlMoW1tOU011dGFibGVBcnJheSBh bGxvY10gaW5pdFdpdGhDYXBhY2l0eTpzaXplXSk7CisgICAgYXV0byBhcnJheSA9IGFkb3B0TlMo W1tOU011dGFibGVBcnJheSBhbGxvY10gaW5pdFdpdGhDYXBhY2l0eTp2ZWN0b3Iuc2l6ZSgpXSk7 CiAgICAgZm9yIChhdXRvJiBlbGVtZW50IDogdmVjdG9yKQotICAgICAgICBbYXJyYXkgYWRkT2Jq ZWN0OmdldFB0cihtYXBGdW5jdGlvbihlbGVtZW50KSldOworICAgICAgICBbYXJyYXkgYWRkT2Jq ZWN0OmdldFB0cihmdW5jdGlvbihlbGVtZW50KSldOwogICAgIHJldHVybiBhcnJheTsKIH0KIApA QCAtNzksNiArODEsNyBAQCB0ZW1wbGF0ZTx0eXBlbmFtZSBWZWN0b3JFbGVtZW50VHlwZT4gVmVj dG9yPFZlY3RvckVsZW1lbnRUeXBlPiBtYWtlVmVjdG9yKE5TQXJyYQogICAgICAgICBpZiAoYXV0 byB2ZWN0b3JFbGVtZW50ID0gbWFrZVZlY3RvckVsZW1lbnQodHlwZWROdWxsLCBlbGVtZW50KSkK ICAgICAgICAgICAgIHZlY3Rvci51bmNoZWNrZWRBcHBlbmQoV1RGTW92ZSgqdmVjdG9yRWxlbWVu dCkpOwogICAgIH0KKyAgICB2ZWN0b3Iuc2hyaW5rVG9GaXQoKTsKICAgICByZXR1cm4gdmVjdG9y OwogfQogCg==