238107 2022-03-18 21:20:20 -0700 [IFC][Integration] Remove redundant InlineIterator::Line::contentLogicalTopAdjustedForHitTesting 2022-03-20 08:06:18 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham changseok esprehn+autocc ews-watchlist glenn koivisto kondapallykalyan mmaxfield pdr simon.fraser webkit-bug-importer zalan oldest_to_newest 1852946 0 zalan 2022-03-18 21:20:20 -0700 ssia 1852948 1 455164 zalan 2022-03-18 21:28:50 -0700 Created attachment 455164 Patch 1852964 2 455164 koivisto 2022-03-19 05:52:05 -0700 Comment on attachment 455164 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=455164&action=review > Source/WebCore/ChangeLog:9 > + - containingBlock's borer and padding before border > Source/WebCore/layout/integration/InlineIteratorLineModernPath.h:-61 > - float contentLogicalTopAdjustedForHitTesting() const { return !m_lineIndex ? containingBlock().borderAndPaddingBefore().toFloat() : contentLogicalTopAdjustedForPrecedingLine(); }; Did you forget to remove the LineLegacyPath version? 1853046 3 455188 zalan 2022-03-19 22:12:02 -0700 Created attachment 455188 Patch 1853062 4 ews-feeder 2022-03-20 08:05:52 -0700 Committed r291545 (248651@main): <https://commits.webkit.org/248651@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 455188. 1853063 5 webkit-bug-importer 2022-03-20 08:06:18 -0700 <rdar://problem/90538811> 455164 2022-03-18 21:28:50 -0700 2022-03-19 22:12:00 -0700 Patch bug-238107-20220318212850.patch text/plain 7958 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjkxMzI0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWU0ZmZkZjFhMzg2N2Zk NGU3ODg1NDM2MGVmOTNhYWI4MjM1OGZmOC4uNDQ5YzNlOWYyYmE0ZTIxMjA1ZGZkNjgxZGVlYjBj MDc2ZDU0MGI3NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIyLTAzLTE4ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbSUZDXVtJbnRlZ3JhdGlvbl0g UmVtb3ZlIHJlZHVuZGFudCBJbmxpbmVJdGVyYXRvcjo6TGluZTo6Y29udGVudExvZ2ljYWxUb3BB ZGp1c3RlZEZvckhpdFRlc3RpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIzODEwNworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIEl0IGxvb2tzIGxpa2UgY29udGVudExvZ2ljYWxUb3BBZGp1c3RlZEZvckhp dFRlc3RpbmcgaXMganVzdCB0aGUgY29tYmluYXRpb24gb2YKKyAgICAgICAgLSBjb250YWluaW5n QmxvY2sncyBib3JlciBhbmQgcGFkZGluZyBiZWZvcmUKKyAgICAgICAgLSBMaW5lU2VsZWN0aW9u Ojpsb2dpY2FsVG9wICh3aGljaCBpcyBlaXRoZXIgdGhlIGxpbmUncyBjb250ZW50IHRvcCBvciB0 aGUgcHJldmlvdXMgbGluZSdzIGNvbnRlbnQgYm90dG9tKQorICAgICAgICAtIGxpbmUncyBjb250 ZW50IHRvcAorCisgICAgICAgICogbGF5b3V0L2ludGVncmF0aW9uL0lubGluZUl0ZXJhdG9yTGlu ZS5oOgorICAgICAgICAoV2ViQ29yZTo6SW5saW5lSXRlcmF0b3I6OmNvbnRlbnRTdGFydEluQmxv Y2tEaXJlY3Rpb24pOgorICAgICAgICAoV2ViQ29yZTo6SW5saW5lSXRlcmF0b3I6OkxpbmU6OmNv bnRlbnRMb2dpY2FsVG9wQWRqdXN0ZWRGb3JIaXRUZXN0aW5nIGNvbnN0KTogRGVsZXRlZC4KKyAg ICAgICAgKiBsYXlvdXQvaW50ZWdyYXRpb24vSW5saW5lSXRlcmF0b3JMaW5lTW9kZXJuUGF0aC5o OgorICAgICAgICAoV2ViQ29yZTo6SW5saW5lSXRlcmF0b3I6OkxpbmVJdGVyYXRvck1vZGVyblBh dGg6OmNvbnRlbnRMb2dpY2FsVG9wQWRqdXN0ZWRGb3JQcmVjZWRpbmdMaW5lIGNvbnN0KToKKyAg ICAgICAgKFdlYkNvcmU6OklubGluZUl0ZXJhdG9yOjpMaW5lSXRlcmF0b3JNb2Rlcm5QYXRoOjpj b250ZW50TG9naWNhbFRvcEFkanVzdGVkRm9ySGl0VGVzdGluZyBjb25zdCk6IERlbGV0ZWQuCisg ICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJCbG9ja0Zsb3c6OnBvc2l0aW9uRm9yUG9pbnRXaXRoSW5saW5lQ2hpbGRyZW4pOgor ICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJSZXBsYWNlZC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJSZXBsYWNlZDo6cG9zaXRpb25Gb3JQb2ludCk6IFRoaXMgc2VlbXMgdG8gYmUgbWlz c2luZyB0aGUgY29udGVudExvZ2ljYWxUb3AgY2hlY2suCisgICAgICAgICogcmVuZGVyaW5nL1Jl bmRlclRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGV4dDo6cG9zaXRpb25Gb3JQ b2ludCk6CisKIDIwMjItMDMtMTggIEFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAg ICAgICAgIFtJRkNdW0ludGVncmF0aW9uXSBJbmxpbmVJdGVyYXRvcjo6TGluZSBmdW5jdGlvbnMg c2hvdWxkIGFsbCByZXR1cm4gZmxvYXQgdmFsdWVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvaW50ZWdyYXRpb24vSW5saW5lSXRlcmF0b3JMaW5lLmggYi9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvaW50ZWdyYXRpb24vSW5saW5lSXRlcmF0b3JMaW5lLmgKaW5kZXggNzEyZGU5Yzkx MTI2YzQyMmE2MTYwNGUzM2U4ZDk1MjU2MmJmNzM3ZC4uODFmYjNjNDY4N2ZmYTc1MWY0MzQzN2Rm MTdmNTRjZjk1NDUyYmFjMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVn cmF0aW9uL0lubGluZUl0ZXJhdG9yTGluZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9p bnRlZ3JhdGlvbi9JbmxpbmVJdGVyYXRvckxpbmUuaApAQCAtNjQsNyArNjQsNiBAQCBwdWJsaWM6 CiAgICAgZmxvYXQgY29udGVudExvZ2ljYWxSaWdodCgpIGNvbnN0OwogICAgIGZsb2F0IGNvbnRl bnRMb2dpY2FsV2lkdGgoKSBjb25zdDsKIAotICAgIGZsb2F0IGNvbnRlbnRMb2dpY2FsVG9wQWRq dXN0ZWRGb3JIaXRUZXN0aW5nKCkgY29uc3Q7CiAgICAgZmxvYXQgY29udGVudExvZ2ljYWxUb3BB ZGp1c3RlZEZvclByZWNlZGluZ0xpbmUoKSBjb25zdDsKICAgICBmbG9hdCBjb250ZW50TG9naWNh bEJvdHRvbUFkanVzdGVkRm9yRm9sbG93aW5nTGluZSgpIGNvbnN0OwogCkBAIC0xMjUsNyArMTI0 LDcgQEAgTGVhZkJveEl0ZXJhdG9yIGNsb3Nlc3RCb3hGb3JIb3Jpem9udGFsUG9zaXRpb24oY29u c3QgTGluZSYsIGZsb2F0IGhvcml6b250YWxQb3MKIGlubGluZSBmbG9hdCBjb250ZW50U3RhcnRJ bkJsb2NrRGlyZWN0aW9uKGNvbnN0IExpbmUmIGxpbmUpCiB7CiAgICAgaWYgKCFsaW5lLmNvbnRh aW5pbmdCbG9jaygpLnN0eWxlKCkuaXNGbGlwcGVkQmxvY2tzV3JpdGluZ01vZGUoKSkKLSAgICAg ICAgcmV0dXJuIHN0ZDo6bWF4KGxpbmUuY29udGVudExvZ2ljYWxUb3AoKSwgbGluZS5jb250ZW50 TG9naWNhbFRvcEFkanVzdGVkRm9ySGl0VGVzdGluZygpKTsKKyAgICAgICAgcmV0dXJuIHN0ZDo6 bWF4KGxpbmUuY29udGVudExvZ2ljYWxUb3AoKSwgbGluZS5jb250ZW50TG9naWNhbFRvcEFkanVz dGVkRm9yUHJlY2VkaW5nTGluZSgpKTsKICAgICByZXR1cm4gc3RkOjptaW4obGluZS5jb250ZW50 TG9naWNhbEJvdHRvbSgpLCBsaW5lLmNvbnRlbnRMb2dpY2FsQm90dG9tQWRqdXN0ZWRGb3JGb2xs b3dpbmdMaW5lKCkpOwogfQogCkBAIC0xNTUsMTMgKzE1NCw2IEBAIGlubGluZSBmbG9hdCBMaW5l Ojpjb250ZW50TG9naWNhbFRvcEFkanVzdGVkRm9yUHJlY2VkaW5nTGluZSgpIGNvbnN0CiAgICAg fSk7CiB9CiAKLWlubGluZSBmbG9hdCBMaW5lOjpjb250ZW50TG9naWNhbFRvcEFkanVzdGVkRm9y SGl0VGVzdGluZygpIGNvbnN0Ci17Ci0gICAgcmV0dXJuIFdURjo6c3dpdGNoT24obV9wYXRoVmFy aWFudCwgW10oY29uc3QgYXV0byYgcGF0aCkgewotICAgICAgICByZXR1cm4gcGF0aC5jb250ZW50 TG9naWNhbFRvcEFkanVzdGVkRm9ySGl0VGVzdGluZygpOwotICAgIH0pOwotfQotCiBpbmxpbmUg ZmxvYXQgTGluZTo6Y29udGVudExvZ2ljYWxCb3R0b21BZGp1c3RlZEZvckZvbGxvd2luZ0xpbmUo KSBjb25zdAogewogICAgIHJldHVybiBXVEY6OnN3aXRjaE9uKG1fcGF0aFZhcmlhbnQsIFtdKGNv bnN0IGF1dG8mIHBhdGgpIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRl Z3JhdGlvbi9JbmxpbmVJdGVyYXRvckxpbmVNb2Rlcm5QYXRoLmggYi9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvaW50ZWdyYXRpb24vSW5saW5lSXRlcmF0b3JMaW5lTW9kZXJuUGF0aC5oCmluZGV4IDM3 NjE1ZTVmMWUyNWY1MzBiMTJmZTg4ZmE2OGEzODZhZTI5ZjFhYjAuLmEzZjFjMmNiNTZlOTkxODdj ZDEwMjI5NGEyYTUwMzIwNzM2MTc4ZjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9pbnRlZ3JhdGlvbi9JbmxpbmVJdGVyYXRvckxpbmVNb2Rlcm5QYXRoLmgKKysrIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0lubGluZUl0ZXJhdG9yTGluZU1vZGVyblBhdGgu aApAQCAtNTUsMTAgKzU1LDYgQEAgcHVibGljOgogICAgIGZsb2F0IGxpbmVCb3hCb3R0b20oKSBj b25zdCB7IHJldHVybiBsaW5lKCkubGluZUJveEJvdHRvbSgpOyB9CiAKICAgICBmbG9hdCBjb250 ZW50TG9naWNhbFRvcEFkanVzdGVkRm9yUHJlY2VkaW5nTGluZSgpIGNvbnN0IHsgcmV0dXJuICFt X2xpbmVJbmRleCA/IGNvbnRlbnRMb2dpY2FsVG9wKCkgOiBMaW5lSXRlcmF0b3JNb2Rlcm5QYXRo KCptX2lubGluZUNvbnRlbnQsIG1fbGluZUluZGV4IC0gMSkuY29udGVudExvZ2ljYWxCb3R0b21B ZGp1c3RlZEZvckZvbGxvd2luZ0xpbmUoKTsgfQotICAgIC8vIEZJWE1FOiBSZW1vdmUgdGhlIGNv bnRhaW5pbmdCbG9jaygpLmJvcmRlckFuZFBhZGRpbmdCZWZvcmUoKSBvZmZzZXQgYWZ0ZXIgcmV0 aXJpbmcgbGVnYWN5IGxpbmUgbGF5b3V0LiBJdCBhbHNvIHJlcXVpcmVzIGNoYW5nZXMgaW4gUmVu ZGVyVGV4dDo6cG9zaXRpb25Gb3JQb2ludCB0byBmaW5kIHRoZSBmaXJzdCBsaW5lIHdpdGggb2Zm c2V0LgotICAgIC8vIC0gdGhlICJiZWZvcmUiIHZhbHVlIGlzIGFscmVhZHkgZmFjdG9yZWQgaW4g dG8gdGhlIGxpbmUgb2Zmc2V0Ci0gICAgLy8gLSB0aGlzIGxvZ2ljIG5lZ2F0ZXMgdGhlIGZpcnN0 IGxpbmUncyBuYXR1cmFsIG9mZnNldCAoZS5nLiBibG9jayBoYXMgbm8gYm9yZGVyL3BhZGRpbmcg YnV0IHRoZSBmaXJzdCBsaW5lIGhhcyBhIGNvbXB1dGVkIG9mZnNldCkuCi0gICAgZmxvYXQgY29u dGVudExvZ2ljYWxUb3BBZGp1c3RlZEZvckhpdFRlc3RpbmcoKSBjb25zdCB7IHJldHVybiAhbV9s aW5lSW5kZXggPyBjb250YWluaW5nQmxvY2soKS5ib3JkZXJBbmRQYWRkaW5nQmVmb3JlKCkudG9G bG9hdCgpIDogY29udGVudExvZ2ljYWxUb3BBZGp1c3RlZEZvclByZWNlZGluZ0xpbmUoKTsgfTsK ICAgICAvLyBGSVhNRTogSW1wbGVtZW50LgogICAgIGZsb2F0IGNvbnRlbnRMb2dpY2FsQm90dG9t QWRqdXN0ZWRGb3JGb2xsb3dpbmdMaW5lKCkgY29uc3QgeyByZXR1cm4gY29udGVudExvZ2ljYWxC b3R0b20oKTsgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy QmxvY2tGbG93LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cu Y3BwCmluZGV4IDAzMjU5ZWYzNWYyNzBiYzlkNGFjNTY1NmRiZWQxZTk4MTJjZGJkMTcuLmEwOTZk OTZhNDExOGIxYTE4NzkxZWMzNmY3Mjc1MmE1MDQyNjJkNDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuY3BwCkBAIC0zNDIxLDcgKzM0MjEsOCBAQCBWaXNp YmxlUG9zaXRpb24gUmVuZGVyQmxvY2tGbG93Ojpwb3NpdGlvbkZvclBvaW50V2l0aElubGluZUNo aWxkcmVuKGNvbnN0IExheW91dAogCiAgICAgaWYgKGNsb3Nlc3RCb3gpIHsKICAgICAgICAgaWYg KG1vdmVDYXJldFRvQm91bmRhcnkpIHsKLSAgICAgICAgICAgIGF1dG8gZmlyc3RMaW5lV2l0aENo aWxkcmVuVG9wID0gTGF5b3V0VW5pdCB7IHN0ZDo6bWluKGZpcnN0TGluZVdpdGhDaGlsZHJlbi0+ Y29udGVudExvZ2ljYWxUb3BBZGp1c3RlZEZvckhpdFRlc3RpbmcoKSwgZmlyc3RMaW5lV2l0aENo aWxkcmVuLT5jb250ZW50TG9naWNhbFRvcCgpKSB9OworICAgICAgICAgICAgYXV0byBmaXJzdExp bmVXaXRoQ2hpbGRyZW5Ub3AgPSBzdGQ6Om1pbihib3JkZXJBbmRQYWRkaW5nQmVmb3JlKCksCisg ICAgICAgICAgICAgICAgTGF5b3V0VW5pdCB7IHN0ZDo6bWluKExpbmVTZWxlY3Rpb246OmxvZ2lj YWxUb3AoKmZpcnN0TGluZVdpdGhDaGlsZHJlbiksIGZpcnN0TGluZVdpdGhDaGlsZHJlbi0+Y29u dGVudExvZ2ljYWxUb3AoKSkgfSk7CiAgICAgICAgICAgICBpZiAocG9pbnRJbkxvZ2ljYWxDb250 ZW50cy55KCkgPCBmaXJzdExpbmVXaXRoQ2hpbGRyZW5Ub3AKICAgICAgICAgICAgICAgICB8fCAo YmxvY2tzQXJlRmxpcHBlZCAmJiBwb2ludEluTG9naWNhbENvbnRlbnRzLnkoKSA9PSBmaXJzdExp bmVXaXRoQ2hpbGRyZW5Ub3ApKSB7CiAgICAgICAgICAgICAgICAgYXV0byBib3ggPSBmaXJzdExp bmVXaXRoQ2hpbGRyZW4tPmZpcnN0TGVhZkJveCgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlclJlcGxhY2VkLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJSZXBsYWNlZC5jcHAKaW5kZXggNDk2MjE0YjZmNzVjMjNhZjU3NjcyNGU0ODViZTE2 YTg4Y2RkOWRhOC4uNDc4NDU0MmY1MDk0YWY4NzUxYmMzZjU3OGZkYWVmYzE4ZmMyNDhkMCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclJlcGxhY2VkLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyUmVwbGFjZWQuY3BwCkBAIC03MjIsNyAr NzIyLDkgQEAgVmlzaWJsZVBvc2l0aW9uIFJlbmRlclJlcGxhY2VkOjpwb3NpdGlvbkZvclBvaW50 KGNvbnN0IExheW91dFBvaW50JiBwb2ludCwgY29uc3QKICAgICBhdXRvIFt0b3AsIGJvdHRvbV0g PSBbJl0oKSAtPiBzdGQ6OnBhaXI8ZmxvYXQsIGZsb2F0PiB7CiAgICAgICAgIGlmIChhdXRvIHJ1 biA9IElubGluZUl0ZXJhdG9yOjpib3hGb3IoKnRoaXMpKSB7CiAgICAgICAgICAgICBhdXRvIGxp bmUgPSBydW4tPmxpbmUoKTsKLSAgICAgICAgICAgIHJldHVybiBzdGQ6Om1ha2VfcGFpcihsaW5l LT5jb250ZW50TG9naWNhbFRvcEFkanVzdGVkRm9ySGl0VGVzdGluZygpLCBMaW5lU2VsZWN0aW9u Ojpsb2dpY2FsQm90dG9tKCpsaW5lKSk7CisgICAgICAgICAgICBhdXRvIGxpbmVDb250ZW50VG9w ID0gc3RkOjptaW4obGluZS0+Y29udGFpbmluZ0Jsb2NrKCkuYm9yZGVyQW5kUGFkZGluZ0JlZm9y ZSgpLAorICAgICAgICAgICAgICAgIExheW91dFVuaXQgeyBzdGQ6Om1pbihsaW5lLT5jb250ZW50 TG9naWNhbFRvcCgpLCBMaW5lU2VsZWN0aW9uOjpsb2dpY2FsVG9wKCpsaW5lKSkgfSk7CisgICAg ICAgICAgICByZXR1cm4gc3RkOjptYWtlX3BhaXIobGluZUNvbnRlbnRUb3AsIExpbmVTZWxlY3Rp b246OmxvZ2ljYWxCb3R0b20oKmxpbmUpKTsKICAgICAgICAgfQogICAgICAgICByZXR1cm4gc3Rk OjptYWtlX3BhaXIobG9naWNhbFRvcCgpLCBsb2dpY2FsQm90dG9tKCkpOwogICAgIH0oKTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0LmNwcCBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0LmNwcAppbmRleCBlOWNhMTdiNTY4ZTc1ZGU0 MDU5N2RkOTljYTIxZmU0YTQyNjlkZWE0Li4xY2ExNzM3OGJmMmVlMjNhMDczYzRhNDVmYzhhNGNi N2U3YjdhYzk2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4 dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHQuY3BwCkBAIC02 NzQsNyArNjc0LDggQEAgVmlzaWJsZVBvc2l0aW9uIFJlbmRlclRleHQ6OnBvc2l0aW9uRm9yUG9p bnQoY29uc3QgTGF5b3V0UG9pbnQmIHBvaW50LCBjb25zdCBSZW4KICAgICAgICAgICAgIHJ1bi50 cmF2ZXJzZU5leHRUZXh0Qm94KCk7CiAKICAgICAgICAgYXV0byBsaW5lID0gcnVuLT5saW5lKCk7 Ci0gICAgICAgIGF1dG8gdG9wID0gc3RkOjptaW4obGluZS0+Y29udGVudExvZ2ljYWxUb3BBZGp1 c3RlZEZvckhpdFRlc3RpbmcoKSwgbGluZS0+Y29udGVudExvZ2ljYWxUb3AoKSk7CisgICAgICAg IGF1dG8gdG9wID0gc3RkOjptaW4obGluZS0+Y29udGFpbmluZ0Jsb2NrKCkuYm9yZGVyQW5kUGFk ZGluZ0JlZm9yZSgpLAorICAgICAgICAgICAgTGF5b3V0VW5pdCB7IHN0ZDo6bWluKGxpbmUtPmNv bnRlbnRMb2dpY2FsVG9wKCksIExpbmVTZWxlY3Rpb246OmxvZ2ljYWxUb3AoKmxpbmUpKSB9KTsK ICAgICAgICAgaWYgKHBvaW50QmxvY2tEaXJlY3Rpb24gPiB0b3AgfHwgKCFibG9ja3NBcmVGbGlw cGVkICYmIHBvaW50QmxvY2tEaXJlY3Rpb24gPT0gdG9wKSkgewogICAgICAgICAgICAgYXV0byBi b3R0b20gPSBMaW5lU2VsZWN0aW9uOjpsb2dpY2FsQm90dG9tKCpsaW5lKTsKICAgICAgICAgICAg IGlmIChhdXRvIG5leHRMaW5lID0gbGluZS0+bmV4dCgpKQo= 455188 2022-03-19 22:12:02 -0700 2022-03-20 08:05:54 -0700 Patch bug-238107-20220319221201.patch text/plain 11203 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjkxNTM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmU0YWIwZDY2OGFjZjU3 Mzk4N2FhZTQyMGMxNzFmNDY3YmI2Mzg0My4uZTRkYmE4OWE2YmFkMDNkZmNhODkwYTI4NTcxNzli ZDE2Yzc1YzIwMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIyLTAzLTE5ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbSUZDXVtJbnRlZ3JhdGlvbl0g UmVtb3ZlIHJlZHVuZGFudCBJbmxpbmVJdGVyYXRvcjo6TGluZTo6Y29udGVudExvZ2ljYWxUb3BB ZGp1c3RlZEZvckhpdFRlc3RpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIzODEwNworCisgICAgICAgIFJldmlld2VkIGJ5IEFudHRpIEtvaXZpc3Rv LgorCisgICAgICAgIEl0IGxvb2tzIGxpa2UgY29udGVudExvZ2ljYWxUb3BBZGp1c3RlZEZvckhp dFRlc3RpbmcgaXMganVzdCB0aGUgY29tYmluYXRpb24gb2YKKyAgICAgICAgLSBjb250YWluaW5n QmxvY2sncyBib3JkZXIgYW5kIHBhZGRpbmcgYmVmb3JlCisgICAgICAgIC0gTGluZVNlbGVjdGlv bjo6bG9naWNhbFRvcCAod2hpY2ggaXMgZWl0aGVyIHRoZSBsaW5lJ3MgY29udGVudCB0b3Agb3Ig dGhlIHByZXZpb3VzIGxpbmUncyBjb250ZW50IGJvdHRvbSkKKyAgICAgICAgLSBsaW5lJ3MgY29u dGVudCB0b3AKKworICAgICAgICAqIGxheW91dC9pbnRlZ3JhdGlvbi9JbmxpbmVJdGVyYXRvckxp bmUuaDoKKyAgICAgICAgKFdlYkNvcmU6OklubGluZUl0ZXJhdG9yOjpjb250ZW50U3RhcnRJbkJs b2NrRGlyZWN0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OklubGluZUl0ZXJhdG9yOjpMaW5lOjpj b250ZW50TG9naWNhbFRvcEFkanVzdGVkRm9ySGl0VGVzdGluZyBjb25zdCk6IERlbGV0ZWQuCisg ICAgICAgICogbGF5b3V0L2ludGVncmF0aW9uL0lubGluZUl0ZXJhdG9yTGluZU1vZGVyblBhdGgu aDoKKyAgICAgICAgKFdlYkNvcmU6OklubGluZUl0ZXJhdG9yOjpMaW5lSXRlcmF0b3JNb2Rlcm5Q YXRoOjpjb250ZW50TG9naWNhbFRvcEFkanVzdGVkRm9yUHJlY2VkaW5nTGluZSBjb25zdCk6Cisg ICAgICAgIChXZWJDb3JlOjpJbmxpbmVJdGVyYXRvcjo6TGluZUl0ZXJhdG9yTW9kZXJuUGF0aDo6 Y29udGVudExvZ2ljYWxUb3BBZGp1c3RlZEZvckhpdFRlc3RpbmcgY29uc3QpOiBEZWxldGVkLgor ICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVyQmxvY2tGbG93Ojpwb3NpdGlvbkZvclBvaW50V2l0aElubGluZUNoaWxkcmVuKToK KyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyUmVwbGFjZWQuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVyUmVwbGFjZWQ6OnBvc2l0aW9uRm9yUG9pbnQpOiBUaGlzIHNlZW1zIHRvIGJlIG1p c3NpbmcgdGhlIGNvbnRlbnRMb2dpY2FsVG9wIGNoZWNrLgorICAgICAgICAqIHJlbmRlcmluZy9S ZW5kZXJUZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRleHQ6OnBvc2l0aW9uRm9y UG9pbnQpOgorCiAyMDIyLTAzLTE5ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAK ICAgICAgICAgT3B0aW1pemUgRXZlbnRUYXJnZXQ6OnZpc2l0SlNFdmVudExpc3RlbmVycygpCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vSW5saW5lSXRlcmF0 b3JMaW5lLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vSW5saW5lSXRlcmF0 b3JMaW5lLmgKaW5kZXggNzEyZGU5YzkxMTI2YzQyMmE2MTYwNGUzM2U4ZDk1MjU2MmJmNzM3ZC4u ZWQ4OWY5MDM4Yzk2YjIzYzIwOTUzYWU5OWVlOGQ2NTcwYmViMWZhMyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0lubGluZUl0ZXJhdG9yTGluZS5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9JbmxpbmVJdGVyYXRvckxpbmUuaApA QCAtNjQsNyArNjQsNiBAQCBwdWJsaWM6CiAgICAgZmxvYXQgY29udGVudExvZ2ljYWxSaWdodCgp IGNvbnN0OwogICAgIGZsb2F0IGNvbnRlbnRMb2dpY2FsV2lkdGgoKSBjb25zdDsKIAotICAgIGZs b2F0IGNvbnRlbnRMb2dpY2FsVG9wQWRqdXN0ZWRGb3JIaXRUZXN0aW5nKCkgY29uc3Q7CiAgICAg ZmxvYXQgY29udGVudExvZ2ljYWxUb3BBZGp1c3RlZEZvclByZWNlZGluZ0xpbmUoKSBjb25zdDsK ICAgICBmbG9hdCBjb250ZW50TG9naWNhbEJvdHRvbUFkanVzdGVkRm9yRm9sbG93aW5nTGluZSgp IGNvbnN0OwogCkBAIC0xMjIsMTAgKzEyMSwxNSBAQCBMaW5lSXRlcmF0b3IgbGFzdExpbmVGb3Io Y29uc3QgUmVuZGVyQmxvY2tGbG93Jik7CiBMZWFmQm94SXRlcmF0b3IgY2xvc2VzdEJveEZvckhv cml6b250YWxQb3NpdGlvbihjb25zdCBMaW5lJiwgZmxvYXQgaG9yaXpvbnRhbFBvc2l0aW9uLCBi b29sIGVkaXRhYmxlT25seSA9IGZhbHNlKTsKIAogLy8gLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KK2lubGluZSBmbG9hdCBwcmV2aW91c0xpbmVDb250ZW50 Qm90dG9tT3JCb3JkZXJBbmRQYWRkaW5nKGNvbnN0IExpbmUmIGxpbmUpCit7CisgICAgcmV0dXJu IGxpbmUuaXNGaXJzdCgpID8gbGluZS5jb250YWluaW5nQmxvY2soKS5ib3JkZXJBbmRQYWRkaW5n QmVmb3JlKCkudG9GbG9hdCgpIDogbGluZS5jb250ZW50TG9naWNhbFRvcEFkanVzdGVkRm9yUHJl Y2VkaW5nTGluZSgpOyAKK30KKwogaW5saW5lIGZsb2F0IGNvbnRlbnRTdGFydEluQmxvY2tEaXJl Y3Rpb24oY29uc3QgTGluZSYgbGluZSkKIHsKICAgICBpZiAoIWxpbmUuY29udGFpbmluZ0Jsb2Nr KCkuc3R5bGUoKS5pc0ZsaXBwZWRCbG9ja3NXcml0aW5nTW9kZSgpKQotICAgICAgICByZXR1cm4g c3RkOjptYXgobGluZS5jb250ZW50TG9naWNhbFRvcCgpLCBsaW5lLmNvbnRlbnRMb2dpY2FsVG9w QWRqdXN0ZWRGb3JIaXRUZXN0aW5nKCkpOworICAgICAgICByZXR1cm4gc3RkOjptYXgobGluZS5j b250ZW50TG9naWNhbFRvcCgpLCBwcmV2aW91c0xpbmVDb250ZW50Qm90dG9tT3JCb3JkZXJBbmRQ YWRkaW5nKGxpbmUpKTsKICAgICByZXR1cm4gc3RkOjptaW4obGluZS5jb250ZW50TG9naWNhbEJv dHRvbSgpLCBsaW5lLmNvbnRlbnRMb2dpY2FsQm90dG9tQWRqdXN0ZWRGb3JGb2xsb3dpbmdMaW5l KCkpOwogfQogCkBAIC0xNTUsMTMgKzE1OSw2IEBAIGlubGluZSBmbG9hdCBMaW5lOjpjb250ZW50 TG9naWNhbFRvcEFkanVzdGVkRm9yUHJlY2VkaW5nTGluZSgpIGNvbnN0CiAgICAgfSk7CiB9CiAK LWlubGluZSBmbG9hdCBMaW5lOjpjb250ZW50TG9naWNhbFRvcEFkanVzdGVkRm9ySGl0VGVzdGlu ZygpIGNvbnN0Ci17Ci0gICAgcmV0dXJuIFdURjo6c3dpdGNoT24obV9wYXRoVmFyaWFudCwgW10o Y29uc3QgYXV0byYgcGF0aCkgewotICAgICAgICByZXR1cm4gcGF0aC5jb250ZW50TG9naWNhbFRv cEFkanVzdGVkRm9ySGl0VGVzdGluZygpOwotICAgIH0pOwotfQotCiBpbmxpbmUgZmxvYXQgTGlu ZTo6Y29udGVudExvZ2ljYWxCb3R0b21BZGp1c3RlZEZvckZvbGxvd2luZ0xpbmUoKSBjb25zdAog ewogICAgIHJldHVybiBXVEY6OnN3aXRjaE9uKG1fcGF0aFZhcmlhbnQsIFtdKGNvbnN0IGF1dG8m IHBhdGgpIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9J bmxpbmVJdGVyYXRvckxpbmVMZWdhY3lQYXRoLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50 ZWdyYXRpb24vSW5saW5lSXRlcmF0b3JMaW5lTGVnYWN5UGF0aC5oCmluZGV4IDYzNmUwNGZkODlj ZGNiNmJkODFhMTkyMzk1MzNhOTI5YmIyNTYyY2YuLjQ2MDk0MzYyMzEyNjJiMjg0ZDdkZjNhYzgw ZWY5NjI3NWI4NjY5ZmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3Jh dGlvbi9JbmxpbmVJdGVyYXRvckxpbmVMZWdhY3lQYXRoLmgKKysrIGIvU291cmNlL1dlYkNvcmUv bGF5b3V0L2ludGVncmF0aW9uL0lubGluZUl0ZXJhdG9yTGluZUxlZ2FjeVBhdGguaApAQCAtNDYs NyArNDYsNiBAQCBwdWJsaWM6CiAgICAgZmxvYXQgY29udGVudExvZ2ljYWxUb3AoKSBjb25zdCB7 IHJldHVybiBtX3Jvb3RJbmxpbmVCb3gtPmxpbmVUb3AoKS50b0Zsb2F0KCk7IH0KICAgICBmbG9h dCBjb250ZW50TG9naWNhbEJvdHRvbSgpIGNvbnN0IHsgcmV0dXJuIG1fcm9vdElubGluZUJveC0+ bGluZUJvdHRvbSgpLnRvRmxvYXQoKTsgfQogICAgIGZsb2F0IGNvbnRlbnRMb2dpY2FsVG9wQWRq dXN0ZWRGb3JQcmVjZWRpbmdMaW5lKCkgY29uc3QgeyByZXR1cm4gbV9yb290SW5saW5lQm94LT5z ZWxlY3Rpb25Ub3AoKS50b0Zsb2F0KCk7IH0KLSAgICBmbG9hdCBjb250ZW50TG9naWNhbFRvcEFk anVzdGVkRm9ySGl0VGVzdGluZygpIGNvbnN0IHsgcmV0dXJuIG1fcm9vdElubGluZUJveC0+c2Vs ZWN0aW9uVG9wKExlZ2FjeVJvb3RJbmxpbmVCb3g6OkZvckhpdFRlc3Rpbmc6OlllcykudG9GbG9h dCgpOyB9CiAgICAgZmxvYXQgY29udGVudExvZ2ljYWxCb3R0b21BZGp1c3RlZEZvckZvbGxvd2lu Z0xpbmUoKSBjb25zdCB7IHJldHVybiBtX3Jvb3RJbmxpbmVCb3gtPnNlbGVjdGlvbkJvdHRvbSgp LnRvRmxvYXQoKTsgfQogICAgIGZsb2F0IGxpbmVCb3hUb3AoKSBjb25zdCB7IHJldHVybiBtX3Jv b3RJbmxpbmVCb3gtPmxpbmVCb3hUb3AoKS50b0Zsb2F0KCk7IH0KICAgICBmbG9hdCBsaW5lQm94 Qm90dG9tKCkgY29uc3QgeyByZXR1cm4gbV9yb290SW5saW5lQm94LT5saW5lQm94Qm90dG9tKCku dG9GbG9hdCgpOyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRp b24vSW5saW5lSXRlcmF0b3JMaW5lTW9kZXJuUGF0aC5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2ludGVncmF0aW9uL0lubGluZUl0ZXJhdG9yTGluZU1vZGVyblBhdGguaAppbmRleCAzNzYxNWU1 ZjFlMjVmNTMwYjEyZmU4OGZhNjhhMzg2YWUyOWYxYWIwLi5hM2YxYzJjYjU2ZTk5MTg3Y2QxMDIy OTRhMmE1MDMyMDczNjE3OGYxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50 ZWdyYXRpb24vSW5saW5lSXRlcmF0b3JMaW5lTW9kZXJuUGF0aC5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL2xheW91dC9pbnRlZ3JhdGlvbi9JbmxpbmVJdGVyYXRvckxpbmVNb2Rlcm5QYXRoLmgKQEAg LTU1LDEwICs1NSw2IEBAIHB1YmxpYzoKICAgICBmbG9hdCBsaW5lQm94Qm90dG9tKCkgY29uc3Qg eyByZXR1cm4gbGluZSgpLmxpbmVCb3hCb3R0b20oKTsgfQogCiAgICAgZmxvYXQgY29udGVudExv Z2ljYWxUb3BBZGp1c3RlZEZvclByZWNlZGluZ0xpbmUoKSBjb25zdCB7IHJldHVybiAhbV9saW5l SW5kZXggPyBjb250ZW50TG9naWNhbFRvcCgpIDogTGluZUl0ZXJhdG9yTW9kZXJuUGF0aCgqbV9p bmxpbmVDb250ZW50LCBtX2xpbmVJbmRleCAtIDEpLmNvbnRlbnRMb2dpY2FsQm90dG9tQWRqdXN0 ZWRGb3JGb2xsb3dpbmdMaW5lKCk7IH0KLSAgICAvLyBGSVhNRTogUmVtb3ZlIHRoZSBjb250YWlu aW5nQmxvY2soKS5ib3JkZXJBbmRQYWRkaW5nQmVmb3JlKCkgb2Zmc2V0IGFmdGVyIHJldGlyaW5n IGxlZ2FjeSBsaW5lIGxheW91dC4gSXQgYWxzbyByZXF1aXJlcyBjaGFuZ2VzIGluIFJlbmRlclRl eHQ6OnBvc2l0aW9uRm9yUG9pbnQgdG8gZmluZCB0aGUgZmlyc3QgbGluZSB3aXRoIG9mZnNldC4K LSAgICAvLyAtIHRoZSAiYmVmb3JlIiB2YWx1ZSBpcyBhbHJlYWR5IGZhY3RvcmVkIGluIHRvIHRo ZSBsaW5lIG9mZnNldAotICAgIC8vIC0gdGhpcyBsb2dpYyBuZWdhdGVzIHRoZSBmaXJzdCBsaW5l J3MgbmF0dXJhbCBvZmZzZXQgKGUuZy4gYmxvY2sgaGFzIG5vIGJvcmRlci9wYWRkaW5nIGJ1dCB0 aGUgZmlyc3QgbGluZSBoYXMgYSBjb21wdXRlZCBvZmZzZXQpLgotICAgIGZsb2F0IGNvbnRlbnRM b2dpY2FsVG9wQWRqdXN0ZWRGb3JIaXRUZXN0aW5nKCkgY29uc3QgeyByZXR1cm4gIW1fbGluZUlu ZGV4ID8gY29udGFpbmluZ0Jsb2NrKCkuYm9yZGVyQW5kUGFkZGluZ0JlZm9yZSgpLnRvRmxvYXQo KSA6IGNvbnRlbnRMb2dpY2FsVG9wQWRqdXN0ZWRGb3JQcmVjZWRpbmdMaW5lKCk7IH07CiAgICAg Ly8gRklYTUU6IEltcGxlbWVudC4KICAgICBmbG9hdCBjb250ZW50TG9naWNhbEJvdHRvbUFkanVz dGVkRm9yRm9sbG93aW5nTGluZSgpIGNvbnN0IHsgcmV0dXJuIGNvbnRlbnRMb2dpY2FsQm90dG9t KCk7IH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0xlZ2FjeVJvb3RJ bmxpbmVCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0xlZ2FjeVJvb3RJbmxpbmVC b3guY3BwCmluZGV4IGM2NjZmMDhiYjlmMTk2YTdmZTE1NDBmNmMxM2QzZDg5OWFkYmYyMmMuLjVl YjI5YTI4NTIwYzUxYTViNjA0YzUzZjZkMjhhMGM4NmJhODgwYzIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9MZWdhY3lSb290SW5saW5lQm94LmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvTGVnYWN5Um9vdElubGluZUJveC5jcHAKQEAgLTQ2OSw3ICs0Njks NyBAQCBjb25zdCBMZWdhY3lJbmxpbmVCb3gqIExlZ2FjeVJvb3RJbmxpbmVCb3g6Omxhc3RTZWxl Y3RlZEJveCgpIGNvbnN0CiAgICAgcmV0dXJuIG51bGxwdHI7CiB9CiAKLUxheW91dFVuaXQgTGVn YWN5Um9vdElubGluZUJveDo6c2VsZWN0aW9uVG9wKEZvckhpdFRlc3RpbmcgZm9ySGl0VGVzdGlu ZykgY29uc3QKK0xheW91dFVuaXQgTGVnYWN5Um9vdElubGluZUJveDo6c2VsZWN0aW9uVG9wKCkg Y29uc3QKIHsKICAgICBMYXlvdXRVbml0IHNlbGVjdGlvblRvcCA9IG1fbGluZVRvcDsKICAgICAK QEAgLTUxNCw3ICs1MTQsNyBAQCBMYXlvdXRVbml0IExlZ2FjeVJvb3RJbmxpbmVCb3g6OnNlbGVj dGlvblRvcChGb3JIaXRUZXN0aW5nIGZvckhpdFRlc3RpbmcpIGNvbnN0CiAgICAgaWYgKGF1dG8q IHByZXZpb3VzQm94ID0gcHJldlJvb3RCb3goKSkKICAgICAgICAgcHJldkJvdHRvbSA9IHByZXZp b3VzQm94LT5zZWxlY3Rpb25Cb3R0b20oKTsKICAgICBlbHNlCi0gICAgICAgIHByZXZCb3R0b20g PSBmb3JIaXRUZXN0aW5nID09IEZvckhpdFRlc3Rpbmc6OlllcyA/IGJsb2NrRmxvdygpLmJvcmRl ckFuZFBhZGRpbmdCZWZvcmUoKSA6IHNlbGVjdGlvblRvcDsKKyAgICAgICAgcHJldkJvdHRvbSA9 IHNlbGVjdGlvblRvcDsKIAogICAgIGlmIChwcmV2Qm90dG9tIDwgc2VsZWN0aW9uVG9wICYmIGJs b2NrRmxvdygpLmNvbnRhaW5zRmxvYXRzKCkpIHsKICAgICAgICAgLy8gVGhpcyBsaW5lIGhhcyBh Y3R1YWxseSBiZWVuIG1vdmVkIGZ1cnRoZXIgZG93biwgcHJvYmFibHkgZnJvbSBhIGxhcmdlIGxp bmUtaGVpZ2h0LCBidXQgcG9zc2libHkgYmVjYXVzZSB0aGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9MZWdhY3lSb290SW5saW5lQm94LmggYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvTGVnYWN5Um9vdElubGluZUJveC5oCmluZGV4IGVjZWUyNjRkYjVjMzI5ZjU0ZmRk MDhlZjE5YWFjMDZlMDgwNDM2ZTUuLjNhYTc2YTg5Y2FlMzE1ZTA4YWI5ODhmYzUwOTUzZDkwYzUw ZjQzMDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9MZWdhY3lSb290SW5s aW5lQm94LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0xlZ2FjeVJvb3RJbmxpbmVC b3guaApAQCAtNzMsOCArNzMsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXRDb250YWluaW5nRnJh Z21lbnQoUmVuZGVyRnJhZ21lbnRDb250YWluZXImKTsKICAgICB2b2lkIGNsZWFyQ29udGFpbmlu Z0ZyYWdtZW50KCk7CiAKLSAgICBlbnVtIGNsYXNzIEZvckhpdFRlc3RpbmcgOiBib29sIHsgTm8s IFllcyB9OwotICAgIExheW91dFVuaXQgc2VsZWN0aW9uVG9wKEZvckhpdFRlc3RpbmcgPSBGb3JI aXRUZXN0aW5nOjpObykgY29uc3Q7CisgICAgTGF5b3V0VW5pdCBzZWxlY3Rpb25Ub3AoKSBjb25z dDsKICAgICBMYXlvdXRVbml0IHNlbGVjdGlvbkJvdHRvbSgpIGNvbnN0OwogICAgIExheW91dFVu aXQgc2VsZWN0aW9uSGVpZ2h0KCkgY29uc3QgeyByZXR1cm4gc3RkOjptYXg8TGF5b3V0VW5pdD4o MCwgc2VsZWN0aW9uQm90dG9tKCkgLSBzZWxlY3Rpb25Ub3AoKSk7IH0KIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNwcAppbmRleCAwMzI1OWVmMzVmMjcwYmM5 ZDRhYzU2NTZkYmVkMWU5ODEyY2RiZDE3Li4xM2Y0ZjA3ZGRiOGNjNjZkZTg1MWM4NGZmNmJiYWZl Y2MwOTVlMzMzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxv Y2tGbG93LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93 LmNwcApAQCAtMzQyMSw3ICszNDIxLDcgQEAgVmlzaWJsZVBvc2l0aW9uIFJlbmRlckJsb2NrRmxv dzo6cG9zaXRpb25Gb3JQb2ludFdpdGhJbmxpbmVDaGlsZHJlbihjb25zdCBMYXlvdXQKIAogICAg IGlmIChjbG9zZXN0Qm94KSB7CiAgICAgICAgIGlmIChtb3ZlQ2FyZXRUb0JvdW5kYXJ5KSB7Ci0g ICAgICAgICAgICBhdXRvIGZpcnN0TGluZVdpdGhDaGlsZHJlblRvcCA9IExheW91dFVuaXQgeyBz dGQ6Om1pbihmaXJzdExpbmVXaXRoQ2hpbGRyZW4tPmNvbnRlbnRMb2dpY2FsVG9wQWRqdXN0ZWRG b3JIaXRUZXN0aW5nKCksIGZpcnN0TGluZVdpdGhDaGlsZHJlbi0+Y29udGVudExvZ2ljYWxUb3Ao KSkgfTsKKyAgICAgICAgICAgIGF1dG8gZmlyc3RMaW5lV2l0aENoaWxkcmVuVG9wID0gTGF5b3V0 VW5pdCB7IHN0ZDo6bWluKHByZXZpb3VzTGluZUNvbnRlbnRCb3R0b21PckJvcmRlckFuZFBhZGRp bmcoKmZpcnN0TGluZVdpdGhDaGlsZHJlbiksIGZpcnN0TGluZVdpdGhDaGlsZHJlbi0+Y29udGVu dExvZ2ljYWxUb3AoKSkgfTsKICAgICAgICAgICAgIGlmIChwb2ludEluTG9naWNhbENvbnRlbnRz LnkoKSA8IGZpcnN0TGluZVdpdGhDaGlsZHJlblRvcAogICAgICAgICAgICAgICAgIHx8IChibG9j a3NBcmVGbGlwcGVkICYmIHBvaW50SW5Mb2dpY2FsQ29udGVudHMueSgpID09IGZpcnN0TGluZVdp dGhDaGlsZHJlblRvcCkpIHsKICAgICAgICAgICAgICAgICBhdXRvIGJveCA9IGZpcnN0TGluZVdp dGhDaGlsZHJlbi0+Zmlyc3RMZWFmQm94KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyUmVwbGFjZWQuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlclJlcGxhY2VkLmNwcAppbmRleCA0OTYyMTRiNmY3NWMyM2FmNTc2NzI0ZTQ4NWJlMTZhODhj ZGQ5ZGE4Li5mOWJiZGJlOTkwOGNhOTJjMDhjNzVjZDNhZjU4ZTMwMmJiYjk2NDE3IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyUmVwbGFjZWQuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJSZXBsYWNlZC5jcHAKQEAgLTcyMiw3ICs3MjIs OCBAQCBWaXNpYmxlUG9zaXRpb24gUmVuZGVyUmVwbGFjZWQ6OnBvc2l0aW9uRm9yUG9pbnQoY29u c3QgTGF5b3V0UG9pbnQmIHBvaW50LCBjb25zdAogICAgIGF1dG8gW3RvcCwgYm90dG9tXSA9IFsm XSgpIC0+IHN0ZDo6cGFpcjxmbG9hdCwgZmxvYXQ+IHsKICAgICAgICAgaWYgKGF1dG8gcnVuID0g SW5saW5lSXRlcmF0b3I6OmJveEZvcigqdGhpcykpIHsKICAgICAgICAgICAgIGF1dG8gbGluZSA9 IHJ1bi0+bGluZSgpOwotICAgICAgICAgICAgcmV0dXJuIHN0ZDo6bWFrZV9wYWlyKGxpbmUtPmNv bnRlbnRMb2dpY2FsVG9wQWRqdXN0ZWRGb3JIaXRUZXN0aW5nKCksIExpbmVTZWxlY3Rpb246Omxv Z2ljYWxCb3R0b20oKmxpbmUpKTsKKyAgICAgICAgICAgIGF1dG8gbGluZUNvbnRlbnRUb3AgPSBM YXlvdXRVbml0IHsgc3RkOjptaW4ocHJldmlvdXNMaW5lQ29udGVudEJvdHRvbU9yQm9yZGVyQW5k UGFkZGluZygqbGluZSksIGxpbmUtPmNvbnRlbnRMb2dpY2FsVG9wKCkpIH07CisgICAgICAgICAg ICByZXR1cm4gc3RkOjptYWtlX3BhaXIobGluZUNvbnRlbnRUb3AsIExpbmVTZWxlY3Rpb246Omxv Z2ljYWxCb3R0b20oKmxpbmUpKTsKICAgICAgICAgfQogICAgICAgICByZXR1cm4gc3RkOjptYWtl X3BhaXIobG9naWNhbFRvcCgpLCBsb2dpY2FsQm90dG9tKCkpOwogICAgIH0oKTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0LmNwcCBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0LmNwcAppbmRleCBlOWNhMTdiNTY4ZTc1ZGU0MDU5N2Rk OTljYTIxZmU0YTQyNjlkZWE0Li44ZGJhZGMwZTNmZDhlZTg3NGNlMDllNWM5Y2MxMjg0MjY5MjFh NzY4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dC5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHQuY3BwCkBAIC02NzQsNyAr Njc0LDcgQEAgVmlzaWJsZVBvc2l0aW9uIFJlbmRlclRleHQ6OnBvc2l0aW9uRm9yUG9pbnQoY29u c3QgTGF5b3V0UG9pbnQmIHBvaW50LCBjb25zdCBSZW4KICAgICAgICAgICAgIHJ1bi50cmF2ZXJz ZU5leHRUZXh0Qm94KCk7CiAKICAgICAgICAgYXV0byBsaW5lID0gcnVuLT5saW5lKCk7Ci0gICAg ICAgIGF1dG8gdG9wID0gc3RkOjptaW4obGluZS0+Y29udGVudExvZ2ljYWxUb3BBZGp1c3RlZEZv ckhpdFRlc3RpbmcoKSwgbGluZS0+Y29udGVudExvZ2ljYWxUb3AoKSk7CisgICAgICAgIGF1dG8g dG9wID0gTGF5b3V0VW5pdCB7IHN0ZDo6bWluKHByZXZpb3VzTGluZUNvbnRlbnRCb3R0b21PckJv cmRlckFuZFBhZGRpbmcoKmxpbmUpLCBsaW5lLT5jb250ZW50TG9naWNhbFRvcCgpKSB9OwogICAg ICAgICBpZiAocG9pbnRCbG9ja0RpcmVjdGlvbiA+IHRvcCB8fCAoIWJsb2Nrc0FyZUZsaXBwZWQg JiYgcG9pbnRCbG9ja0RpcmVjdGlvbiA9PSB0b3ApKSB7CiAgICAgICAgICAgICBhdXRvIGJvdHRv bSA9IExpbmVTZWxlY3Rpb246OmxvZ2ljYWxCb3R0b20oKmxpbmUpOwogICAgICAgICAgICAgaWYg KGF1dG8gbmV4dExpbmUgPSBsaW5lLT5uZXh0KCkpCg==