223377 2021-03-17 06:14:38 -0700 [css-flexbox] Make {main|cross}SizeForPercentageResolution() return booleans instead of actual sizes 2021-03-19 02:16:15 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 svillar svillar achristensen changseok esprehn+autocc ews-watchlist glenn jfernandez kondapallykalyan pdr rbuis rego simon.fraser svillar webkit-bug-importer oldest_to_newest 1740679 0 svillar 2021-03-17 06:14:38 -0700 [css-flex] Make XXXForPercentageResolution() methods return booleans instead of actual sizes 1740683 1 423479 svillar 2021-03-17 06:24:32 -0700 Created attachment 423479 Patch 1741177 2 423479 rego 2021-03-18 05:33:27 -0700 Comment on attachment 423479 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=423479&action=review Nice cleanup, but I have a couple of comments. > Source/WebCore/rendering/RenderFlexibleBox.cpp:1237 > +bool RenderFlexibleBox::childCrossSizeIsDefiniteForPercentageResolution(const RenderBox& child) I don't think this name and the next one are accurate. If a flex item has fixed width and height, its main/cross size is definite, but this might be returning false. This is checking if we should use or not the OverridingLogicalHeight to compute percentages, but the method name is confusing. > Source/WebCore/rendering/RenderFlexibleBox.h:73 > + bool childCrossSizeIsDefiniteForPercentageResolution(const RenderBox&); > + bool childMainSizeIsDefiniteForPercentageResolution(const RenderBox&); Why are you making these 2 methods public? 1741206 3 423479 svillar 2021-03-18 08:12:11 -0700 Comment on attachment 423479 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=423479&action=review >> Source/WebCore/rendering/RenderFlexibleBox.cpp:1237 >> +bool RenderFlexibleBox::childCrossSizeIsDefiniteForPercentageResolution(const RenderBox& child) > > I don't think this name and the next one are accurate. > > If a flex item has fixed width and height, its main/cross size is definite, but this might be returning false. > This is checking if we should use or not the OverridingLogicalHeight to compute percentages, but the method name is confusing. Right, I agree I'll rename then. >> Source/WebCore/rendering/RenderFlexibleBox.h:73 >> + bool childMainSizeIsDefiniteForPercentageResolution(const RenderBox&); > > Why are you making these 2 methods public? Ups, I just put them all together but they were away for a reason :) 1741210 4 423602 svillar 2021-03-18 08:51:46 -0700 Created attachment 423602 Patch 1741214 5 423602 rego 2021-03-18 09:01:54 -0700 Comment on attachment 423602 Patch r=me 1741630 6 svillar 2021-03-19 02:15:07 -0700 Committed r274708 (235528@main): <https://commits.webkit.org/235528@main> 1741631 7 webkit-bug-importer 2021-03-19 02:16:15 -0700 <rdar://problem/75612783> 423479 2021-03-17 06:24:32 -0700 2021-03-18 08:51:40 -0700 Patch bug-223377-20210317142430.patch text/plain 11375 svillar U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0NTU3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGI2MzViMTMzMjMwNzZh NzY2NWU3NTkwYjViMTg3OGJkODQzNWY4ZS4uYmI0MTcxMjc0NGVjOWEzZTFiYTU3MWIwN2IzMTUy ODBkY2M2YzBkMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDIxLTAzLTE3ICBTZXJn aW8gVmlsbGFyIFNlbmluICA8c3ZpbGxhckBpZ2FsaWEuY29tPgorCisgICAgICAgIFtjc3MtZmxl eF0gTWFrZSB7bWFpbnxjcm9zc31TaXplRm9yUGVyY2VudGFnZVJlc29sdXRpb24oKSByZXR1cm4g Ym9vbGVhbnMgaW5zdGVhZCBvZiBhY3R1YWwgc2l6ZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMzM3NworCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZXNlIHR3byBtZXRob2RzIHdlcmUgb25seSBjYWxs ZWQgYnkgY2hpbGRMb2dpY2FsSGVpZ2h0Rm9yUGVyY2VudGFnZVJlc29sdXRpb24oKSBhbmQgdGhl eSBlaXRoZXIgcmV0dXJuZWQKKyAgICAgICAgV1RGOjpudWxsb3B0IG9yIHRoZSBvdmVycmlkaW5n Q29udGVudExvZ2ljYWxIZWlnaHQoKS4gV2UgY291bGQgc2ltcGxpZnkgYSBiaXQgdGhlIGNvZGUg YnkgcmV0dXJuaW5nIGEgYm9vbGVhbgorICAgICAgICB3aGljaCBtZWFucyB3aGV0aGVyIHRoZSBv dmVycmlkaW5nIGNvbnRlbnQgbG9naWNhbCBoZWlnaHQgc2hvdWxkIGJlIHVzZWQgdG8gcmVzb2x2 ZSBhIHBlcmNlbnRhZ2Ugb3Igbm90LiBBcGFydAorICAgICAgICBmcm9tIGNoYW5naW5nIHRoZSBy ZXR1cm4gdmFsdWUgd2UncmUgYWxzbyBpbXByb3ZpbmcgdGhlIG5hbWluZyBzbyBpdCBiZWNvbWVz IG9idmlvdXMgdGhhdCB3ZSBhcmUgZGVhbGluZyB3aXRoCisgICAgICAgIGZsZXggaXRlbXMgYW5k IG5vdCB0aGUgZmxleCBjb250YWluZXIuCisKKyAgICAgICAgV2UncmUgYWxzbyByZW1vdmluZyBz b21lIGNvbW1lbnRzIGluIHRob3NlIG1ldGhvZHMgdGhhdCB3ZXJlIG5vdCByZWFsbHkgYWNjdXJh dGUuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIGFzIHRoZXJlIGlzIG5vIGNoYW5nZSBpbiBmdW5j dGlvbmFsaXR5LgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrOjphdmFpbGFibGVMb2dpY2FsSGVpZ2h0Rm9yUGVyY2Vu dGFnZUNvbXB1dGF0aW9uIGNvbnN0KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQm94LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6Y29tcHV0ZVJlcGxhY2VkTG9naWNhbEhl aWdodFVzaW5nIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6YXZhaWxhYmxl TG9naWNhbEhlaWdodFVzaW5nIGNvbnN0KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQm94 TW9kZWxPYmplY3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94TW9kZWxPYmplY3Q6 Omhhc0F1dG9IZWlnaHRPckNvbnRhaW5pbmdCbG9ja1dpdGhBdXRvSGVpZ2h0IGNvbnN0KToKKyAg ICAgICAgKiByZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwOgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVyRmxleGlibGVCb3g6OmNoaWxkQ3Jvc3NTaXplSXNEZWZpbml0ZUZvclBlcmNlbnRh Z2VSZXNvbHV0aW9uKTogUmVuYW1lZCBmcm9tIGNyb3NzU2l6ZUZvclBlcmNlbnRhZ2VSZXNvbHV0 aW9uLgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxleGlibGVCb3g6OmNoaWxkTWFpblNpemVJ c0RlZmluaXRlRm9yUGVyY2VudGFnZVJlc29sdXRpb24pOiBSZW5hbWVkIGZyb20gbWFpblNpemVG b3JQZXJjZW50YWdlUmVzb2x1dGlvbi4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxl Qm94Ojp1c2VDaGlsZE92ZXJyaWRpbmdMb2dpY2FsSGVpZ2h0Rm9yUGVyY2VudGFnZVJlc29sdXRp b24pOiBSZW5hbWVkIGZyb20gY2hpbGRMb2dpY2FsSGVpZ2h0Rm9yUGVyY2VudGFnZVJlc29sdXRp b24uCisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6Y3Jvc3NTaXplRm9yUGVy Y2VudGFnZVJlc29sdXRpb24pOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxl eGlibGVCb3g6Om1haW5TaXplRm9yUGVyY2VudGFnZVJlc29sdXRpb24pOiBEZWxldGVkLgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyRmxleGlibGVCb3g6OmNoaWxkTG9naWNhbEhlaWdodEZvclBl cmNlbnRhZ2VSZXNvbHV0aW9uKTogRGVsZXRlZC4KKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVy RmxleGlibGVCb3guaDoKKwogMjAyMS0wMy0xNyAgS2ltbW8gS2lubnVuZW4gIDxra2lubnVuZW5A YXBwbGUuY29tPgogCiAgICAgICAgIFNodXRkb3duIEFOR0xFIG9uIEdQVSBwcm9jZXNzIHdoZW4g bGFzdCBXZWJHTCBjb250ZXh0IGlzIGRlc3Ryb3llZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJCbG9jay5jcHAKaW5kZXggMTkwMDQzZTQzNzVlY2ZlOTJjZGNlZjMwYmRkOGViMWQzNTM5 ZjE3Yy4uODAxNDA4NTI1OGZhN2EyYzg0MDAyNjZhNDcyZDM2OWIwNTVkMDFkNiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCkBAIC0zMjA3LDEyICszMjA3LDggQEAg T3B0aW9uYWw8TGF5b3V0VW5pdD4gUmVuZGVyQmxvY2s6OmF2YWlsYWJsZUxvZ2ljYWxIZWlnaHRG b3JQZXJjZW50YWdlQ29tcHV0YXRpb24KICAgICAvLyB0aGF0IGNhbiBiZSB1c2VkIGZvciBhbnkg cGVyY2VudGFnZSBjb21wdXRhdGlvbnMuCiAgICAgYm9vbCBpc091dE9mRmxvd1Bvc2l0aW9uZWRX aXRoU3BlY2lmaWVkSGVpZ2h0ID0gaXNPdXRPZkZsb3dQb3NpdGlvbmVkKCkgJiYgKCFzdHlsZVRv VXNlLmxvZ2ljYWxIZWlnaHQoKS5pc0F1dG8oKSB8fCAoIXN0eWxlVG9Vc2UubG9naWNhbFRvcCgp LmlzQXV0bygpICYmICFzdHlsZVRvVXNlLmxvZ2ljYWxCb3R0b20oKS5pc0F1dG8oKSkpOwogICAg IAotICAgIE9wdGlvbmFsPExheW91dFVuaXQ+IHN0cmV0Y2hlZEZsZXhIZWlnaHQ7Ci0gICAgaWYg KGlzRmxleEl0ZW0oKSkKLSAgICAgICAgc3RyZXRjaGVkRmxleEhlaWdodCA9IGRvd25jYXN0PFJl bmRlckZsZXhpYmxlQm94PihwYXJlbnQoKSktPmNoaWxkTG9naWNhbEhlaWdodEZvclBlcmNlbnRh Z2VSZXNvbHV0aW9uKCp0aGlzKTsKLSAgICAKLSAgICBpZiAoc3RyZXRjaGVkRmxleEhlaWdodCkK LSAgICAgICAgYXZhaWxhYmxlSGVpZ2h0ID0gc3RyZXRjaGVkRmxleEhlaWdodDsKKyAgICBpZiAo aXNGbGV4SXRlbSgpICYmIGRvd25jYXN0PFJlbmRlckZsZXhpYmxlQm94PihwYXJlbnQoKSktPnVz ZUNoaWxkT3ZlcnJpZGluZ0xvZ2ljYWxIZWlnaHRGb3JQZXJjZW50YWdlUmVzb2x1dGlvbigqdGhp cykpCisgICAgICAgIGF2YWlsYWJsZUhlaWdodCA9IG92ZXJyaWRpbmdDb250ZW50TG9naWNhbEhl aWdodCgpOwogICAgIGVsc2UgaWYgKGlzR3JpZEl0ZW0oKSAmJiBoYXNPdmVycmlkaW5nTG9naWNh bEhlaWdodCgpKQogICAgICAgICBhdmFpbGFibGVIZWlnaHQgPSBvdmVycmlkaW5nQ29udGVudExv Z2ljYWxIZWlnaHQoKTsKICAgICBlbHNlIGlmIChzdHlsZVRvVXNlLmxvZ2ljYWxIZWlnaHQoKS5p c0ZpeGVkKCkpIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJC b3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKaW5kZXggZDhl NTY3ZTg3MGMxNjVmYTM3MzFkY2NmOWZiZTYzMTc4MGY5NTlmZC4uZjhlMWQ5NzI0NGZmZWI4N2Q0 ZjVlZTAxMWIwYTUzNGI0NWU4YWM5MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJv eC5jcHAKQEAgLTMzMTIsOCArMzMxMiw4IEBAIExheW91dFVuaXQgUmVuZGVyQm94Ojpjb21wdXRl UmVwbGFjZWRMb2dpY2FsSGVpZ2h0VXNpbmcoU2l6ZVR5cGUgaGVpZ2h0VHlwZSwgTGVuCiAgICAg ICAgIGlmIChpczxSZW5kZXJCbG9jaz4oY29udGFpbmVyKSkgewogICAgICAgICAgICAgYXV0byog YmxvY2sgPSBkb3duY2FzdDxSZW5kZXJCbG9jaz4oY29udGFpbmVyKTsKICAgICAgICAgICAgIGJs b2NrLT5hZGRQZXJjZW50SGVpZ2h0RGVzY2VuZGFudCgqY29uc3RfY2FzdDxSZW5kZXJCb3gqPih0 aGlzKSk7Ci0gICAgICAgICAgICBpZiAoYmxvY2stPmlzRmxleEl0ZW0oKSkKLSAgICAgICAgICAg ICAgICBzdHJldGNoZWRIZWlnaHQgPSBkb3duY2FzdDxSZW5kZXJGbGV4aWJsZUJveD4oYmxvY2st PnBhcmVudCgpKS0+Y2hpbGRMb2dpY2FsSGVpZ2h0Rm9yUGVyY2VudGFnZVJlc29sdXRpb24oKmJs b2NrKTsKKyAgICAgICAgICAgIGlmIChibG9jay0+aXNGbGV4SXRlbSgpICYmIGRvd25jYXN0PFJl bmRlckZsZXhpYmxlQm94PihibG9jay0+cGFyZW50KCkpLT51c2VDaGlsZE92ZXJyaWRpbmdMb2dp Y2FsSGVpZ2h0Rm9yUGVyY2VudGFnZVJlc29sdXRpb24oKmJsb2NrKSkKKyAgICAgICAgICAgICAg ICBzdHJldGNoZWRIZWlnaHQgPSBibG9jay0+b3ZlcnJpZGluZ0NvbnRlbnRMb2dpY2FsSGVpZ2h0 KCk7CiAgICAgICAgICAgICBlbHNlIGlmIChibG9jay0+aXNHcmlkSXRlbSgpICYmIGJsb2NrLT5o YXNPdmVycmlkaW5nTG9naWNhbEhlaWdodCgpICYmICFoYXNQZXJwZW5kaWN1bGFyQ29udGFpbmlu Z0Jsb2NrKQogICAgICAgICAgICAgICAgIHN0cmV0Y2hlZEhlaWdodCA9IGJsb2NrLT5vdmVycmlk aW5nQ29udGVudExvZ2ljYWxIZWlnaHQoKTsKICAgICAgICAgfQpAQCAtMzM4NSwxMiArMzM4NSw4 IEBAIExheW91dFVuaXQgUmVuZGVyQm94OjphdmFpbGFibGVMb2dpY2FsSGVpZ2h0VXNpbmcoY29u c3QgTGVuZ3RoJiBoLCBBdmFpbGFibGVMb2dpCiAgICAgICAgIHJldHVybiBsb2dpY2FsSGVpZ2h0 KCkgLSBib3JkZXJBbmRQYWRkaW5nTG9naWNhbEhlaWdodCgpOwogICAgIH0KIAotICAgIGlmIChp c0ZsZXhJdGVtKCkpIHsKLSAgICAgICAgYXV0byYgZmxleEJveCA9IGRvd25jYXN0PFJlbmRlckZs ZXhpYmxlQm94PigqcGFyZW50KCkpOwotICAgICAgICBhdXRvIHN0cmV0Y2hlZEhlaWdodCA9IGZs ZXhCb3guY2hpbGRMb2dpY2FsSGVpZ2h0Rm9yUGVyY2VudGFnZVJlc29sdXRpb24oKnRoaXMpOwot ICAgICAgICBpZiAoc3RyZXRjaGVkSGVpZ2h0KQotICAgICAgICAgICAgcmV0dXJuIHN0cmV0Y2hl ZEhlaWdodC52YWx1ZSgpOwotICAgIH0KKyAgICBpZiAoaXNGbGV4SXRlbSgpICYmIGRvd25jYXN0 PFJlbmRlckZsZXhpYmxlQm94PigqcGFyZW50KCkpLnVzZUNoaWxkT3ZlcnJpZGluZ0xvZ2ljYWxI ZWlnaHRGb3JQZXJjZW50YWdlUmVzb2x1dGlvbigqdGhpcykpCisgICAgICAgIHJldHVybiBvdmVy cmlkaW5nQ29udGVudExvZ2ljYWxIZWlnaHQoKTsKIAogICAgIGlmIChzaG91bGRDb21wdXRlTG9n aWNhbEhlaWdodEZyb21Bc3BlY3RSYXRpbygpKQogICAgICAgICByZXR1cm4gYmxvY2tTaXplRnJv bUFzcGVjdFJhdGlvKGhvcml6b250YWxCb3JkZXJBbmRQYWRkaW5nRXh0ZW50KCksIHZlcnRpY2Fs Qm9yZGVyQW5kUGFkZGluZ0V4dGVudCgpLCBMYXlvdXRVbml0KHN0eWxlKCkubG9naWNhbEFzcGVj dFJhdGlvKCkpLCBzdHlsZSgpLmJveFNpemluZ0ZvckFzcGVjdFJhdGlvKCksIGxvZ2ljYWxXaWR0 aCgpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3hNb2Rl bE9iamVjdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94TW9kZWxPYmpl Y3QuY3BwCmluZGV4IGRjMDUwMTEwYzczNmYxMjNhYTRkMjYwYjAzYjFiNDkzZDVlZjEyZDEuLjA4 NjFiNzVkN2ViY2NiMTc1ZTA3M2I0YThiMTU4ODU3MjU1OWQ5MGUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveE1vZGVsT2JqZWN0LmNwcApAQCAtMjc1LDExICsy NzUsOCBAQCBib29sIFJlbmRlckJveE1vZGVsT2JqZWN0OjpoYXNBdXRvSGVpZ2h0T3JDb250YWlu aW5nQmxvY2tXaXRoQXV0b0hlaWdodCgpIGNvbnN0CiAgICAgaWYgKGxvZ2ljYWxIZWlnaHRMZW5n dGguaXNQZXJjZW50T3JDYWxjdWxhdGVkKCkgJiYgY2IgJiYgaXNCb3goKSkKICAgICAgICAgY2It PmFkZFBlcmNlbnRIZWlnaHREZXNjZW5kYW50KCpjb25zdF9jYXN0PFJlbmRlckJveCo+KGRvd25j YXN0PFJlbmRlckJveD4odGhpcykpKTsKIAotICAgIGlmICh0aGlzQm94ICYmIHRoaXNCb3gtPmlz RmxleEl0ZW0oKSkgewotICAgICAgICBhdXRvJiBmbGV4Qm94ID0gZG93bmNhc3Q8UmVuZGVyRmxl eGlibGVCb3g+KCpwYXJlbnQoKSk7Ci0gICAgICAgIGlmIChmbGV4Qm94LmNoaWxkTG9naWNhbEhl aWdodEZvclBlcmNlbnRhZ2VSZXNvbHV0aW9uKCp0aGlzQm94KSkKLSAgICAgICAgICAgIHJldHVy biBmYWxzZTsKLSAgICB9CisgICAgaWYgKHRoaXNCb3ggJiYgdGhpc0JveC0+aXNGbGV4SXRlbSgp ICYmIGRvd25jYXN0PFJlbmRlckZsZXhpYmxlQm94PigqcGFyZW50KCkpLnVzZUNoaWxkT3ZlcnJp ZGluZ0xvZ2ljYWxIZWlnaHRGb3JQZXJjZW50YWdlUmVzb2x1dGlvbigqdGhpc0JveCkpCisgICAg ICAgIHJldHVybiBmYWxzZTsKICAgICAKICAgICBpZiAodGhpc0JveCAmJiB0aGlzQm94LT5pc0dy aWRJdGVtKCkgJiYgdGhpc0JveC0+aGFzT3ZlcnJpZGluZ0NvbnRhaW5pbmdCbG9ja0NvbnRlbnRM b2dpY2FsSGVpZ2h0KCkpCiAgICAgICAgIHJldHVybiB0aGlzQm94LT5vdmVycmlkaW5nQ29udGFp bmluZ0Jsb2NrQ29udGVudExvZ2ljYWxIZWlnaHQoKSA9PSBXVEY6Om51bGxvcHQ7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcAppbmRleCBhMjgyOWJh ZThlM2EzOWI1ZjA0ZjExMTUxMjA0ZTdlZGIzZDhmZWIwLi5mMGU2OWY3ZTEyMDMwMjhlZGNhZjBj MzNkOTU5ZWM1NWQ2MTY0YTA5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyRmxleGlibGVCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJGbGV4aWJsZUJveC5jcHAKQEAgLTEyMzQsNDIgKzEyMzQsMzIgQEAgTGF5b3V0VW5pdCBSZW5k ZXJGbGV4aWJsZUJveDo6YWRqdXN0Q2hpbGRTaXplRm9yTWluQW5kTWF4KGNvbnN0IFJlbmRlckJv eCYgY2hpbGQKICAgICByZXR1cm4gc3RkOjptYXgoMF9sdSwgY2hpbGRTaXplKTsKIH0KICAgICAK LU9wdGlvbmFsPExheW91dFVuaXQ+IFJlbmRlckZsZXhpYmxlQm94Ojpjcm9zc1NpemVGb3JQZXJj ZW50YWdlUmVzb2x1dGlvbihjb25zdCBSZW5kZXJCb3gmIGNoaWxkKQorYm9vbCBSZW5kZXJGbGV4 aWJsZUJveDo6Y2hpbGRDcm9zc1NpemVJc0RlZmluaXRlRm9yUGVyY2VudGFnZVJlc29sdXRpb24o Y29uc3QgUmVuZGVyQm94JiBjaGlsZCkKIHsKICAgICBBU1NFUlQobWFpbkF4aXNJc0NoaWxkSW5s aW5lQXhpcyhjaGlsZCkpOwogICAgIGlmIChhbGlnbm1lbnRGb3JDaGlsZChjaGlsZCkgIT0gSXRl bVBvc2l0aW9uOjpTdHJldGNoKQotICAgICAgICByZXR1cm4gV1RGOjpudWxsb3B0OwotCi0gICAg Ly8gSGVyZSB3ZSBpbXBsZW1lbnQgaHR0cHM6Ly9kcmFmdHMuY3Nzd2cub3JnL2Nzcy1mbGV4Ym94 LyNhbGdvLXN0cmV0Y2gKLSAgICBpZiAoY2hpbGQuaGFzT3ZlcnJpZGluZ0xvZ2ljYWxIZWlnaHQo KSkKLSAgICAgICAgcmV0dXJuIGNoaWxkLm92ZXJyaWRpbmdDb250ZW50TG9naWNhbEhlaWdodCgp OworICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICAvLyBXZSBkb24ndCBjdXJyZW50bHkgaW1w bGVtZW50IHRoZSBvcHRpbWl6YXRpb24gZnJvbQotICAgIC8vIGh0dHBzOi8vZHJhZnRzLmNzc3dn Lm9yZy9jc3MtZmxleGJveC8jZGVmaW5pdGUtc2l6ZXMgY2FzZSAxLiBXaGlsZSB0aGF0Ci0gICAg Ly8gY291bGQgc3BlZWQgdXAgYSBzcGVjaWFsaXplZCBjYXNlLCBpdCByZXF1aXJlcyBkZXRlcm1p bmluZyBpZiB3ZSBoYXZlIGEKLSAgICAvLyBkZWZpbml0ZSBzaXplLCB3aGljaCBpdHNlbGYgaXMg bm90IGNoZWFwLiBXZSBjYW4gY29uc2lkZXIgaW1wbGVtZW50aW5nIGl0Ci0gICAgLy8gYXQgYSBs YXRlciB0aW1lLiAoVGhlIGNvcnJlY3RuZXNzIGlzIGVuc3VyZWQgYnkgcmVkb2luZyBsYXlvdXQg aW4KLSAgICAvLyBhcHBseVN0cmV0Y2hBbGlnbm1lbnRUb0NoaWxkKQotICAgIHJldHVybiBXVEY6 Om51bGxvcHQ7CisgICAgcmV0dXJuIGNoaWxkLmhhc092ZXJyaWRpbmdMb2dpY2FsSGVpZ2h0KCk7 CiB9CiAKLU9wdGlvbmFsPExheW91dFVuaXQ+IFJlbmRlckZsZXhpYmxlQm94OjptYWluU2l6ZUZv clBlcmNlbnRhZ2VSZXNvbHV0aW9uKGNvbnN0IFJlbmRlckJveCYgY2hpbGQpCitib29sIFJlbmRl ckZsZXhpYmxlQm94OjpjaGlsZE1haW5TaXplSXNEZWZpbml0ZUZvclBlcmNlbnRhZ2VSZXNvbHV0 aW9uKGNvbnN0IFJlbmRlckJveCYgY2hpbGQpCiB7CiAgICAgQVNTRVJUKCFtYWluQXhpc0lzQ2hp bGRJbmxpbmVBeGlzKGNoaWxkKSk7CiAgICAgLy8gVGhpcyBmdW5jdGlvbiBpbXBsZW1lbnRzIHNl Y3Rpb24gOS44LiBEZWZpbml0ZSBhbmQgSW5kZWZpbml0ZSBTaXplcywgY2FzZSAyKSBvZiB0aGUg ZmxleGJveCBzcGVjLgogICAgIC8vIElmIHRoZSBmbGV4IGNvbnRhaW5lciBoYXMgYSBkZWZpbml0 ZSBtYWluIHNpemUgdGhlIGZsZXggaXRlbSBwb3N0LWZsZXhpbmcgbWFpbiBzaXplIGlzIGFsc28g dHJlYXRlZAogICAgIC8vIGFzIGRlZmluaXRlLiBXZSBtYWtlIHVwIGEgcGVyY2VudGFnZSB0byBj aGVjayB3aGV0aGVyIHdlIGhhdmUgYSBkZWZpbml0ZSBzaXplLgogICAgIGlmICghY2hpbGRNYWlu U2l6ZUlzRGVmaW5pdGUoY2hpbGQsIExlbmd0aCgwLCBMZW5ndGhUeXBlOjpQZXJjZW50KSkpCi0g ICAgICAgIHJldHVybiBXVEY6Om51bGxvcHQ7CisgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAg IHJldHVybiBjaGlsZC5oYXNPdmVycmlkaW5nTG9naWNhbEhlaWdodCgpID8gT3B0aW9uYWw8TGF5 b3V0VW5pdD4oY2hpbGQub3ZlcnJpZGluZ0NvbnRlbnRMb2dpY2FsSGVpZ2h0KCkpIDogV1RGOjpu dWxsb3B0OworICAgIHJldHVybiBjaGlsZC5oYXNPdmVycmlkaW5nTG9naWNhbEhlaWdodCgpOwog fQogCi1PcHRpb25hbDxMYXlvdXRVbml0PiBSZW5kZXJGbGV4aWJsZUJveDo6Y2hpbGRMb2dpY2Fs SGVpZ2h0Rm9yUGVyY2VudGFnZVJlc29sdXRpb24oY29uc3QgUmVuZGVyQm94JiBjaGlsZCkKK2Jv b2wgUmVuZGVyRmxleGlibGVCb3g6OnVzZUNoaWxkT3ZlcnJpZGluZ0xvZ2ljYWxIZWlnaHRGb3JQ ZXJjZW50YWdlUmVzb2x1dGlvbihjb25zdCBSZW5kZXJCb3gmIGNoaWxkKQogewogICAgIGlmICht YWluQXhpc0lzQ2hpbGRJbmxpbmVBeGlzKGNoaWxkKSkKLSAgICAgICAgcmV0dXJuIGNyb3NzU2l6 ZUZvclBlcmNlbnRhZ2VSZXNvbHV0aW9uKGNoaWxkKTsKLSAgICByZXR1cm4gbWFpblNpemVGb3JQ ZXJjZW50YWdlUmVzb2x1dGlvbihjaGlsZCk7CisgICAgICAgIHJldHVybiBjaGlsZENyb3NzU2l6 ZUlzRGVmaW5pdGVGb3JQZXJjZW50YWdlUmVzb2x1dGlvbihjaGlsZCk7CisgICAgcmV0dXJuIGNo aWxkTWFpblNpemVJc0RlZmluaXRlRm9yUGVyY2VudGFnZVJlc29sdXRpb24oY2hpbGQpOwogfQog CiBMYXlvdXRVbml0IFJlbmRlckZsZXhpYmxlQm94OjphZGp1c3RDaGlsZFNpemVGb3JBc3BlY3RS YXRpb0Nyb3NzQXhpc01pbkFuZE1heChjb25zdCBSZW5kZXJCb3gmIGNoaWxkLCBMYXlvdXRVbml0 IGNoaWxkU2l6ZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJG bGV4aWJsZUJveC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94 LmgKaW5kZXggNjgwZGNkN2MwMzgwNDcyYjQ5OWFkNzQ0ZGVhMjFkNjhjN2Y0ZTk0OS4uY2RiMDc5 YmFkYzE1YWFkYTVlYjY3ZWU2MDkxM2YzYWNlNzZlZDJmOCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmgKKysrIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmgKQEAgLTY5LDcgKzY5LDkgQEAgcHVibGljOgog CiAgICAgdmlydHVhbCBib29sIGlzRmxleGlibGVCb3hJbXBsKCkgY29uc3QgeyByZXR1cm4gZmFs c2U7IH07CiAgICAgCi0gICAgT3B0aW9uYWw8TGF5b3V0VW5pdD4gY2hpbGRMb2dpY2FsSGVpZ2h0 Rm9yUGVyY2VudGFnZVJlc29sdXRpb24oY29uc3QgUmVuZGVyQm94Jik7CisgICAgYm9vbCBjaGls ZENyb3NzU2l6ZUlzRGVmaW5pdGVGb3JQZXJjZW50YWdlUmVzb2x1dGlvbihjb25zdCBSZW5kZXJC b3gmKTsKKyAgICBib29sIGNoaWxkTWFpblNpemVJc0RlZmluaXRlRm9yUGVyY2VudGFnZVJlc29s dXRpb24oY29uc3QgUmVuZGVyQm94Jik7CisgICAgYm9vbCB1c2VDaGlsZE92ZXJyaWRpbmdMb2dp Y2FsSGVpZ2h0Rm9yUGVyY2VudGFnZVJlc29sdXRpb24oY29uc3QgUmVuZGVyQm94Jik7CiAgICAg CiAgICAgdm9pZCBjbGVhckNhY2hlZE1haW5TaXplRm9yQ2hpbGQoY29uc3QgUmVuZGVyQm94JiBj aGlsZCk7CiAgICAgCkBAIC0xNTYsOCArMTU4LDYgQEAgcHJpdmF0ZToKICAgICBPdmVyZmxvdyBt YWluQXhpc092ZXJmbG93Rm9yQ2hpbGQoY29uc3QgUmVuZGVyQm94JiBjaGlsZCkgY29uc3Q7CiAg ICAgT3ZlcmZsb3cgY3Jvc3NBeGlzT3ZlcmZsb3dGb3JDaGlsZChjb25zdCBSZW5kZXJCb3gmIGNo aWxkKSBjb25zdDsKICAgICB2b2lkIGNhY2hlQ2hpbGRNYWluU2l6ZShjb25zdCBSZW5kZXJCb3gm IGNoaWxkKTsKLSAgICBPcHRpb25hbDxMYXlvdXRVbml0PiBjcm9zc1NpemVGb3JQZXJjZW50YWdl UmVzb2x1dGlvbihjb25zdCBSZW5kZXJCb3gmKTsKLSAgICBPcHRpb25hbDxMYXlvdXRVbml0PiBt YWluU2l6ZUZvclBlcmNlbnRhZ2VSZXNvbHV0aW9uKGNvbnN0IFJlbmRlckJveCYpOwogCiAgICAg dm9pZCBsYXlvdXRGbGV4SXRlbXMoYm9vbCByZWxheW91dENoaWxkcmVuKTsKICAgICBMYXlvdXRV bml0IGF1dG9NYXJnaW5PZmZzZXRJbk1haW5BeGlzKGNvbnN0IFZlY3RvcjxGbGV4SXRlbT4mLCBM YXlvdXRVbml0JiBhdmFpbGFibGVGcmVlU3BhY2UpOwo= 423602 2021-03-18 08:51:46 -0700 2021-03-18 09:01:54 -0700 Patch bug-223377-20210318165144.patch text/plain 11399 svillar U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0NTU3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGI2MzViMTMzMjMwNzZh NzY2NWU3NTkwYjViMTg3OGJkODQzNWY4ZS4uNTNhZTgwNzViYzg0YjlhNmNhMWU1Yzk4NDc4NjM4 OWIyNDU1MWVmYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDIxLTAzLTE3ICBTZXJn aW8gVmlsbGFyIFNlbmluICA8c3ZpbGxhckBpZ2FsaWEuY29tPgorCisgICAgICAgIFtjc3MtZmxl eF0gTWFrZSB7bWFpbnxjcm9zc31TaXplRm9yUGVyY2VudGFnZVJlc29sdXRpb24oKSByZXR1cm4g Ym9vbGVhbnMgaW5zdGVhZCBvZiBhY3R1YWwgc2l6ZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMzM3NworCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZXNlIHR3byBtZXRob2RzIHdlcmUgb25seSBjYWxs ZWQgYnkgY2hpbGRMb2dpY2FsSGVpZ2h0Rm9yUGVyY2VudGFnZVJlc29sdXRpb24oKSBhbmQgdGhl eSBlaXRoZXIgcmV0dXJuZWQKKyAgICAgICAgV1RGOjpudWxsb3B0IG9yIHRoZSBvdmVycmlkaW5n Q29udGVudExvZ2ljYWxIZWlnaHQoKS4gV2UgY291bGQgc2ltcGxpZnkgYSBiaXQgdGhlIGNvZGUg YnkgcmV0dXJuaW5nIGEgYm9vbGVhbgorICAgICAgICB3aGljaCBtZWFucyB3aGV0aGVyIHRoZSBv dmVycmlkaW5nIGNvbnRlbnQgbG9naWNhbCBoZWlnaHQgc2hvdWxkIGJlIHVzZWQgdG8gcmVzb2x2 ZSBhIHBlcmNlbnRhZ2Ugb3Igbm90LiBBcGFydAorICAgICAgICBmcm9tIGNoYW5naW5nIHRoZSBy ZXR1cm4gdmFsdWUgd2UncmUgYWxzbyBpbXByb3ZpbmcgdGhlIG5hbWluZyBzbyBpdCBiZWNvbWVz IG9idmlvdXMgdGhhdCB3ZSBhcmUgZGVhbGluZyB3aXRoCisgICAgICAgIGZsZXggaXRlbXMgYW5k IG5vdCB0aGUgZmxleCBjb250YWluZXIuCisKKyAgICAgICAgV2UncmUgYWxzbyByZW1vdmluZyBz b21lIGNvbW1lbnRzIGluIHRob3NlIG1ldGhvZHMgdGhhdCB3ZXJlIG5vdCByZWFsbHkgYWNjdXJh dGUuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIGFzIHRoZXJlIGlzIG5vIGNoYW5nZSBpbiBmdW5j dGlvbmFsaXR5LgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrOjphdmFpbGFibGVMb2dpY2FsSGVpZ2h0Rm9yUGVyY2Vu dGFnZUNvbXB1dGF0aW9uIGNvbnN0KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQm94LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6Y29tcHV0ZVJlcGxhY2VkTG9naWNhbEhl aWdodFVzaW5nIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6YXZhaWxhYmxl TG9naWNhbEhlaWdodFVzaW5nIGNvbnN0KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQm94 TW9kZWxPYmplY3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94TW9kZWxPYmplY3Q6 Omhhc0F1dG9IZWlnaHRPckNvbnRhaW5pbmdCbG9ja1dpdGhBdXRvSGVpZ2h0IGNvbnN0KToKKyAg ICAgICAgKiByZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwOgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVyRmxleGlibGVCb3g6OnVzZUNoaWxkT3ZlcnJpZGluZ0Nyb3NzU2l6ZUZvclBlcmNl bnRhZ2VSZXNvbHV0aW9uKTogUmVuYW1lZCBmcm9tIGNyb3NzU2l6ZUZvclBlcmNlbnRhZ2VSZXNv bHV0aW9uLgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxleGlibGVCb3g6OnVzZUNoaWxkT3Zl cnJpZGluZ01haW5TaXplRm9yUGVyY2VudGFnZVJlc29sdXRpb24pOiBSZW5hbWVkIGZyb20gbWFp blNpemVGb3JQZXJjZW50YWdlUmVzb2x1dGlvbi4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZs ZXhpYmxlQm94Ojp1c2VDaGlsZE92ZXJyaWRpbmdMb2dpY2FsSGVpZ2h0Rm9yUGVyY2VudGFnZVJl c29sdXRpb24pOiBSZW5hbWVkIGZyb20gY2hpbGRMb2dpY2FsSGVpZ2h0Rm9yUGVyY2VudGFnZVJl c29sdXRpb24uCisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6Y3Jvc3NTaXpl Rm9yUGVyY2VudGFnZVJlc29sdXRpb24pOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6UmVu ZGVyRmxleGlibGVCb3g6Om1haW5TaXplRm9yUGVyY2VudGFnZVJlc29sdXRpb24pOiBEZWxldGVk LgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxleGlibGVCb3g6OmNoaWxkTG9naWNhbEhlaWdo dEZvclBlcmNlbnRhZ2VSZXNvbHV0aW9uKTogRGVsZXRlZC4KKyAgICAgICAgKiByZW5kZXJpbmcv UmVuZGVyRmxleGlibGVCb3guaDoKKwogMjAyMS0wMy0xNyAgS2ltbW8gS2lubnVuZW4gIDxra2lu bnVuZW5AYXBwbGUuY29tPgogCiAgICAgICAgIFNodXRkb3duIEFOR0xFIG9uIEdQVSBwcm9jZXNz IHdoZW4gbGFzdCBXZWJHTCBjb250ZXh0IGlzIGRlc3Ryb3llZApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJCbG9jay5jcHAKaW5kZXggMTkwMDQzZTQzNzVlY2ZlOTJjZGNlZjMwYmRkOGVi MWQzNTM5ZjE3Yy4uODAxNDA4NTI1OGZhN2EyYzg0MDAyNjZhNDcyZDM2OWIwNTVkMDFkNiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCkBAIC0zMjA3LDEyICszMjA3 LDggQEAgT3B0aW9uYWw8TGF5b3V0VW5pdD4gUmVuZGVyQmxvY2s6OmF2YWlsYWJsZUxvZ2ljYWxI ZWlnaHRGb3JQZXJjZW50YWdlQ29tcHV0YXRpb24KICAgICAvLyB0aGF0IGNhbiBiZSB1c2VkIGZv ciBhbnkgcGVyY2VudGFnZSBjb21wdXRhdGlvbnMuCiAgICAgYm9vbCBpc091dE9mRmxvd1Bvc2l0 aW9uZWRXaXRoU3BlY2lmaWVkSGVpZ2h0ID0gaXNPdXRPZkZsb3dQb3NpdGlvbmVkKCkgJiYgKCFz dHlsZVRvVXNlLmxvZ2ljYWxIZWlnaHQoKS5pc0F1dG8oKSB8fCAoIXN0eWxlVG9Vc2UubG9naWNh bFRvcCgpLmlzQXV0bygpICYmICFzdHlsZVRvVXNlLmxvZ2ljYWxCb3R0b20oKS5pc0F1dG8oKSkp OwogICAgIAotICAgIE9wdGlvbmFsPExheW91dFVuaXQ+IHN0cmV0Y2hlZEZsZXhIZWlnaHQ7Ci0g ICAgaWYgKGlzRmxleEl0ZW0oKSkKLSAgICAgICAgc3RyZXRjaGVkRmxleEhlaWdodCA9IGRvd25j YXN0PFJlbmRlckZsZXhpYmxlQm94PihwYXJlbnQoKSktPmNoaWxkTG9naWNhbEhlaWdodEZvclBl cmNlbnRhZ2VSZXNvbHV0aW9uKCp0aGlzKTsKLSAgICAKLSAgICBpZiAoc3RyZXRjaGVkRmxleEhl aWdodCkKLSAgICAgICAgYXZhaWxhYmxlSGVpZ2h0ID0gc3RyZXRjaGVkRmxleEhlaWdodDsKKyAg ICBpZiAoaXNGbGV4SXRlbSgpICYmIGRvd25jYXN0PFJlbmRlckZsZXhpYmxlQm94PihwYXJlbnQo KSktPnVzZUNoaWxkT3ZlcnJpZGluZ0xvZ2ljYWxIZWlnaHRGb3JQZXJjZW50YWdlUmVzb2x1dGlv bigqdGhpcykpCisgICAgICAgIGF2YWlsYWJsZUhlaWdodCA9IG92ZXJyaWRpbmdDb250ZW50TG9n aWNhbEhlaWdodCgpOwogICAgIGVsc2UgaWYgKGlzR3JpZEl0ZW0oKSAmJiBoYXNPdmVycmlkaW5n TG9naWNhbEhlaWdodCgpKQogICAgICAgICBhdmFpbGFibGVIZWlnaHQgPSBvdmVycmlkaW5nQ29u dGVudExvZ2ljYWxIZWlnaHQoKTsKICAgICBlbHNlIGlmIChzdHlsZVRvVXNlLmxvZ2ljYWxIZWln aHQoKS5pc0ZpeGVkKCkpIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKaW5k ZXggZDhlNTY3ZTg3MGMxNjVmYTM3MzFkY2NmOWZiZTYzMTc4MGY5NTlmZC4uZjhlMWQ5NzI0NGZm ZWI4N2Q0ZjVlZTAxMWIwYTUzNGI0NWU4YWM5MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckJveC5jcHAKQEAgLTMzMTIsOCArMzMxMiw4IEBAIExheW91dFVuaXQgUmVuZGVyQm94Ojpj b21wdXRlUmVwbGFjZWRMb2dpY2FsSGVpZ2h0VXNpbmcoU2l6ZVR5cGUgaGVpZ2h0VHlwZSwgTGVu CiAgICAgICAgIGlmIChpczxSZW5kZXJCbG9jaz4oY29udGFpbmVyKSkgewogICAgICAgICAgICAg YXV0byogYmxvY2sgPSBkb3duY2FzdDxSZW5kZXJCbG9jaz4oY29udGFpbmVyKTsKICAgICAgICAg ICAgIGJsb2NrLT5hZGRQZXJjZW50SGVpZ2h0RGVzY2VuZGFudCgqY29uc3RfY2FzdDxSZW5kZXJC b3gqPih0aGlzKSk7Ci0gICAgICAgICAgICBpZiAoYmxvY2stPmlzRmxleEl0ZW0oKSkKLSAgICAg ICAgICAgICAgICBzdHJldGNoZWRIZWlnaHQgPSBkb3duY2FzdDxSZW5kZXJGbGV4aWJsZUJveD4o YmxvY2stPnBhcmVudCgpKS0+Y2hpbGRMb2dpY2FsSGVpZ2h0Rm9yUGVyY2VudGFnZVJlc29sdXRp b24oKmJsb2NrKTsKKyAgICAgICAgICAgIGlmIChibG9jay0+aXNGbGV4SXRlbSgpICYmIGRvd25j YXN0PFJlbmRlckZsZXhpYmxlQm94PihibG9jay0+cGFyZW50KCkpLT51c2VDaGlsZE92ZXJyaWRp bmdMb2dpY2FsSGVpZ2h0Rm9yUGVyY2VudGFnZVJlc29sdXRpb24oKmJsb2NrKSkKKyAgICAgICAg ICAgICAgICBzdHJldGNoZWRIZWlnaHQgPSBibG9jay0+b3ZlcnJpZGluZ0NvbnRlbnRMb2dpY2Fs SGVpZ2h0KCk7CiAgICAgICAgICAgICBlbHNlIGlmIChibG9jay0+aXNHcmlkSXRlbSgpICYmIGJs b2NrLT5oYXNPdmVycmlkaW5nTG9naWNhbEhlaWdodCgpICYmICFoYXNQZXJwZW5kaWN1bGFyQ29u dGFpbmluZ0Jsb2NrKQogICAgICAgICAgICAgICAgIHN0cmV0Y2hlZEhlaWdodCA9IGJsb2NrLT5v dmVycmlkaW5nQ29udGVudExvZ2ljYWxIZWlnaHQoKTsKICAgICAgICAgfQpAQCAtMzM4NSwxMiAr MzM4NSw4IEBAIExheW91dFVuaXQgUmVuZGVyQm94OjphdmFpbGFibGVMb2dpY2FsSGVpZ2h0VXNp bmcoY29uc3QgTGVuZ3RoJiBoLCBBdmFpbGFibGVMb2dpCiAgICAgICAgIHJldHVybiBsb2dpY2Fs SGVpZ2h0KCkgLSBib3JkZXJBbmRQYWRkaW5nTG9naWNhbEhlaWdodCgpOwogICAgIH0KIAotICAg IGlmIChpc0ZsZXhJdGVtKCkpIHsKLSAgICAgICAgYXV0byYgZmxleEJveCA9IGRvd25jYXN0PFJl bmRlckZsZXhpYmxlQm94PigqcGFyZW50KCkpOwotICAgICAgICBhdXRvIHN0cmV0Y2hlZEhlaWdo dCA9IGZsZXhCb3guY2hpbGRMb2dpY2FsSGVpZ2h0Rm9yUGVyY2VudGFnZVJlc29sdXRpb24oKnRo aXMpOwotICAgICAgICBpZiAoc3RyZXRjaGVkSGVpZ2h0KQotICAgICAgICAgICAgcmV0dXJuIHN0 cmV0Y2hlZEhlaWdodC52YWx1ZSgpOwotICAgIH0KKyAgICBpZiAoaXNGbGV4SXRlbSgpICYmIGRv d25jYXN0PFJlbmRlckZsZXhpYmxlQm94PigqcGFyZW50KCkpLnVzZUNoaWxkT3ZlcnJpZGluZ0xv Z2ljYWxIZWlnaHRGb3JQZXJjZW50YWdlUmVzb2x1dGlvbigqdGhpcykpCisgICAgICAgIHJldHVy biBvdmVycmlkaW5nQ29udGVudExvZ2ljYWxIZWlnaHQoKTsKIAogICAgIGlmIChzaG91bGRDb21w dXRlTG9naWNhbEhlaWdodEZyb21Bc3BlY3RSYXRpbygpKQogICAgICAgICByZXR1cm4gYmxvY2tT aXplRnJvbUFzcGVjdFJhdGlvKGhvcml6b250YWxCb3JkZXJBbmRQYWRkaW5nRXh0ZW50KCksIHZl cnRpY2FsQm9yZGVyQW5kUGFkZGluZ0V4dGVudCgpLCBMYXlvdXRVbml0KHN0eWxlKCkubG9naWNh bEFzcGVjdFJhdGlvKCkpLCBzdHlsZSgpLmJveFNpemluZ0ZvckFzcGVjdFJhdGlvKCksIGxvZ2lj YWxXaWR0aCgpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJC b3hNb2RlbE9iamVjdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94TW9k ZWxPYmplY3QuY3BwCmluZGV4IGRjMDUwMTEwYzczNmYxMjNhYTRkMjYwYjAzYjFiNDkzZDVlZjEy ZDEuLjA4NjFiNzVkN2ViY2NiMTc1ZTA3M2I0YThiMTU4ODU3MjU1OWQ5MGUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3hNb2RlbE9iamVjdC5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveE1vZGVsT2JqZWN0LmNwcApAQCAtMjc1 LDExICsyNzUsOCBAQCBib29sIFJlbmRlckJveE1vZGVsT2JqZWN0OjpoYXNBdXRvSGVpZ2h0T3JD b250YWluaW5nQmxvY2tXaXRoQXV0b0hlaWdodCgpIGNvbnN0CiAgICAgaWYgKGxvZ2ljYWxIZWln aHRMZW5ndGguaXNQZXJjZW50T3JDYWxjdWxhdGVkKCkgJiYgY2IgJiYgaXNCb3goKSkKICAgICAg ICAgY2ItPmFkZFBlcmNlbnRIZWlnaHREZXNjZW5kYW50KCpjb25zdF9jYXN0PFJlbmRlckJveCo+ KGRvd25jYXN0PFJlbmRlckJveD4odGhpcykpKTsKIAotICAgIGlmICh0aGlzQm94ICYmIHRoaXNC b3gtPmlzRmxleEl0ZW0oKSkgewotICAgICAgICBhdXRvJiBmbGV4Qm94ID0gZG93bmNhc3Q8UmVu ZGVyRmxleGlibGVCb3g+KCpwYXJlbnQoKSk7Ci0gICAgICAgIGlmIChmbGV4Qm94LmNoaWxkTG9n aWNhbEhlaWdodEZvclBlcmNlbnRhZ2VSZXNvbHV0aW9uKCp0aGlzQm94KSkKLSAgICAgICAgICAg IHJldHVybiBmYWxzZTsKLSAgICB9CisgICAgaWYgKHRoaXNCb3ggJiYgdGhpc0JveC0+aXNGbGV4 SXRlbSgpICYmIGRvd25jYXN0PFJlbmRlckZsZXhpYmxlQm94PigqcGFyZW50KCkpLnVzZUNoaWxk T3ZlcnJpZGluZ0xvZ2ljYWxIZWlnaHRGb3JQZXJjZW50YWdlUmVzb2x1dGlvbigqdGhpc0JveCkp CisgICAgICAgIHJldHVybiBmYWxzZTsKICAgICAKICAgICBpZiAodGhpc0JveCAmJiB0aGlzQm94 LT5pc0dyaWRJdGVtKCkgJiYgdGhpc0JveC0+aGFzT3ZlcnJpZGluZ0NvbnRhaW5pbmdCbG9ja0Nv bnRlbnRMb2dpY2FsSGVpZ2h0KCkpCiAgICAgICAgIHJldHVybiB0aGlzQm94LT5vdmVycmlkaW5n Q29udGFpbmluZ0Jsb2NrQ29udGVudExvZ2ljYWxIZWlnaHQoKSA9PSBXVEY6Om51bGxvcHQ7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3Bw IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcAppbmRleCBh MjgyOWJhZThlM2EzOWI1ZjA0ZjExMTUxMjA0ZTdlZGIzZDhmZWIwLi4yY2M5M2Q2YWQ5M2EwYWQ1 MjJjOTA4NTE4ODczYjI5MTJkN2ZjMTIxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKQEAgLTEyMzQsNDIgKzEyMzQsMzIgQEAgTGF5b3V0VW5p dCBSZW5kZXJGbGV4aWJsZUJveDo6YWRqdXN0Q2hpbGRTaXplRm9yTWluQW5kTWF4KGNvbnN0IFJl bmRlckJveCYgY2hpbGQKICAgICByZXR1cm4gc3RkOjptYXgoMF9sdSwgY2hpbGRTaXplKTsKIH0K ICAgICAKLU9wdGlvbmFsPExheW91dFVuaXQ+IFJlbmRlckZsZXhpYmxlQm94Ojpjcm9zc1NpemVG b3JQZXJjZW50YWdlUmVzb2x1dGlvbihjb25zdCBSZW5kZXJCb3gmIGNoaWxkKQorYm9vbCBSZW5k ZXJGbGV4aWJsZUJveDo6dXNlQ2hpbGRPdmVycmlkaW5nQ3Jvc3NTaXplRm9yUGVyY2VudGFnZVJl c29sdXRpb24oY29uc3QgUmVuZGVyQm94JiBjaGlsZCkKIHsKICAgICBBU1NFUlQobWFpbkF4aXNJ c0NoaWxkSW5saW5lQXhpcyhjaGlsZCkpOwogICAgIGlmIChhbGlnbm1lbnRGb3JDaGlsZChjaGls ZCkgIT0gSXRlbVBvc2l0aW9uOjpTdHJldGNoKQotICAgICAgICByZXR1cm4gV1RGOjpudWxsb3B0 OwotCi0gICAgLy8gSGVyZSB3ZSBpbXBsZW1lbnQgaHR0cHM6Ly9kcmFmdHMuY3Nzd2cub3JnL2Nz cy1mbGV4Ym94LyNhbGdvLXN0cmV0Y2gKLSAgICBpZiAoY2hpbGQuaGFzT3ZlcnJpZGluZ0xvZ2lj YWxIZWlnaHQoKSkKLSAgICAgICAgcmV0dXJuIGNoaWxkLm92ZXJyaWRpbmdDb250ZW50TG9naWNh bEhlaWdodCgpOworICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICAvLyBXZSBkb24ndCBjdXJy ZW50bHkgaW1wbGVtZW50IHRoZSBvcHRpbWl6YXRpb24gZnJvbQotICAgIC8vIGh0dHBzOi8vZHJh ZnRzLmNzc3dnLm9yZy9jc3MtZmxleGJveC8jZGVmaW5pdGUtc2l6ZXMgY2FzZSAxLiBXaGlsZSB0 aGF0Ci0gICAgLy8gY291bGQgc3BlZWQgdXAgYSBzcGVjaWFsaXplZCBjYXNlLCBpdCByZXF1aXJl cyBkZXRlcm1pbmluZyBpZiB3ZSBoYXZlIGEKLSAgICAvLyBkZWZpbml0ZSBzaXplLCB3aGljaCBp dHNlbGYgaXMgbm90IGNoZWFwLiBXZSBjYW4gY29uc2lkZXIgaW1wbGVtZW50aW5nIGl0Ci0gICAg Ly8gYXQgYSBsYXRlciB0aW1lLiAoVGhlIGNvcnJlY3RuZXNzIGlzIGVuc3VyZWQgYnkgcmVkb2lu ZyBsYXlvdXQgaW4KLSAgICAvLyBhcHBseVN0cmV0Y2hBbGlnbm1lbnRUb0NoaWxkKQotICAgIHJl dHVybiBXVEY6Om51bGxvcHQ7CisgICAgcmV0dXJuIGNoaWxkLmhhc092ZXJyaWRpbmdMb2dpY2Fs SGVpZ2h0KCk7CiB9CiAKLU9wdGlvbmFsPExheW91dFVuaXQ+IFJlbmRlckZsZXhpYmxlQm94Ojpt YWluU2l6ZUZvclBlcmNlbnRhZ2VSZXNvbHV0aW9uKGNvbnN0IFJlbmRlckJveCYgY2hpbGQpCiti b29sIFJlbmRlckZsZXhpYmxlQm94Ojp1c2VDaGlsZE92ZXJyaWRpbmdNYWluU2l6ZUZvclBlcmNl bnRhZ2VSZXNvbHV0aW9uKGNvbnN0IFJlbmRlckJveCYgY2hpbGQpCiB7CiAgICAgQVNTRVJUKCFt YWluQXhpc0lzQ2hpbGRJbmxpbmVBeGlzKGNoaWxkKSk7CiAgICAgLy8gVGhpcyBmdW5jdGlvbiBp bXBsZW1lbnRzIHNlY3Rpb24gOS44LiBEZWZpbml0ZSBhbmQgSW5kZWZpbml0ZSBTaXplcywgY2Fz ZSAyKSBvZiB0aGUgZmxleGJveCBzcGVjLgogICAgIC8vIElmIHRoZSBmbGV4IGNvbnRhaW5lciBo YXMgYSBkZWZpbml0ZSBtYWluIHNpemUgdGhlIGZsZXggaXRlbSBwb3N0LWZsZXhpbmcgbWFpbiBz aXplIGlzIGFsc28gdHJlYXRlZAogICAgIC8vIGFzIGRlZmluaXRlLiBXZSBtYWtlIHVwIGEgcGVy Y2VudGFnZSB0byBjaGVjayB3aGV0aGVyIHdlIGhhdmUgYSBkZWZpbml0ZSBzaXplLgogICAgIGlm ICghY2hpbGRNYWluU2l6ZUlzRGVmaW5pdGUoY2hpbGQsIExlbmd0aCgwLCBMZW5ndGhUeXBlOjpQ ZXJjZW50KSkpCi0gICAgICAgIHJldHVybiBXVEY6Om51bGxvcHQ7CisgICAgICAgIHJldHVybiBm YWxzZTsKIAotICAgIHJldHVybiBjaGlsZC5oYXNPdmVycmlkaW5nTG9naWNhbEhlaWdodCgpID8g T3B0aW9uYWw8TGF5b3V0VW5pdD4oY2hpbGQub3ZlcnJpZGluZ0NvbnRlbnRMb2dpY2FsSGVpZ2h0 KCkpIDogV1RGOjpudWxsb3B0OworICAgIHJldHVybiBjaGlsZC5oYXNPdmVycmlkaW5nTG9naWNh bEhlaWdodCgpOwogfQogCi1PcHRpb25hbDxMYXlvdXRVbml0PiBSZW5kZXJGbGV4aWJsZUJveDo6 Y2hpbGRMb2dpY2FsSGVpZ2h0Rm9yUGVyY2VudGFnZVJlc29sdXRpb24oY29uc3QgUmVuZGVyQm94 JiBjaGlsZCkKK2Jvb2wgUmVuZGVyRmxleGlibGVCb3g6OnVzZUNoaWxkT3ZlcnJpZGluZ0xvZ2lj YWxIZWlnaHRGb3JQZXJjZW50YWdlUmVzb2x1dGlvbihjb25zdCBSZW5kZXJCb3gmIGNoaWxkKQog ewogICAgIGlmIChtYWluQXhpc0lzQ2hpbGRJbmxpbmVBeGlzKGNoaWxkKSkKLSAgICAgICAgcmV0 dXJuIGNyb3NzU2l6ZUZvclBlcmNlbnRhZ2VSZXNvbHV0aW9uKGNoaWxkKTsKLSAgICByZXR1cm4g bWFpblNpemVGb3JQZXJjZW50YWdlUmVzb2x1dGlvbihjaGlsZCk7CisgICAgICAgIHJldHVybiB1 c2VDaGlsZE92ZXJyaWRpbmdDcm9zc1NpemVGb3JQZXJjZW50YWdlUmVzb2x1dGlvbihjaGlsZCk7 CisgICAgcmV0dXJuIHVzZUNoaWxkT3ZlcnJpZGluZ01haW5TaXplRm9yUGVyY2VudGFnZVJlc29s dXRpb24oY2hpbGQpOwogfQogCiBMYXlvdXRVbml0IFJlbmRlckZsZXhpYmxlQm94OjphZGp1c3RD aGlsZFNpemVGb3JBc3BlY3RSYXRpb0Nyb3NzQXhpc01pbkFuZE1heChjb25zdCBSZW5kZXJCb3gm IGNoaWxkLCBMYXlvdXRVbml0IGNoaWxkU2l6ZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckZsZXhpYmxlQm94LmgKaW5kZXggNjgwZGNkN2MwMzgwNDcyYjQ5OWFkNzQ0ZGVhMjFk NjhjN2Y0ZTk0OS4uZTkzZWU3YmFmZmZlNjRmNmEwN2Y2YjAxYjgwNTNmZmQ0OTEwZGU3ZSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmgKKysr IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmgKQEAgLTY5LDcg KzY5LDcgQEAgcHVibGljOgogCiAgICAgdmlydHVhbCBib29sIGlzRmxleGlibGVCb3hJbXBsKCkg Y29uc3QgeyByZXR1cm4gZmFsc2U7IH07CiAgICAgCi0gICAgT3B0aW9uYWw8TGF5b3V0VW5pdD4g Y2hpbGRMb2dpY2FsSGVpZ2h0Rm9yUGVyY2VudGFnZVJlc29sdXRpb24oY29uc3QgUmVuZGVyQm94 Jik7CisgICAgYm9vbCB1c2VDaGlsZE92ZXJyaWRpbmdMb2dpY2FsSGVpZ2h0Rm9yUGVyY2VudGFn ZVJlc29sdXRpb24oY29uc3QgUmVuZGVyQm94Jik7CiAgICAgCiAgICAgdm9pZCBjbGVhckNhY2hl ZE1haW5TaXplRm9yQ2hpbGQoY29uc3QgUmVuZGVyQm94JiBjaGlsZCk7CiAgICAgCkBAIC0xNTYs OCArMTU2LDggQEAgcHJpdmF0ZToKICAgICBPdmVyZmxvdyBtYWluQXhpc092ZXJmbG93Rm9yQ2hp bGQoY29uc3QgUmVuZGVyQm94JiBjaGlsZCkgY29uc3Q7CiAgICAgT3ZlcmZsb3cgY3Jvc3NBeGlz T3ZlcmZsb3dGb3JDaGlsZChjb25zdCBSZW5kZXJCb3gmIGNoaWxkKSBjb25zdDsKICAgICB2b2lk IGNhY2hlQ2hpbGRNYWluU2l6ZShjb25zdCBSZW5kZXJCb3gmIGNoaWxkKTsKLSAgICBPcHRpb25h bDxMYXlvdXRVbml0PiBjcm9zc1NpemVGb3JQZXJjZW50YWdlUmVzb2x1dGlvbihjb25zdCBSZW5k ZXJCb3gmKTsKLSAgICBPcHRpb25hbDxMYXlvdXRVbml0PiBtYWluU2l6ZUZvclBlcmNlbnRhZ2VS ZXNvbHV0aW9uKGNvbnN0IFJlbmRlckJveCYpOworICAgIGJvb2wgdXNlQ2hpbGRPdmVycmlkaW5n Q3Jvc3NTaXplRm9yUGVyY2VudGFnZVJlc29sdXRpb24oY29uc3QgUmVuZGVyQm94Jik7CisgICAg Ym9vbCB1c2VDaGlsZE92ZXJyaWRpbmdNYWluU2l6ZUZvclBlcmNlbnRhZ2VSZXNvbHV0aW9uKGNv bnN0IFJlbmRlckJveCYpOwogCiAgICAgdm9pZCBsYXlvdXRGbGV4SXRlbXMoYm9vbCByZWxheW91 dENoaWxkcmVuKTsKICAgICBMYXlvdXRVbml0IGF1dG9NYXJnaW5PZmZzZXRJbk1haW5BeGlzKGNv bnN0IFZlY3RvcjxGbGV4SXRlbT4mLCBMYXlvdXRVbml0JiBhdmFpbGFibGVGcmVlU3BhY2UpOwo=