228105 2021-07-20 05:04:30 -0700 [css-grid] svg image as grid items should use the overriding logical width/height when defined to compute the logical height/width 2021-11-21 10:22:11 -0800 1 1 1 Unclassified WebKit CSS WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 233184 1 zsun zsun changseok commit-queue esprehn+autocc ews-watchlist glenn jfernandez kondapallykalyan pdr rbuis rego svillar webkit-bug-importer oldest_to_newest 1778153 0 zsun 2021-07-20 05:04:30 -0700 svg image as grid items should use the overriding logical width/height when defined to compute the logical height/width as well. 1778156 1 zsun 2021-07-20 05:20:08 -0700 *** Bug 227900 has been marked as a duplicate of this bug. *** 1778157 2 433869 zsun 2021-07-20 05:22:27 -0700 Created attachment 433869 Patch 1778885 3 433869 jfernandez 2021-07-22 16:15:28 -0700 Comment on attachment 433869 Patch r=me 1779406 4 ews-feeder 2021-07-26 00:42:52 -0700 Committed r280290 (239948@main): <https://commits.webkit.org/239948@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 433869. 1779407 5 webkit-bug-importer 2021-07-26 00:43:17 -0700 <rdar://problem/81093461> 1779415 6 rbuis 2021-07-26 02:30:54 -0700 I think a lambda or in this case a free function would be preferred here to keep the if statement readable. 1779422 7 jfernandez 2021-07-26 03:04:16 -0700 (In reply to Rob Buis from comment #6) > I think a lambda or in this case a free function would be preferred here to > keep the if statement readable. yeah, I agree. Ziran, could you consider Rob's idea in a follow up patch ? 1815426 8 commit-queue 2021-11-16 03:38:01 -0800 Re-opened since this is blocked by bug 233184 1816149 9 433869 jfernandez 2021-11-17 15:10:17 -0800 Comment on attachment 433869 Patch What about the Rob's suggestion in #c6 ? 1816340 10 zsun 2021-11-18 01:00:16 -0800 (In reply to Javier Fernandez from comment #9) > Comment on attachment 433869 [details] > Patch > > What about the Rob's suggestion in #c6 ? I have a patch to upload that addresses Rob's suggestion in #c6. We probably need to land bug 228022 first to avoid rebasing. 1816400 11 444665 zsun 2021-11-18 06:13:52 -0800 Created attachment 444665 Patch 1816774 12 444665 jfernandez 2021-11-19 01:06:09 -0800 Comment on attachment 444665 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=444665&action=review r=me > Source/WebCore/rendering/RenderReplaced.cpp:534 > +static inline bool hasIntrinsicSize(RenderBox*contentRenderer, bool hasIntrinsicWidth, bool hasIntrinsicHeight ) nit: s/*contentRender/* contentRender > Source/WebCore/rendering/RenderReplaced.cpp:538 > + if (contentRenderer && contentRenderer->isSVGRoot() && (hasIntrinsicWidth || hasIntrinsicHeight)) Just a suggestion; what about doing this like: if (hasIntrinsicWidth || hasIntrinsicHeight)) return contentRenderer && contentRenderer->isSVGRoot() The idea is to make clear that we only consider single-axis size as intrinsic in the case of SVG root. For any other case we would expect both, width and height to be intrinsic. 1816782 13 444790 zsun 2021-11-19 01:33:12 -0800 Created attachment 444790 Patch 1817197 14 ews-feeder 2021-11-21 10:22:09 -0800 Committed r286100 (244487@main): <https://commits.webkit.org/244487@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 444790. 433869 2021-07-20 05:22:27 -0700 2021-11-18 06:13:47 -0800 Patch bug-228105-20210720132226.patch text/plain 6617 zsun U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwMDc4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2M0NmEzMDQ2ZjFiN2Yz ZDQxYzM3ODdiMWYxNzA5ZDM0MmY3YjZjMi4uYTgyYzdlMDRhYjY5MDRjM2I5ZDVlZTI2MzZjYWVk NTNiYzE5Njg2MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIxLTA3LTIwICBaaXJh biBTdW4gIDx6c3VuQGlnYWxpYS5jb20+CisKKyAgICAgICAgW2Nzcy1ncmlkXSBzdmcgaW1hZ2Ug YXMgZ3JpZCBpdGVtcyBzaG91bGQgdXNlIHRoZSBvdmVycmlkaW5nIGxvZ2ljYWwgd2lkdGgvaGVp Z2h0IHdoZW4gZGVmaW5lZCB0byBjb21wdXRlIHRoZSBsb2dpY2FsIGhlaWdodC93aWR0aAorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI4MTA1CisKKyAg ICAgICAgQXMgZGlzY3Vzc2VkIGF0IGh0dHBzOi8vZ2l0aHViLmNvbS93M2MvY3Nzd2ctZHJhZnRz L2lzc3Vlcy82Mjg2I2lzc3VlY29tbWVudC04NjY5ODY1NDQsIGRlZ2VuZXJhdGUKKyAgICAgICAg YXNwZWN0IHJhdGlvcyBkZXJpdmVkIGZyb20gU1ZHIHdpZHRoL2hlaWdodCBhdHRyaWJ1dGVzIGZh bGwgYmFjayB0byB2aWV3Ym94IGFzcGVjdCByYXRpbyAKKyAgICAgICAgKHdoZXRoZXIgZHVlIHRv IG5lZ2F0aXZlIHZhbHVlcyBvciB6ZXJvIHZhbHVlcykuCisKKyAgICAgICAgV2hlbiBjb21wdXRp bmcgdGhlIGxvZ2ljYWwgaGVpZ2h0L3dpZHRoIHVzaW5nIGFuIGludHJpbnNpYyBhc3BlY3QgcmF0 aW8sIFJlbmRlclJlcGxhY2VkIHVzZXMgdGhlCisgICAgICAgIG92ZXJyaWRpbmdMb2dpY2FsV2lk dGgvb3ZlcnJpZGluZ0xvZ2ljYWxIZWlnaHQgd2hlbmV2ZXIgZGVmaW5lZCBhcyBsb25nIGFzIHRo ZSBmbGV4IG9yCisgICAgICAgIGdyaWQgaXRlbSBoYXMgYW4gaW50cmluc2ljIHNpemUuIEZvciBh biBTVkcgZ3JhcGhpYyB0aG91Z2gsIGl0J3MgY29tbW9uIHRvIGhhdmUgYW4gaW50cmluc2ljIGFz cGVjdAorICAgICAgICByYXRpbyBidXQgbm90IHRvIGhhdmUgYW4gaW50cmluc2ljIHdpZHRoIG9y IGhlaWdodC4gRm9yIHRoaXMgc3BlY2lhbCBjYXNlLCB3ZSBzdGlsbCBzaG91bGQgdXNlCisgICAg ICAgIG92ZXJyaWRpbmdMb2dpY2FsV2lkdGgvb3ZlcnJpZGluZ0xvZ2ljYWxIZWlnaHQgZm9yIGxv Z2ljYWwgaGVpZ2h0L3dpZHRoIGNhbGN1bGF0aW9ucy4gICAgICAgIAorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclJlcGxh Y2VkLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclJlcGxhY2VkOjpjb21wdXRlUmVwbGFj ZWRMb2dpY2FsV2lkdGggY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyUmVwbGFjZWQ6 OmNvbXB1dGVSZXBsYWNlZExvZ2ljYWxIZWlnaHQgY29uc3QpOgorCiAyMDIxLTA3LTIwICBaaXJh biBTdW4gIDx6c3VuQGlnYWxpYS5jb20+CiAKICAgICAgICAgSW1hZ2VzIGFzIGdyaWQgaXRlbXMg c2hvdWxkIHVzZSB0aGUgb3ZlcnJpZGluZ0xvZ2ljYWxXaWR0aCB3aGVuIGRlZmluZWQgdG8gY29t cHV0ZSB0aGUgbG9naWNhbCBIZWlnaHQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJSZXBsYWNlZC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy UmVwbGFjZWQuY3BwCmluZGV4IDkwMGMzNWY2MDM2OTk3MDA5MTViY2IzOGQ3ZDg2YjQ0NTNlNzgx ZDguLjNiNjFhNzM4MjkzYjZmZmEzMmIwN2E4MTIwMzE0NDM3ZTYxZjg1NmEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJSZXBsYWNlZC5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclJlcGxhY2VkLmNwcApAQCAtNTUzLDcgKzU1Myw3IEBA IExheW91dFVuaXQgUmVuZGVyUmVwbGFjZWQ6OmNvbXB1dGVSZXBsYWNlZExvZ2ljYWxXaWR0aChT aG91bGRDb21wdXRlUHJlZmVycmVkIHNoCiAgICAgICAgIC8vIEZvciBmbGV4IG9yIGdyaWQgaXRl bXMgd2hlcmUgdGhlIGxvZ2ljYWwgaGVpZ2h0IGhhcyBiZWVuIG92ZXJyaWRlbiB0aGVuIHdlIHNo b3VsZCB1c2UgdGhhdCBzaXplIHRvIGNvbXB1dGUgdGhlIHJlcGxhY2VkIHdpZHRoIGFzIGxvbmcg YXMgdGhlIGZsZXggb3IKICAgICAgICAgLy8gZ3JpZCBpdGVtIGhhcyBhbiBpbnRyaW5zaWMgc2l6 ZS4gSXQgaXMgcG9zc2libGUgKGluZGVlZCwgY29tbW9uKSBmb3IgYW4gU1ZHIGdyYXBoaWMgdG8g aGF2ZSBhbiBpbnRyaW5zaWMgYXNwZWN0IHJhdGlvIGJ1dCBub3QgdG8gaGF2ZSBhbiBpbnRyaW5z aWMKICAgICAgICAgLy8gd2lkdGggb3IgaGVpZ2h0LiBUaGVyZSBhcmUgYWxzbyBlbGVtZW50cyB3 aXRoIGludHJpbnNpYyBzaXplcyBidXQgd2l0aG91dCBpbnRyaW5zaWMgcmF0aW8gKGxpa2UgYW4g aWZyYW1lKS4KLSAgICAgICAgaWYgKGludHJpbnNpY1JhdGlvICYmIChpc0ZsZXhJdGVtKCkgfHwg aXNHcmlkSXRlbSgpKSAmJiBoYXNPdmVycmlkaW5nTG9naWNhbEhlaWdodCgpICYmIGhhc0ludHJp bnNpY1dpZHRoICYmIGhhc0ludHJpbnNpY0hlaWdodCkKKyAgICAgICAgaWYgKGludHJpbnNpY1Jh dGlvICYmIChpc0ZsZXhJdGVtKCkgfHwgaXNHcmlkSXRlbSgpKSAmJiBoYXNPdmVycmlkaW5nTG9n aWNhbEhlaWdodCgpICYmICgoaGFzSW50cmluc2ljV2lkdGggJiYgaGFzSW50cmluc2ljSGVpZ2h0 KSB8fCAoY29udGVudFJlbmRlcmVyICYmIGNvbnRlbnRSZW5kZXJlci0+aXNTVkdSb290KCkgJiYg KGhhc0ludHJpbnNpY1dpZHRoIHx8IGhhc0ludHJpbnNpY0hlaWdodCkpKSkKICAgICAgICAgICAg IHJldHVybiBjb21wdXRlUmVwbGFjZWRMb2dpY2FsV2lkdGhSZXNwZWN0aW5nTWluTWF4V2lkdGgo cm91bmRUb0ludChyb3VuZChvdmVycmlkaW5nQ29udGVudExvZ2ljYWxIZWlnaHQoKSAqIGludHJp bnNpY1JhdGlvKSksIHNob3VsZENvbXB1dGVQcmVmZXJyZWQpOwogCiAgICAgICAgIC8vIElmICdo ZWlnaHQnIGFuZCAnd2lkdGgnIGJvdGggaGF2ZSBjb21wdXRlZCB2YWx1ZXMgb2YgJ2F1dG8nIGFu ZCB0aGUgZWxlbWVudCBhbHNvIGhhcyBhbiBpbnRyaW5zaWMgd2lkdGgsIHRoZW4gdGhhdCBpbnRy aW5zaWMgd2lkdGggaXMgdGhlIHVzZWQgdmFsdWUgb2YgJ3dpZHRoJy4KQEAgLTYyMyw3ICs2MjMs NyBAQCBMYXlvdXRVbml0IFJlbmRlclJlcGxhY2VkOjpjb21wdXRlUmVwbGFjZWRMb2dpY2FsSGVp Z2h0KHN0ZDo6b3B0aW9uYWw8TGF5b3V0VW5pdAogICAgIGJvb2wgaGFzSW50cmluc2ljV2lkdGgg PSBjb25zdHJhaW5lZFNpemUuaGFzSW50cmluc2ljV2lkdGggfHwgY29uc3RyYWluZWRTaXplLndp ZHRoKCkgPiAwOwogCiAgICAgLy8gU2VlIGNvbXB1dGVSZXBsYWNlZExvZ2ljYWxIZWlnaHQoKSBm b3IgYSBzaW1pbGFyIGNoZWNrIGZvciBoZWlnaHRzLgotICAgIGlmIChpbnRyaW5zaWNSYXRpbyAm JiAoaXNGbGV4SXRlbSgpIHx8IGlzR3JpZEl0ZW0oKSkgJiYgaGFzT3ZlcnJpZGluZ0xvZ2ljYWxX aWR0aCgpICYmIGhhc0ludHJpbnNpY0hlaWdodCAmJiBoYXNJbnRyaW5zaWNXaWR0aCkKKyAgICBp ZiAoaW50cmluc2ljUmF0aW8gJiYgKGlzRmxleEl0ZW0oKSB8fCBpc0dyaWRJdGVtKCkpICYmIGhh c092ZXJyaWRpbmdMb2dpY2FsV2lkdGgoKSAmJiAoKGhhc0ludHJpbnNpY1dpZHRoICYmIGhhc0lu dHJpbnNpY0hlaWdodCkgfHwgKGNvbnRlbnRSZW5kZXJlciAmJiBjb250ZW50UmVuZGVyZXItPmlz U1ZHUm9vdCgpICYmIChoYXNJbnRyaW5zaWNXaWR0aCB8fCBoYXNJbnRyaW5zaWNIZWlnaHQpKSkp CiAgICAgICAgIHJldHVybiBjb21wdXRlUmVwbGFjZWRMb2dpY2FsSGVpZ2h0UmVzcGVjdGluZ01p bk1heEhlaWdodChyb3VuZFRvSW50KHJvdW5kKG92ZXJyaWRpbmdDb250ZW50TG9naWNhbFdpZHRo KCkgLyBpbnRyaW5zaWNSYXRpbykpKTsKIAogICAgIC8vIElmICdoZWlnaHQnIGFuZCAnd2lkdGgn IGJvdGggaGF2ZSBjb21wdXRlZCB2YWx1ZXMgb2YgJ2F1dG8nIGFuZCB0aGUgZWxlbWVudCBhbHNv IGhhcyBhbiBpbnRyaW5zaWMgaGVpZ2h0LCB0aGVuIHRoYXQgaW50cmluc2ljIGhlaWdodCBpcyB0 aGUgdXNlZCB2YWx1ZSBvZiAnaGVpZ2h0Jy4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAyN2FmMjY5ZmNlOWY0NjIwMWY3OGVk NDI0ZmQ2MWYyMzFiZjZlY2VkLi5mOGNlZTcxOGI5NDAzZWRmODU2ODc5ZjVlODc3ZmIyNmJhM2Ni NTc0IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjEtMDctMjAgIFppcmFuIFN1biAgPHpzdW5A aWdhbGlhLmNvbT4KKworICAgICAgICBbY3NzLWdyaWRdIHN2ZyBpbWFnZSBhcyBncmlkIGl0ZW1z IHNob3VsZCB1c2UgdGhlIG92ZXJyaWRpbmcgbG9naWNhbCB3aWR0aC9oZWlnaHQgd2hlbiBkZWZp bmVkIHRvIGNvbXB1dGUgdGhlIGxvZ2ljYWwgaGVpZ2h0L3dpZHRoCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjgxMDUKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVcGRhdGUgVGVzdEV4cGVjdGF0aW9ucyBh cyA0IGZhaWxlZCBncmlkIFdQVCB0ZXN0cyBhcmUgbm93IHBhc3NpbmcuCisgCisgICAgICAgICog VGVzdEV4cGVjdGF0aW9uczoKKwogMjAyMS0wNy0yMCAgWmlyYW4gU3VuICA8enN1bkBpZ2FsaWEu Y29tPgogCiAgICAgICAgIEltYWdlcyBhcyBncmlkIGl0ZW1zIHNob3VsZCB1c2UgdGhlIG92ZXJy aWRpbmdMb2dpY2FsV2lkdGggd2hlbiBkZWZpbmVkIHRvIGNvbXB1dGUgdGhlIGxvZ2ljYWwgSGVp Z2h0CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zIGIvTGF5b3V0VGVz dHMvVGVzdEV4cGVjdGF0aW9ucwppbmRleCBmNDQ2MzZiYjI3NTYxOTAyNWMzYWJkMmNmYjIzMmFm N2IxNTQ3YWNlLi5hMTQwODk5Y2FhMGI2ZDgyZDQ1YjZlZmRiOTY3ZGMwYWIzZDkxM2FmIDEwMDY0 NAotLS0gYS9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL1Rl c3RFeHBlY3RhdGlvbnMKQEAgLTQyODksMTAgKzQyODksNiBAQCB3ZWJraXQub3JnL2IvMjA5NDYw IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1ncmlkL2Fic3Bvcy9kZXNj ZW5kYQogd2Via2l0Lm9yZy9iLzIwOTQ2MCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3Rz L2Nzcy9jc3MtZ3JpZC9hYnNwb3MvZGVzY2VuZGFudC1zdGF0aWMtcG9zaXRpb24tMDAyLmh0bWwg WyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMDk0NjAgaW1wb3J0ZWQvdzNjL3dl Yi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWdyaWQvYWJzcG9zL2Rlc2NlbmRhbnQtc3RhdGljLXBv c2l0aW9uLTAwMy5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjEyMjAx IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1ncmlkL2dyaWQtZGVmaW5p dGlvbi9ncmlkLWxpbWl0cy0wMDEuaHRtbCBbIFNraXAgXQotd2Via2l0Lm9yZy9iLzIyNzkwMCBp bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZ3JpZC9hbGlnbm1lbnQvZ3Jp ZC1pdGVtLWFzcGVjdC1yYXRpby1zdHJldGNoLTEuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQot d2Via2l0Lm9yZy9iLzIyNzkwMCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9j c3MtZ3JpZC9hbGlnbm1lbnQvZ3JpZC1pdGVtLWFzcGVjdC1yYXRpby1zdHJldGNoLTIuaHRtbCBb IEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIyNzkwMCBpbXBvcnRlZC93M2Mvd2Vi LXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZ3JpZC9hbGlnbm1lbnQvZ3JpZC1pdGVtLWFzcGVjdC1y YXRpby1zdHJldGNoLTMuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzIy NzkwMCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZ3JpZC9hbGlnbm1l bnQvZ3JpZC1pdGVtLWFzcGVjdC1yYXRpby1zdHJldGNoLTQuaHRtbCBbIEltYWdlT25seUZhaWx1 cmUgXQogd2Via2l0Lm9yZy9iLzIxMjI0NiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3Rz L2Nzcy9jc3MtZ3JpZC9hbGlnbm1lbnQvZ3JpZC1iYXNlbGluZS1hbGlnbi1jeWNsZXMtMDAxLmh0 bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTIyNDYgaW1wb3J0ZWQvdzNj L3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWdyaWQvYWxpZ25tZW50L2dyaWQtaXRlbS1jb250 ZW50LWJhc2VsaW5lLTAwMS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2Iv MjEyMjQ2IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1ncmlkL2FsaWdu bWVudC9ncmlkLWl0ZW0tY29udGVudC1iYXNlbGluZS0wMDIuaHRtbCBbIEltYWdlT25seUZhaWx1 cmUgXQo= 444665 2021-11-18 06:13:52 -0800 2021-11-19 01:33:07 -0800 Patch bug-228105-20211118141350.patch text/plain 7074 zsun U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1OTk4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2MxYmYxOGM1YThkMDBi OTE0ZGM1MDc2NjY1NDMwODFjNWVmNTVlYS4uMGE1NzlkOWY0OWY2ZDQ4NjcwZTZiYzc1ZDhkMmRh NjQ4MTA2ZDEzYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIxLTExLTE4ICBaaXJh biBTdW4gIDx6c3VuQGlnYWxpYS5jb20+CisKKyAgICAgICAgW2Nzcy1ncmlkXSBzdmcgaW1hZ2Ug YXMgZ3JpZCBpdGVtcyBzaG91bGQgdXNlIHRoZSBvdmVycmlkaW5nIGxvZ2ljYWwgd2lkdGgvaGVp Z2h0IHdoZW4gZGVmaW5lZCB0byBjb21wdXRlIHRoZSBsb2dpY2FsIGhlaWdodC93aWR0aAorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI4MTA1CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBpcyBhIHJl bGFuZCBvZiByMjgwMjkwLiBJdCdzIGdvdCByZXZlcnRlZCBiZWNhdXNlIGFub3RoZXIgcGF0Y2gg cjI4MDA3OCBjYXVzZWQgY3Jhc2ggYW5kIGhhZCBiZWVuCisgICAgICAgIHJldmVydGVkLiByMjgw MjkwIGlzIGEgZGVwZW5kZW50IHBhdGNoIGZvciByMjgwMDc4LgorCisgICAgICAgIEFzIGRpc2N1 c3NlZCBhdCBodHRwczovL2dpdGh1Yi5jb20vdzNjL2Nzc3dnLWRyYWZ0cy9pc3N1ZXMvNjI4NiNp c3N1ZWNvbW1lbnQtODY2OTg2NTQ0LCBkZWdlbmVyYXRlCisgICAgICAgIGFzcGVjdCByYXRpb3Mg ZGVyaXZlZCBmcm9tIFNWRyB3aWR0aC9oZWlnaHQgYXR0cmlidXRlcyBmYWxsIGJhY2sgdG8gdmll d2JveCBhc3BlY3QgcmF0aW8gCisgICAgICAgICh3aGV0aGVyIGR1ZSB0byBuZWdhdGl2ZSB2YWx1 ZXMgb3IgemVybyB2YWx1ZXMpLgorCisgICAgICAgIFdoZW4gY29tcHV0aW5nIHRoZSBsb2dpY2Fs IGhlaWdodC93aWR0aCB1c2luZyBhbiBpbnRyaW5zaWMgYXNwZWN0IHJhdGlvLCBSZW5kZXJSZXBs YWNlZCB1c2VzIHRoZQorICAgICAgICBvdmVycmlkaW5nTG9naWNhbFdpZHRoL292ZXJyaWRpbmdM b2dpY2FsSGVpZ2h0IHdoZW5ldmVyIGRlZmluZWQgYXMgbG9uZyBhcyB0aGUgZmxleCBvcgorICAg ICAgICBncmlkIGl0ZW0gaGFzIGFuIGludHJpbnNpYyBzaXplLiBGb3IgYW4gU1ZHIGdyYXBoaWMg dGhvdWdoLCBpdCdzIGNvbW1vbiB0byBoYXZlIGFuIGludHJpbnNpYyBhc3BlY3QKKyAgICAgICAg cmF0aW8gYnV0IG5vdCB0byBoYXZlIGFuIGludHJpbnNpYyB3aWR0aCBvciBoZWlnaHQuIEZvciB0 aGlzIHNwZWNpYWwgY2FzZSwgd2Ugc3RpbGwgc2hvdWxkIHVzZQorICAgICAgICBvdmVycmlkaW5n TG9naWNhbFdpZHRoL292ZXJyaWRpbmdMb2dpY2FsSGVpZ2h0IGZvciBsb2dpY2FsIGhlaWdodC93 aWR0aCBjYWxjdWxhdGlvbnMuICAgICAgICAKKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJS ZXBsYWNlZC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpoYXNJbnRyaW5zaWNTaXplKToKKyAgICAg ICAgKFdlYkNvcmU6OlJlbmRlclJlcGxhY2VkOjpjb21wdXRlUmVwbGFjZWRMb2dpY2FsV2lkdGgg Y29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyUmVwbGFjZWQ6OmNvbXB1dGVSZXBsYWNl ZExvZ2ljYWxIZWlnaHQgY29uc3QpOgorCiAyMDIxLTExLTE4ICBaaXJhbiBTdW4gIDx6c3VuQGln YWxpYS5jb20+CiAKICAgICAgICAgSW1hZ2VzIGFzIGdyaWQgaXRlbXMgc2hvdWxkIHVzZSB0aGUg b3ZlcnJpZGluZ0xvZ2ljYWxXaWR0aCB3aGVuIGRlZmluZWQgdG8gY29tcHV0ZSB0aGUgbG9naWNh bCBIZWlnaHQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJSZXBs YWNlZC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyUmVwbGFjZWQuY3BwCmlu ZGV4IDBmOTVkMTEyNDEzZGIwMTlkZjE1N2Y1MWE5ZDE0YWNhNWYzMjNkZjMuLmM5ZDk5N2RkYzRm ZmI1MjFhOTdkODA0NjA4MDE0YjYyYWEyNjlmMjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJSZXBsYWNlZC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlclJlcGxhY2VkLmNwcApAQCAtNTMxLDYgKzUzMSwxNSBAQCBzdGF0aWMgaW5saW5l IExheW91dFVuaXQgcmVzb2x2ZVdpZHRoRm9yUmF0aW8oTGF5b3V0VW5pdCBib3JkZXJBbmRQYWRk aW5nTG9naWNhbAogICAgIHJldHVybiBMYXlvdXRVbml0KHJvdW5kKGxvZ2ljYWxIZWlnaHQgKiBh c3BlY3RSYXRpbykpOwogfQogCitzdGF0aWMgaW5saW5lIGJvb2wgaGFzSW50cmluc2ljU2l6ZShS ZW5kZXJCb3gqY29udGVudFJlbmRlcmVyLCBib29sIGhhc0ludHJpbnNpY1dpZHRoLCBib29sIGhh c0ludHJpbnNpY0hlaWdodCApCit7CisgICAgaWYgKGhhc0ludHJpbnNpY1dpZHRoICYmIGhhc0lu dHJpbnNpY0hlaWdodCkKKyAgICAgICAgcmV0dXJuIHRydWU7CisgICAgaWYgKGNvbnRlbnRSZW5k ZXJlciAmJiBjb250ZW50UmVuZGVyZXItPmlzU1ZHUm9vdCgpICYmIChoYXNJbnRyaW5zaWNXaWR0 aCB8fCBoYXNJbnRyaW5zaWNIZWlnaHQpKQorICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICByZXR1 cm4gZmFsc2U7Cit9CisKIExheW91dFVuaXQgUmVuZGVyUmVwbGFjZWQ6OmNvbXB1dGVSZXBsYWNl ZExvZ2ljYWxXaWR0aChTaG91bGRDb21wdXRlUHJlZmVycmVkIHNob3VsZENvbXB1dGVQcmVmZXJy ZWQpIGNvbnN0CiB7CiAgICAgaWYgKHN0eWxlKCkubG9naWNhbFdpZHRoKCkuaXNTcGVjaWZpZWQo KSB8fCBzdHlsZSgpLmxvZ2ljYWxXaWR0aCgpLmlzSW50cmluc2ljKCkpCkBAIC01NTMsNyArNTYy LDcgQEAgTGF5b3V0VW5pdCBSZW5kZXJSZXBsYWNlZDo6Y29tcHV0ZVJlcGxhY2VkTG9naWNhbFdp ZHRoKFNob3VsZENvbXB1dGVQcmVmZXJyZWQgc2gKICAgICAgICAgLy8gRm9yIGZsZXggb3IgZ3Jp ZCBpdGVtcyB3aGVyZSB0aGUgbG9naWNhbCBoZWlnaHQgaGFzIGJlZW4gb3ZlcnJpZGVuIHRoZW4g d2Ugc2hvdWxkIHVzZSB0aGF0IHNpemUgdG8gY29tcHV0ZSB0aGUgcmVwbGFjZWQgd2lkdGggYXMg bG9uZyBhcyB0aGUgZmxleCBvcgogICAgICAgICAvLyBncmlkIGl0ZW0gaGFzIGFuIGludHJpbnNp YyBzaXplLiBJdCBpcyBwb3NzaWJsZSAoaW5kZWVkLCBjb21tb24pIGZvciBhbiBTVkcgZ3JhcGhp YyB0byBoYXZlIGFuIGludHJpbnNpYyBhc3BlY3QgcmF0aW8gYnV0IG5vdCB0byBoYXZlIGFuIGlu dHJpbnNpYwogICAgICAgICAvLyB3aWR0aCBvciBoZWlnaHQuIFRoZXJlIGFyZSBhbHNvIGVsZW1l bnRzIHdpdGggaW50cmluc2ljIHNpemVzIGJ1dCB3aXRob3V0IGludHJpbnNpYyByYXRpbyAobGlr ZSBhbiBpZnJhbWUpLgotICAgICAgICBpZiAoaW50cmluc2ljUmF0aW8gJiYgKGlzRmxleEl0ZW0o KSB8fCBpc0dyaWRJdGVtKCkpICYmIGhhc092ZXJyaWRpbmdMb2dpY2FsSGVpZ2h0KCkgJiYgaGFz SW50cmluc2ljV2lkdGggJiYgaGFzSW50cmluc2ljSGVpZ2h0KQorICAgICAgICBpZiAoaW50cmlu c2ljUmF0aW8gJiYgKGlzRmxleEl0ZW0oKSB8fCBpc0dyaWRJdGVtKCkpICYmIGhhc092ZXJyaWRp bmdMb2dpY2FsSGVpZ2h0KCkgJiYgaGFzSW50cmluc2ljU2l6ZShjb250ZW50UmVuZGVyZXIsIGhh c0ludHJpbnNpY1dpZHRoLCBoYXNJbnRyaW5zaWNIZWlnaHQpKQogICAgICAgICAgICAgcmV0dXJu IGNvbXB1dGVSZXBsYWNlZExvZ2ljYWxXaWR0aFJlc3BlY3RpbmdNaW5NYXhXaWR0aChyb3VuZFRv SW50KHJvdW5kKG92ZXJyaWRpbmdDb250ZW50TG9naWNhbEhlaWdodCgpICogaW50cmluc2ljUmF0 aW8pKSwgc2hvdWxkQ29tcHV0ZVByZWZlcnJlZCk7CiAKICAgICAgICAgLy8gSWYgJ2hlaWdodCcg YW5kICd3aWR0aCcgYm90aCBoYXZlIGNvbXB1dGVkIHZhbHVlcyBvZiAnYXV0bycgYW5kIHRoZSBl bGVtZW50IGFsc28gaGFzIGFuIGludHJpbnNpYyB3aWR0aCwgdGhlbiB0aGF0IGludHJpbnNpYyB3 aWR0aCBpcyB0aGUgdXNlZCB2YWx1ZSBvZiAnd2lkdGgnLgpAQCAtNjIzLDcgKzYzMiw3IEBAIExh eW91dFVuaXQgUmVuZGVyUmVwbGFjZWQ6OmNvbXB1dGVSZXBsYWNlZExvZ2ljYWxIZWlnaHQoc3Rk OjpvcHRpb25hbDxMYXlvdXRVbml0CiAgICAgYm9vbCBoYXNJbnRyaW5zaWNXaWR0aCA9IGNvbnN0 cmFpbmVkU2l6ZS5oYXNJbnRyaW5zaWNXaWR0aCB8fCBjb25zdHJhaW5lZFNpemUud2lkdGgoKSA+ IDA7CiAKICAgICAvLyBTZWUgY29tcHV0ZVJlcGxhY2VkTG9naWNhbEhlaWdodCgpIGZvciBhIHNp bWlsYXIgY2hlY2sgZm9yIGhlaWdodHMuCi0gICAgaWYgKGludHJpbnNpY1JhdGlvICYmIChpc0Zs ZXhJdGVtKCkgfHwgaXNHcmlkSXRlbSgpKSAmJiBoYXNPdmVycmlkaW5nTG9naWNhbFdpZHRoKCkg JiYgaGFzSW50cmluc2ljSGVpZ2h0ICYmIGhhc0ludHJpbnNpY1dpZHRoKQorICAgIGlmIChpbnRy aW5zaWNSYXRpbyAmJiAoaXNGbGV4SXRlbSgpIHx8IGlzR3JpZEl0ZW0oKSkgJiYgaGFzT3ZlcnJp ZGluZ0xvZ2ljYWxXaWR0aCgpICYmIGhhc0ludHJpbnNpY1NpemUoY29udGVudFJlbmRlcmVyLCBo YXNJbnRyaW5zaWNXaWR0aCwgaGFzSW50cmluc2ljSGVpZ2h0KSkKICAgICAgICAgcmV0dXJuIGNv bXB1dGVSZXBsYWNlZExvZ2ljYWxIZWlnaHRSZXNwZWN0aW5nTWluTWF4SGVpZ2h0KHJvdW5kVG9J bnQocm91bmQob3ZlcnJpZGluZ0NvbnRlbnRMb2dpY2FsV2lkdGgoKSAvIGludHJpbnNpY1JhdGlv KSkpOwogCiAgICAgLy8gSWYgJ2hlaWdodCcgYW5kICd3aWR0aCcgYm90aCBoYXZlIGNvbXB1dGVk IHZhbHVlcyBvZiAnYXV0bycgYW5kIHRoZSBlbGVtZW50IGFsc28gaGFzIGFuIGludHJpbnNpYyBo ZWlnaHQsIHRoZW4gdGhhdCBpbnRyaW5zaWMgaGVpZ2h0IGlzIHRoZSB1c2VkIHZhbHVlIG9mICdo ZWlnaHQnLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCmluZGV4IDhlNGE1ZWQzNGI2ODgyMmRmNWI0YjdlMGM5OTljNzJlYzk0MGE4NTYu LjBiMTY2NTk4ODdkNTA2YTNjYTRiMTBkNGRiNzNmM2NiYTZjZWM5MTEgMTAwNjQ0Ci0tLSBhL0xh eW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyAr MSwxMiBAQAorMjAyMS0xMS0xOCAgWmlyYW4gU3VuICA8enN1bkBpZ2FsaWEuY29tPgorCisgICAg ICAgIFtjc3MtZ3JpZF0gc3ZnIGltYWdlIGFzIGdyaWQgaXRlbXMgc2hvdWxkIHVzZSB0aGUgb3Zl cnJpZGluZyBsb2dpY2FsIHdpZHRoL2hlaWdodCB3aGVuIGRlZmluZWQgdG8gY29tcHV0ZSB0aGUg bG9naWNhbCBoZWlnaHQvd2lkdGgKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIyODEwNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogVGVzdEV4cGVjdGF0aW9uczogdW5za2lwIHR3byB0ZXN0cyB0aGF0IGFy ZSBub3cgcGFzc2luZy4KKwogMjAyMS0xMS0xOCAgWmlyYW4gU3VuICA8enN1bkBpZ2FsaWEuY29t PgogCiAgICAgICAgIEltYWdlcyBhcyBncmlkIGl0ZW1zIHNob3VsZCB1c2UgdGhlIG92ZXJyaWRp bmdMb2dpY2FsV2lkdGggd2hlbiBkZWZpbmVkIHRvIGNvbXB1dGUgdGhlIGxvZ2ljYWwgSGVpZ2h0 CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zIGIvTGF5b3V0VGVzdHMv VGVzdEV4cGVjdGF0aW9ucwppbmRleCBlOWExZjhlYmIzMzYwZTk1YjkzZDYwZGU3MzNhMTMzNzFi ZGQ0NzI0Li4wNzliMGJjZWMwZTA2MzczNWZjNzY3M2IyNmFkMmRkN2IwNTVkMmMxIDEwMDY0NAot LS0gYS9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL1Rlc3RF eHBlY3RhdGlvbnMKQEAgLTQzMjEsOCArNDMyMSw2IEBAIHdlYmtpdC5vcmcvYi8yMDk0NjAgaW1w b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWdyaWQvYWJzcG9zL2Rlc2NlbmRh CiB3ZWJraXQub3JnL2IvMjA5NDYwIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3Nz L2Nzcy1ncmlkL2Fic3Bvcy9kZXNjZW5kYW50LXN0YXRpYy1wb3NpdGlvbi0wMDIuaHRtbCBbIElt YWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIwOTQ2MCBpbXBvcnRlZC93M2Mvd2ViLXBs YXRmb3JtLXRlc3RzL2Nzcy9jc3MtZ3JpZC9hYnNwb3MvZGVzY2VuZGFudC1zdGF0aWMtcG9zaXRp b24tMDAzLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTIyMDEgaW1w b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWdyaWQvZ3JpZC1kZWZpbml0aW9u L2dyaWQtbGltaXRzLTAwMS5odG1sIFsgU2tpcCBdCi13ZWJraXQub3JnL2IvMjI3OTAwIGltcG9y dGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1ncmlkL2FsaWdubWVudC9ncmlkLWl0 ZW0tYXNwZWN0LXJhdGlvLXN0cmV0Y2gtMS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJr aXQub3JnL2IvMjI3OTAwIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1n cmlkL2FsaWdubWVudC9ncmlkLWl0ZW0tYXNwZWN0LXJhdGlvLXN0cmV0Y2gtMi5odG1sIFsgSW1h Z2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjEyMjQ2IGltcG9ydGVkL3czYy93ZWItcGxh dGZvcm0tdGVzdHMvY3NzL2Nzcy1ncmlkL2FsaWdubWVudC9ncmlkLWJhc2VsaW5lLWFsaWduLWN5 Y2xlcy0wMDEuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIzMTAyMSBp bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZ3JpZC9hbGlnbm1lbnQvZ3Jp ZC1pbmxpbmUtYmFzZWxpbmUuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9i LzIxMjI0NiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZ3JpZC9hbGln bm1lbnQvZ3JpZC1pdGVtLWNvbnRlbnQtYmFzZWxpbmUtMDAxLmh0bWwgWyBJbWFnZU9ubHlGYWls dXJlIF0K 444790 2021-11-19 01:33:12 -0800 2021-11-21 10:22:10 -0800 Patch bug-228105-20211119093310.patch text/plain 7068 zsun U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1OTk4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2MxYmYxOGM1YThkMDBi OTE0ZGM1MDc2NjY1NDMwODFjNWVmNTVlYS4uN2Q3OTQxNjk3NzgzMDgxMzZjNGRkYWIzZWJkNjg5 NDMxMzIzMzVlZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIxLTExLTE4ICBaaXJh biBTdW4gIDx6c3VuQGlnYWxpYS5jb20+CisKKyAgICAgICAgW2Nzcy1ncmlkXSBzdmcgaW1hZ2Ug YXMgZ3JpZCBpdGVtcyBzaG91bGQgdXNlIHRoZSBvdmVycmlkaW5nIGxvZ2ljYWwgd2lkdGgvaGVp Z2h0IHdoZW4gZGVmaW5lZCB0byBjb21wdXRlIHRoZSBsb2dpY2FsIGhlaWdodC93aWR0aAorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI4MTA1CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgSmF2aWVyIEZlcm5hbmRlei4KKworICAgICAgICBUaGlzIGlzIGEg cmVsYW5kIG9mIHIyODAyOTAuIEl0J3MgZ290IHJldmVydGVkIGJlY2F1c2UgYW5vdGhlciBwYXRj aCByMjgwMDc4IGNhdXNlZCBjcmFzaCBhbmQgaGFkIGJlZW4KKyAgICAgICAgcmV2ZXJ0ZWQuIHIy ODAyOTAgaXMgYSBkZXBlbmRlbnQgcGF0Y2ggZm9yIHIyODAwNzguCisKKyAgICAgICAgQXMgZGlz Y3Vzc2VkIGF0IGh0dHBzOi8vZ2l0aHViLmNvbS93M2MvY3Nzd2ctZHJhZnRzL2lzc3Vlcy82Mjg2 I2lzc3VlY29tbWVudC04NjY5ODY1NDQsIGRlZ2VuZXJhdGUKKyAgICAgICAgYXNwZWN0IHJhdGlv cyBkZXJpdmVkIGZyb20gU1ZHIHdpZHRoL2hlaWdodCBhdHRyaWJ1dGVzIGZhbGwgYmFjayB0byB2 aWV3Ym94IGFzcGVjdCByYXRpbyAKKyAgICAgICAgKHdoZXRoZXIgZHVlIHRvIG5lZ2F0aXZlIHZh bHVlcyBvciB6ZXJvIHZhbHVlcykuCisKKyAgICAgICAgV2hlbiBjb21wdXRpbmcgdGhlIGxvZ2lj YWwgaGVpZ2h0L3dpZHRoIHVzaW5nIGFuIGludHJpbnNpYyBhc3BlY3QgcmF0aW8sIFJlbmRlclJl cGxhY2VkIHVzZXMgdGhlCisgICAgICAgIG92ZXJyaWRpbmdMb2dpY2FsV2lkdGgvb3ZlcnJpZGlu Z0xvZ2ljYWxIZWlnaHQgd2hlbmV2ZXIgZGVmaW5lZCBhcyBsb25nIGFzIHRoZSBmbGV4IG9yCisg ICAgICAgIGdyaWQgaXRlbSBoYXMgYW4gaW50cmluc2ljIHNpemUuIEZvciBhbiBTVkcgZ3JhcGhp YyB0aG91Z2gsIGl0J3MgY29tbW9uIHRvIGhhdmUgYW4gaW50cmluc2ljIGFzcGVjdAorICAgICAg ICByYXRpbyBidXQgbm90IHRvIGhhdmUgYW4gaW50cmluc2ljIHdpZHRoIG9yIGhlaWdodC4gRm9y IHRoaXMgc3BlY2lhbCBjYXNlLCB3ZSBzdGlsbCBzaG91bGQgdXNlCisgICAgICAgIG92ZXJyaWRp bmdMb2dpY2FsV2lkdGgvb3ZlcnJpZGluZ0xvZ2ljYWxIZWlnaHQgZm9yIGxvZ2ljYWwgaGVpZ2h0 L3dpZHRoIGNhbGN1bGF0aW9ucy4gICAgICAgIAorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRl clJlcGxhY2VkLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Omhhc0ludHJpbnNpY1NpemUpOgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyUmVwbGFjZWQ6OmNvbXB1dGVSZXBsYWNlZExvZ2ljYWxXaWR0 aCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJSZXBsYWNlZDo6Y29tcHV0ZVJlcGxh Y2VkTG9naWNhbEhlaWdodCBjb25zdCk6CisKIDIwMjEtMTEtMTggIFppcmFuIFN1biAgPHpzdW5A aWdhbGlhLmNvbT4KIAogICAgICAgICBJbWFnZXMgYXMgZ3JpZCBpdGVtcyBzaG91bGQgdXNlIHRo ZSBvdmVycmlkaW5nTG9naWNhbFdpZHRoIHdoZW4gZGVmaW5lZCB0byBjb21wdXRlIHRoZSBsb2dp Y2FsIEhlaWdodApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclJl cGxhY2VkLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJSZXBsYWNlZC5jcHAK aW5kZXggMGY5NWQxMTI0MTNkYjAxOWRmMTU3ZjUxYTlkMTRhY2E1ZjMyM2RmMy4uYWNjZGU0MWUy MjZiMjdlMWFkNWYyY2EzZTc4NmI5ZGQ1ODFkZDgwNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlclJlcGxhY2VkLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyUmVwbGFjZWQuY3BwCkBAIC01MzEsNiArNTMxLDE1IEBAIHN0YXRpYyBpbmxp bmUgTGF5b3V0VW5pdCByZXNvbHZlV2lkdGhGb3JSYXRpbyhMYXlvdXRVbml0IGJvcmRlckFuZFBh ZGRpbmdMb2dpY2FsCiAgICAgcmV0dXJuIExheW91dFVuaXQocm91bmQobG9naWNhbEhlaWdodCAq IGFzcGVjdFJhdGlvKSk7CiB9CiAKK3N0YXRpYyBpbmxpbmUgYm9vbCBoYXNJbnRyaW5zaWNTaXpl KFJlbmRlckJveCpjb250ZW50UmVuZGVyZXIsIGJvb2wgaGFzSW50cmluc2ljV2lkdGgsIGJvb2wg aGFzSW50cmluc2ljSGVpZ2h0ICkKK3sKKyAgICBpZiAoaGFzSW50cmluc2ljV2lkdGggJiYgaGFz SW50cmluc2ljSGVpZ2h0KQorICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICBpZiAoaGFzSW50cmlu c2ljV2lkdGggfHwgaGFzSW50cmluc2ljSGVpZ2h0KQorICAgICAgICByZXR1cm4gY29udGVudFJl bmRlcmVyICYmIGNvbnRlbnRSZW5kZXJlci0+aXNTVkdSb290KCk7CisgICAgcmV0dXJuIGZhbHNl OworfQorCiBMYXlvdXRVbml0IFJlbmRlclJlcGxhY2VkOjpjb21wdXRlUmVwbGFjZWRMb2dpY2Fs V2lkdGgoU2hvdWxkQ29tcHV0ZVByZWZlcnJlZCBzaG91bGRDb21wdXRlUHJlZmVycmVkKSBjb25z dAogewogICAgIGlmIChzdHlsZSgpLmxvZ2ljYWxXaWR0aCgpLmlzU3BlY2lmaWVkKCkgfHwgc3R5 bGUoKS5sb2dpY2FsV2lkdGgoKS5pc0ludHJpbnNpYygpKQpAQCAtNTUzLDcgKzU2Miw3IEBAIExh eW91dFVuaXQgUmVuZGVyUmVwbGFjZWQ6OmNvbXB1dGVSZXBsYWNlZExvZ2ljYWxXaWR0aChTaG91 bGRDb21wdXRlUHJlZmVycmVkIHNoCiAgICAgICAgIC8vIEZvciBmbGV4IG9yIGdyaWQgaXRlbXMg d2hlcmUgdGhlIGxvZ2ljYWwgaGVpZ2h0IGhhcyBiZWVuIG92ZXJyaWRlbiB0aGVuIHdlIHNob3Vs ZCB1c2UgdGhhdCBzaXplIHRvIGNvbXB1dGUgdGhlIHJlcGxhY2VkIHdpZHRoIGFzIGxvbmcgYXMg dGhlIGZsZXggb3IKICAgICAgICAgLy8gZ3JpZCBpdGVtIGhhcyBhbiBpbnRyaW5zaWMgc2l6ZS4g SXQgaXMgcG9zc2libGUgKGluZGVlZCwgY29tbW9uKSBmb3IgYW4gU1ZHIGdyYXBoaWMgdG8gaGF2 ZSBhbiBpbnRyaW5zaWMgYXNwZWN0IHJhdGlvIGJ1dCBub3QgdG8gaGF2ZSBhbiBpbnRyaW5zaWMK ICAgICAgICAgLy8gd2lkdGggb3IgaGVpZ2h0LiBUaGVyZSBhcmUgYWxzbyBlbGVtZW50cyB3aXRo IGludHJpbnNpYyBzaXplcyBidXQgd2l0aG91dCBpbnRyaW5zaWMgcmF0aW8gKGxpa2UgYW4gaWZy YW1lKS4KLSAgICAgICAgaWYgKGludHJpbnNpY1JhdGlvICYmIChpc0ZsZXhJdGVtKCkgfHwgaXNH cmlkSXRlbSgpKSAmJiBoYXNPdmVycmlkaW5nTG9naWNhbEhlaWdodCgpICYmIGhhc0ludHJpbnNp Y1dpZHRoICYmIGhhc0ludHJpbnNpY0hlaWdodCkKKyAgICAgICAgaWYgKGludHJpbnNpY1JhdGlv ICYmIChpc0ZsZXhJdGVtKCkgfHwgaXNHcmlkSXRlbSgpKSAmJiBoYXNPdmVycmlkaW5nTG9naWNh bEhlaWdodCgpICYmIGhhc0ludHJpbnNpY1NpemUoY29udGVudFJlbmRlcmVyLCBoYXNJbnRyaW5z aWNXaWR0aCwgaGFzSW50cmluc2ljSGVpZ2h0KSkKICAgICAgICAgICAgIHJldHVybiBjb21wdXRl UmVwbGFjZWRMb2dpY2FsV2lkdGhSZXNwZWN0aW5nTWluTWF4V2lkdGgocm91bmRUb0ludChyb3Vu ZChvdmVycmlkaW5nQ29udGVudExvZ2ljYWxIZWlnaHQoKSAqIGludHJpbnNpY1JhdGlvKSksIHNo b3VsZENvbXB1dGVQcmVmZXJyZWQpOwogCiAgICAgICAgIC8vIElmICdoZWlnaHQnIGFuZCAnd2lk dGgnIGJvdGggaGF2ZSBjb21wdXRlZCB2YWx1ZXMgb2YgJ2F1dG8nIGFuZCB0aGUgZWxlbWVudCBh bHNvIGhhcyBhbiBpbnRyaW5zaWMgd2lkdGgsIHRoZW4gdGhhdCBpbnRyaW5zaWMgd2lkdGggaXMg dGhlIHVzZWQgdmFsdWUgb2YgJ3dpZHRoJy4KQEAgLTYyMyw3ICs2MzIsNyBAQCBMYXlvdXRVbml0 IFJlbmRlclJlcGxhY2VkOjpjb21wdXRlUmVwbGFjZWRMb2dpY2FsSGVpZ2h0KHN0ZDo6b3B0aW9u YWw8TGF5b3V0VW5pdAogICAgIGJvb2wgaGFzSW50cmluc2ljV2lkdGggPSBjb25zdHJhaW5lZFNp emUuaGFzSW50cmluc2ljV2lkdGggfHwgY29uc3RyYWluZWRTaXplLndpZHRoKCkgPiAwOwogCiAg ICAgLy8gU2VlIGNvbXB1dGVSZXBsYWNlZExvZ2ljYWxIZWlnaHQoKSBmb3IgYSBzaW1pbGFyIGNo ZWNrIGZvciBoZWlnaHRzLgotICAgIGlmIChpbnRyaW5zaWNSYXRpbyAmJiAoaXNGbGV4SXRlbSgp IHx8IGlzR3JpZEl0ZW0oKSkgJiYgaGFzT3ZlcnJpZGluZ0xvZ2ljYWxXaWR0aCgpICYmIGhhc0lu dHJpbnNpY0hlaWdodCAmJiBoYXNJbnRyaW5zaWNXaWR0aCkKKyAgICBpZiAoaW50cmluc2ljUmF0 aW8gJiYgKGlzRmxleEl0ZW0oKSB8fCBpc0dyaWRJdGVtKCkpICYmIGhhc092ZXJyaWRpbmdMb2dp Y2FsV2lkdGgoKSAmJiBoYXNJbnRyaW5zaWNTaXplKGNvbnRlbnRSZW5kZXJlciwgaGFzSW50cmlu c2ljV2lkdGgsIGhhc0ludHJpbnNpY0hlaWdodCkpCiAgICAgICAgIHJldHVybiBjb21wdXRlUmVw bGFjZWRMb2dpY2FsSGVpZ2h0UmVzcGVjdGluZ01pbk1heEhlaWdodChyb3VuZFRvSW50KHJvdW5k KG92ZXJyaWRpbmdDb250ZW50TG9naWNhbFdpZHRoKCkgLyBpbnRyaW5zaWNSYXRpbykpKTsKIAog ICAgIC8vIElmICdoZWlnaHQnIGFuZCAnd2lkdGgnIGJvdGggaGF2ZSBjb21wdXRlZCB2YWx1ZXMg b2YgJ2F1dG8nIGFuZCB0aGUgZWxlbWVudCBhbHNvIGhhcyBhbiBpbnRyaW5zaWMgaGVpZ2h0LCB0 aGVuIHRoYXQgaW50cmluc2ljIGhlaWdodCBpcyB0aGUgdXNlZCB2YWx1ZSBvZiAnaGVpZ2h0Jy4K ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA4ZTRhNWVkMzRiNjg4MjJkZjViNGI3ZTBjOTk5YzcyZWM5NDBhODU2Li5mYzc1ZTM4 YTBiN2FjZGI1Zjg0MjdhZjEyN2JjMjZiNjQ4Mzk1MjY3IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAK KzIwMjEtMTEtMTggIFppcmFuIFN1biAgPHpzdW5AaWdhbGlhLmNvbT4KKworICAgICAgICBbY3Nz LWdyaWRdIHN2ZyBpbWFnZSBhcyBncmlkIGl0ZW1zIHNob3VsZCB1c2UgdGhlIG92ZXJyaWRpbmcg bG9naWNhbCB3aWR0aC9oZWlnaHQgd2hlbiBkZWZpbmVkIHRvIGNvbXB1dGUgdGhlIGxvZ2ljYWwg aGVpZ2h0L3dpZHRoCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMjgxMDUKKworICAgICAgICBSZXZpZXdlZCBieSBKYXZpZXIgRmVybmFuZGV6LgorCisg ICAgICAgICogVGVzdEV4cGVjdGF0aW9uczogdW5za2lwIHR3byB0ZXN0cyB0aGF0IGFyZSBub3cg cGFzc2luZy4KKwogMjAyMS0xMS0xOCAgWmlyYW4gU3VuICA8enN1bkBpZ2FsaWEuY29tPgogCiAg ICAgICAgIEltYWdlcyBhcyBncmlkIGl0ZW1zIHNob3VsZCB1c2UgdGhlIG92ZXJyaWRpbmdMb2dp Y2FsV2lkdGggd2hlbiBkZWZpbmVkIHRvIGNvbXB1dGUgdGhlIGxvZ2ljYWwgSGVpZ2h0CmRpZmYg LS1naXQgYS9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zIGIvTGF5b3V0VGVzdHMvVGVzdEV4 cGVjdGF0aW9ucwppbmRleCBlOWExZjhlYmIzMzYwZTk1YjkzZDYwZGU3MzNhMTMzNzFiZGQ0NzI0 Li4wNzliMGJjZWMwZTA2MzczNWZjNzY3M2IyNmFkMmRkN2IwNTVkMmMxIDEwMDY0NAotLS0gYS9M YXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL1Rlc3RFeHBlY3Rh dGlvbnMKQEAgLTQzMjEsOCArNDMyMSw2IEBAIHdlYmtpdC5vcmcvYi8yMDk0NjAgaW1wb3J0ZWQv dzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWdyaWQvYWJzcG9zL2Rlc2NlbmRhCiB3ZWJr aXQub3JnL2IvMjA5NDYwIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1n cmlkL2Fic3Bvcy9kZXNjZW5kYW50LXN0YXRpYy1wb3NpdGlvbi0wMDIuaHRtbCBbIEltYWdlT25s eUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIwOTQ2MCBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3Jt LXRlc3RzL2Nzcy9jc3MtZ3JpZC9hYnNwb3MvZGVzY2VuZGFudC1zdGF0aWMtcG9zaXRpb24tMDAz Lmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8yMTIyMDEgaW1wb3J0ZWQv dzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWdyaWQvZ3JpZC1kZWZpbml0aW9uL2dyaWQt bGltaXRzLTAwMS5odG1sIFsgU2tpcCBdCi13ZWJraXQub3JnL2IvMjI3OTAwIGltcG9ydGVkL3cz Yy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1ncmlkL2FsaWdubWVudC9ncmlkLWl0ZW0tYXNw ZWN0LXJhdGlvLXN0cmV0Y2gtMS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCi13ZWJraXQub3Jn L2IvMjI3OTAwIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1ncmlkL2Fs aWdubWVudC9ncmlkLWl0ZW0tYXNwZWN0LXJhdGlvLXN0cmV0Y2gtMi5odG1sIFsgSW1hZ2VPbmx5 RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMjEyMjQ2IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0t dGVzdHMvY3NzL2Nzcy1ncmlkL2FsaWdubWVudC9ncmlkLWJhc2VsaW5lLWFsaWduLWN5Y2xlcy0w MDEuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIzMTAyMSBpbXBvcnRl ZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZ3JpZC9hbGlnbm1lbnQvZ3JpZC1pbmxp bmUtYmFzZWxpbmUuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIxMjI0 NiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZ3JpZC9hbGlnbm1lbnQv Z3JpZC1pdGVtLWNvbnRlbnQtYmFzZWxpbmUtMDAxLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0K