238094 2022-03-18 14:05:18 -0700 [IFC][Integration] Use a more descriptive name for InlineIterator::Line::enclosing* functions 2022-03-19 13:07:16 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1852824 0 zalan 2022-03-18 14:05:18 -0700 it's contentLogical* 1852936 1 455161 zalan 2022-03-18 19:44:59 -0700 Created attachment 455161 [fast-cq]Patch 1852983 2 ews-feeder 2022-03-19 13:06:35 -0700 Committed r291531 (248637@main): <https://commits.webkit.org/248637@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 455161. 1852984 3 webkit-bug-importer 2022-03-19 13:07:16 -0700 <rdar://problem/90527801> 455161 2022-03-18 19:44:59 -0700 2022-03-19 13:06:36 -0700 [fast-cq]Patch bug-238094-20220318194458.patch text/plain 14972 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjkxMzI0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjRkNjhjYTdhMmY2MzY3 NDA0NTIzMmRlNjA2Y2YzYzg5OTMyMDU3Yi4uMTUwMzYyNWExOGQ3M2YyMzBlZGU2MTc4YWUyNDI5 ZWQ3YmQxOGY2MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ3IEBACisyMDIyLTAzLTE4ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbSUZDXVtJbnRlZ3JhdGlvbl0g VXNlIGEgbW9yZSBkZXNjcmlwdGl2ZSBuYW1lIGZvciBJbmxpbmVJdGVyYXRvcjo6TGluZTo6ZW5j bG9zaW5nKiBmdW5jdGlvbnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIzODA5NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIEVubGNvc2luZyBlc3NlbnRpYWxseSBtZWFucyBjb250ZW50IGxvZ2ljYWwgdG9w L2JvdHRvbSBoZXJlLgorCisgICAgICAgICogbGF5b3V0L2ludGVncmF0aW9uL0lubGluZUl0ZXJh dG9yTGluZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbmxpbmVJdGVyYXRvcjo6TGluZTo6Ymxv Y2tEaXJlY3Rpb25Qb2ludEluTGluZSBjb25zdCk6CisgICAgICAgICogbGF5b3V0L2ludGVncmF0 aW9uL0lubGluZUl0ZXJhdG9yTGluZS5oOgorICAgICAgICAoV2ViQ29yZTo6SW5saW5lSXRlcmF0 b3I6OkxpbmU6OmNvbnRlbnRMb2dpY2FsVG9wQWRqdXN0ZWRGb3JQcmVjZWRpbmdMaW5lIGNvbnN0 KToKKyAgICAgICAgKFdlYkNvcmU6OklubGluZUl0ZXJhdG9yOjpMaW5lOjpjb250ZW50TG9naWNh bFRvcEZvckhpdFRlc3RpbmcgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6SW5saW5lSXRlcmF0 b3I6OkxpbmU6OmNvbnRlbnRMb2dpY2FsQm90dG9tQWRqdXN0ZWRGb3JGb2xsb3dpbmdMaW5lIGNv bnN0KToKKyAgICAgICAgKFdlYkNvcmU6OklubGluZUl0ZXJhdG9yOjpMaW5lOjplbmNsb3NpbmdU b3BBZGp1c3RlZEZvclByZWNlZGluZ0xpbmUgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAoV2Vi Q29yZTo6SW5saW5lSXRlcmF0b3I6OkxpbmU6OmVuY2xvc2luZ1RvcEZvckhpdFRlc3RpbmcgY29u c3QpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6SW5saW5lSXRlcmF0b3I6OkxpbmU6OmVu Y2xvc2luZ0JvdHRvbUFkanVzdGVkRm9yRm9sbG93aW5nTGluZSBjb25zdCk6IERlbGV0ZWQuCisg ICAgICAgICogbGF5b3V0L2ludGVncmF0aW9uL0lubGluZUl0ZXJhdG9yTGluZUxlZ2FjeVBhdGgu aDoKKyAgICAgICAgKFdlYkNvcmU6OklubGluZUl0ZXJhdG9yOjpMaW5lSXRlcmF0b3JMZWdhY3lQ YXRoOjpjb250ZW50TG9naWNhbFRvcEFkanVzdGVkRm9yUHJlY2VkaW5nTGluZSBjb25zdCk6Cisg ICAgICAgIChXZWJDb3JlOjpJbmxpbmVJdGVyYXRvcjo6TGluZUl0ZXJhdG9yTGVnYWN5UGF0aDo6 Y29udGVudExvZ2ljYWxUb3BGb3JIaXRUZXN0aW5nIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6 OklubGluZUl0ZXJhdG9yOjpMaW5lSXRlcmF0b3JMZWdhY3lQYXRoOjpjb250ZW50TG9naWNhbEJv dHRvbUFkanVzdGVkRm9yRm9sbG93aW5nTGluZSBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpJ bmxpbmVJdGVyYXRvcjo6TGluZUl0ZXJhdG9yTGVnYWN5UGF0aDo6ZW5jbG9zaW5nVG9wQWRqdXN0 ZWRGb3JQcmVjZWRpbmdMaW5lIGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6Oklu bGluZUl0ZXJhdG9yOjpMaW5lSXRlcmF0b3JMZWdhY3lQYXRoOjplbmNsb3NpbmdUb3BGb3JIaXRU ZXN0aW5nIGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OklubGluZUl0ZXJhdG9y OjpMaW5lSXRlcmF0b3JMZWdhY3lQYXRoOjplbmNsb3NpbmdCb3R0b21BZGp1c3RlZEZvckZvbGxv d2luZ0xpbmUgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAqIGxheW91dC9pbnRlZ3JhdGlvbi9J bmxpbmVJdGVyYXRvckxpbmVNb2Rlcm5QYXRoLmg6CisgICAgICAgIChXZWJDb3JlOjpJbmxpbmVJ dGVyYXRvcjo6TGluZUl0ZXJhdG9yTW9kZXJuUGF0aDo6Y29udGVudExvZ2ljYWxUb3BBZGp1c3Rl ZEZvclByZWNlZGluZ0xpbmUgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6SW5saW5lSXRlcmF0 b3I6OkxpbmVJdGVyYXRvck1vZGVyblBhdGg6OmNvbnRlbnRMb2dpY2FsVG9wRm9ySGl0VGVzdGlu ZyBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpJbmxpbmVJdGVyYXRvcjo6TGluZUl0ZXJhdG9y TW9kZXJuUGF0aDo6Y29udGVudExvZ2ljYWxCb3R0b21BZGp1c3RlZEZvckZvbGxvd2luZ0xpbmUg Y29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6SW5saW5lSXRlcmF0b3I6OkxpbmVJdGVyYXRvck1v ZGVyblBhdGg6OmVuY2xvc2luZ1RvcEFkanVzdGVkRm9yUHJlY2VkaW5nTGluZSBjb25zdCk6IERl bGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpJbmxpbmVJdGVyYXRvcjo6TGluZUl0ZXJhdG9yTW9k ZXJuUGF0aDo6ZW5jbG9zaW5nVG9wRm9ySGl0VGVzdGluZyBjb25zdCk6IERlbGV0ZWQuCisgICAg ICAgIChXZWJDb3JlOjpJbmxpbmVJdGVyYXRvcjo6TGluZUl0ZXJhdG9yTW9kZXJuUGF0aDo6ZW5j bG9zaW5nQm90dG9tQWRqdXN0ZWRGb3JGb2xsb3dpbmdMaW5lIGNvbnN0KTogRGVsZXRlZC4KKyAg ICAgICAgKiBsYXlvdXQvaW50ZWdyYXRpb24vTGluZVNlbGVjdGlvbi5oOgorICAgICAgICAoV2Vi Q29yZTo6TGluZVNlbGVjdGlvbjo6bG9naWNhbFRvcCk6CisgICAgICAgIChXZWJDb3JlOjpMaW5l U2VsZWN0aW9uOjpsb2dpY2FsQm90dG9tKToKKyAgICAgICAgKFdlYkNvcmU6OkxpbmVTZWxlY3Rp b246OmxvZ2ljYWxSZWN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxpbmVTZWxlY3Rpb246OmxvZ2lj YWxUb3BBZGp1c3RlZEZvclByZWNlZGluZ0Jsb2NrKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVu ZGVyQmxvY2tGbG93LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrRmxvdzo6cG9z aXRpb25Gb3JQb2ludFdpdGhJbmxpbmVDaGlsZHJlbik6CisgICAgICAgICogcmVuZGVyaW5nL1Jl bmRlclJlcGxhY2VkLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclJlcGxhY2VkOjpwb3Np dGlvbkZvclBvaW50KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVGV4dC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpSZW5kZXJUZXh0Ojpwb3NpdGlvbkZvclBvaW50KToKKwogMjAyMi0wMy0x OCAgQWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0lGQ11bSW50ZWdy YXRpb25dIFJlbmFtZSBJbmxpbmVJdGVyYXRvcjo6TGluZTp0b3AvYm90dG9tIHRvIGNvbnRlbnRM b2dpY2FsVG9wL2NvbnRlbnRMb2dpY2FsQm90dG9tCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvaW50ZWdyYXRpb24vSW5saW5lSXRlcmF0b3JMaW5lLmNwcCBiL1NvdXJjZS9XZWJD b3JlL2xheW91dC9pbnRlZ3JhdGlvbi9JbmxpbmVJdGVyYXRvckxpbmUuY3BwCmluZGV4IGQyYTU0 Y2FjMDA4MGY3YTA5YzRmNTY4MGFlZWU2MWY4NGI3ZjY4ZGEuLmUxNmMwNmVlMzU2YzViNzZlNjIx OTY4NDUzNzk5NzI5ZDlmNGZlYTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9p bnRlZ3JhdGlvbi9JbmxpbmVJdGVyYXRvckxpbmUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9pbnRlZ3JhdGlvbi9JbmxpbmVJdGVyYXRvckxpbmUuY3BwCkBAIC0xNTksNyArMTU5LDcg QEAgTGVhZkJveEl0ZXJhdG9yIExpbmU6OmNsb3Nlc3RCb3hGb3JMb2dpY2FsTGVmdFBvc2l0aW9u KGludCBsZWZ0UG9zaXRpb24sIGJvb2wgZWQKIAogaW50IExpbmU6OmJsb2NrRGlyZWN0aW9uUG9p bnRJbkxpbmUoKSBjb25zdAogewotICAgIHJldHVybiAhY29udGFpbmluZ0Jsb2NrKCkuc3R5bGUo KS5pc0ZsaXBwZWRCbG9ja3NXcml0aW5nTW9kZSgpID8gc3RkOjptYXgoY29udGVudExvZ2ljYWxU b3AoKSwgZW5jbG9zaW5nVG9wRm9ySGl0VGVzdGluZygpKSA6IHN0ZDo6bWluKGNvbnRlbnRMb2dp Y2FsQm90dG9tKCksIGVuY2xvc2luZ0JvdHRvbUFkanVzdGVkRm9yRm9sbG93aW5nTGluZSgpKTsK KyAgICByZXR1cm4gIWNvbnRhaW5pbmdCbG9jaygpLnN0eWxlKCkuaXNGbGlwcGVkQmxvY2tzV3Jp dGluZ01vZGUoKSA/IHN0ZDo6bWF4KGNvbnRlbnRMb2dpY2FsVG9wKCksIGNvbnRlbnRMb2dpY2Fs VG9wRm9ySGl0VGVzdGluZygpKSA6IHN0ZDo6bWluKGNvbnRlbnRMb2dpY2FsQm90dG9tKCksIGNv bnRlbnRMb2dpY2FsQm90dG9tQWRqdXN0ZWRGb3JGb2xsb3dpbmdMaW5lKCkpOwogfQogCiB9CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vSW5saW5lSXRlcmF0 b3JMaW5lLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vSW5saW5lSXRlcmF0 b3JMaW5lLmgKaW5kZXggOGRjMWFjZDkxMzVhMDRiMjU0ZmFmYzdiZDYyNGJkNzAxM2E4MjE4My4u ZWMxMmI4MmRjOTU2ZGU2NDY0ZjU2MGFjMDE3OGVmNTg4ZDM1MWJkNCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0lubGluZUl0ZXJhdG9yTGluZS5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9JbmxpbmVJdGVyYXRvckxpbmUuaApA QCAtNjUsNyArNjUsNyBAQCBwdWJsaWM6CiAgICAgZmxvYXQgY29udGVudExvZ2ljYWxSaWdodCgp IGNvbnN0OwogICAgIGZsb2F0IGNvbnRlbnRMb2dpY2FsV2lkdGgoKSBjb25zdDsKIAotICAgIExh eW91dFVuaXQgZW5jbG9zaW5nVG9wRm9ySGl0VGVzdGluZygpIGNvbnN0OworICAgIExheW91dFVu aXQgY29udGVudExvZ2ljYWxUb3BGb3JIaXRUZXN0aW5nKCkgY29uc3Q7CiAKICAgICBpbnQgYmxv Y2tEaXJlY3Rpb25Qb2ludEluTGluZSgpIGNvbnN0OwogCkBAIC05NSw4ICs5NSw4IEBAIHByaXZh dGU6CiAgICAgLy8gRklYTUU6IFRoaXMgaXMgdGVtcG9yYXJ5LgogICAgIGZyaWVuZCBjbGFzcyBX ZWJDb3JlOjpMaW5lU2VsZWN0aW9uOwogCi0gICAgTGF5b3V0VW5pdCBlbmNsb3NpbmdUb3BBZGp1 c3RlZEZvclByZWNlZGluZ0xpbmUoKSBjb25zdDsKLSAgICBMYXlvdXRVbml0IGVuY2xvc2luZ0Jv dHRvbUFkanVzdGVkRm9yRm9sbG93aW5nTGluZSgpIGNvbnN0OworICAgIExheW91dFVuaXQgY29u dGVudExvZ2ljYWxUb3BBZGp1c3RlZEZvclByZWNlZGluZ0xpbmUoKSBjb25zdDsKKyAgICBMYXlv dXRVbml0IGNvbnRlbnRMb2dpY2FsQm90dG9tQWRqdXN0ZWRGb3JGb2xsb3dpbmdMaW5lKCkgY29u c3Q7CiAKICAgICBQYXRoVmFyaWFudCBtX3BhdGhWYXJpYW50OwogfTsKQEAgLTE1MywyNCArMTUz LDI0IEBAIGlubGluZSBMYXlvdXRVbml0IExpbmU6OmNvbnRlbnRMb2dpY2FsQm90dG9tKCkgY29u c3QKICAgICB9KTsKIH0KIAotaW5saW5lIExheW91dFVuaXQgTGluZTo6ZW5jbG9zaW5nVG9wQWRq dXN0ZWRGb3JQcmVjZWRpbmdMaW5lKCkgY29uc3QKK2lubGluZSBMYXlvdXRVbml0IExpbmU6OmNv bnRlbnRMb2dpY2FsVG9wQWRqdXN0ZWRGb3JQcmVjZWRpbmdMaW5lKCkgY29uc3QKIHsKICAgICBy ZXR1cm4gV1RGOjpzd2l0Y2hPbihtX3BhdGhWYXJpYW50LCBbXShjb25zdCBhdXRvJiBwYXRoKSB7 Ci0gICAgICAgIHJldHVybiBwYXRoLmVuY2xvc2luZ1RvcEFkanVzdGVkRm9yUHJlY2VkaW5nTGlu ZSgpOworICAgICAgICByZXR1cm4gcGF0aC5jb250ZW50TG9naWNhbFRvcEFkanVzdGVkRm9yUHJl Y2VkaW5nTGluZSgpOwogICAgIH0pOwogfQogCi1pbmxpbmUgTGF5b3V0VW5pdCBMaW5lOjplbmNs b3NpbmdUb3BGb3JIaXRUZXN0aW5nKCkgY29uc3QKK2lubGluZSBMYXlvdXRVbml0IExpbmU6OmNv bnRlbnRMb2dpY2FsVG9wRm9ySGl0VGVzdGluZygpIGNvbnN0CiB7CiAgICAgcmV0dXJuIFdURjo6 c3dpdGNoT24obV9wYXRoVmFyaWFudCwgW10oY29uc3QgYXV0byYgcGF0aCkgewotICAgICAgICBy ZXR1cm4gcGF0aC5lbmNsb3NpbmdUb3BGb3JIaXRUZXN0aW5nKCk7CisgICAgICAgIHJldHVybiBw YXRoLmNvbnRlbnRMb2dpY2FsVG9wRm9ySGl0VGVzdGluZygpOwogICAgIH0pOwogfQogCi1pbmxp bmUgTGF5b3V0VW5pdCBMaW5lOjplbmNsb3NpbmdCb3R0b21BZGp1c3RlZEZvckZvbGxvd2luZ0xp bmUoKSBjb25zdAoraW5saW5lIExheW91dFVuaXQgTGluZTo6Y29udGVudExvZ2ljYWxCb3R0b21B ZGp1c3RlZEZvckZvbGxvd2luZ0xpbmUoKSBjb25zdAogewogICAgIHJldHVybiBXVEY6OnN3aXRj aE9uKG1fcGF0aFZhcmlhbnQsIFtdKGNvbnN0IGF1dG8mIHBhdGgpIHsKLSAgICAgICAgcmV0dXJu IHBhdGguZW5jbG9zaW5nQm90dG9tQWRqdXN0ZWRGb3JGb2xsb3dpbmdMaW5lKCk7CisgICAgICAg IHJldHVybiBwYXRoLmNvbnRlbnRMb2dpY2FsQm90dG9tQWRqdXN0ZWRGb3JGb2xsb3dpbmdMaW5l KCk7CiAgICAgfSk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRl Z3JhdGlvbi9JbmxpbmVJdGVyYXRvckxpbmVMZWdhY3lQYXRoLmggYi9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvaW50ZWdyYXRpb24vSW5saW5lSXRlcmF0b3JMaW5lTGVnYWN5UGF0aC5oCmluZGV4IDg3 ZTE4N2FiZjRhMjE2YTk2NmI0YzJhMWI3MWY2MTRhMGE0MzlmZGIuLmIxY2M4N2ZkM2E5YzU3ZTdm ZjM1NGY1MjhmZTJhYjc3Y2FkYjFlY2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9pbnRlZ3JhdGlvbi9JbmxpbmVJdGVyYXRvckxpbmVMZWdhY3lQYXRoLmgKKysrIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0lubGluZUl0ZXJhdG9yTGluZUxlZ2FjeVBhdGgu aApAQCAtNDUsOSArNDUsOSBAQCBwdWJsaWM6CiAKICAgICBMYXlvdXRVbml0IGNvbnRlbnRMb2dp Y2FsVG9wKCkgY29uc3QgeyByZXR1cm4gbV9yb290SW5saW5lQm94LT5saW5lVG9wKCk7IH0KICAg ICBMYXlvdXRVbml0IGNvbnRlbnRMb2dpY2FsQm90dG9tKCkgY29uc3QgeyByZXR1cm4gbV9yb290 SW5saW5lQm94LT5saW5lQm90dG9tKCk7IH0KLSAgICBMYXlvdXRVbml0IGVuY2xvc2luZ1RvcEFk anVzdGVkRm9yUHJlY2VkaW5nTGluZSgpIGNvbnN0IHsgcmV0dXJuIG1fcm9vdElubGluZUJveC0+ c2VsZWN0aW9uVG9wKCk7IH0KLSAgICBMYXlvdXRVbml0IGVuY2xvc2luZ1RvcEZvckhpdFRlc3Rp bmcoKSBjb25zdCB7IHJldHVybiBtX3Jvb3RJbmxpbmVCb3gtPnNlbGVjdGlvblRvcChMZWdhY3lS b290SW5saW5lQm94OjpGb3JIaXRUZXN0aW5nOjpZZXMpOyB9Ci0gICAgTGF5b3V0VW5pdCBlbmNs b3NpbmdCb3R0b21BZGp1c3RlZEZvckZvbGxvd2luZ0xpbmUoKSBjb25zdCB7IHJldHVybiBtX3Jv b3RJbmxpbmVCb3gtPnNlbGVjdGlvbkJvdHRvbSgpOyB9CisgICAgTGF5b3V0VW5pdCBjb250ZW50 TG9naWNhbFRvcEFkanVzdGVkRm9yUHJlY2VkaW5nTGluZSgpIGNvbnN0IHsgcmV0dXJuIG1fcm9v dElubGluZUJveC0+c2VsZWN0aW9uVG9wKCk7IH0KKyAgICBMYXlvdXRVbml0IGNvbnRlbnRMb2dp Y2FsVG9wRm9ySGl0VGVzdGluZygpIGNvbnN0IHsgcmV0dXJuIG1fcm9vdElubGluZUJveC0+c2Vs ZWN0aW9uVG9wKExlZ2FjeVJvb3RJbmxpbmVCb3g6OkZvckhpdFRlc3Rpbmc6Olllcyk7IH0KKyAg ICBMYXlvdXRVbml0IGNvbnRlbnRMb2dpY2FsQm90dG9tQWRqdXN0ZWRGb3JGb2xsb3dpbmdMaW5l KCkgY29uc3QgeyByZXR1cm4gbV9yb290SW5saW5lQm94LT5zZWxlY3Rpb25Cb3R0b20oKTsgfQog ICAgIExheW91dFVuaXQgbGluZUJveFRvcCgpIGNvbnN0IHsgcmV0dXJuIG1fcm9vdElubGluZUJv eC0+bGluZUJveFRvcCgpOyB9CiAgICAgTGF5b3V0VW5pdCBsaW5lQm94Qm90dG9tKCkgY29uc3Qg eyByZXR1cm4gbV9yb290SW5saW5lQm94LT5saW5lQm94Qm90dG9tKCk7IH0KIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0lubGluZUl0ZXJhdG9yTGluZU1v ZGVyblBhdGguaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9JbmxpbmVJdGVy YXRvckxpbmVNb2Rlcm5QYXRoLmgKaW5kZXggZTU1MTczMTllZDliNWNjYTRlZTYxYjA1NDI5MDZh YzUwZWYzNjFiNC4uODA2YmJkZDM4NWFlMDBlYmNlOGNmM2NkNTYyZDM2NzRhYWZhYjIzMyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0lubGluZUl0ZXJhdG9y TGluZU1vZGVyblBhdGguaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24v SW5saW5lSXRlcmF0b3JMaW5lTW9kZXJuUGF0aC5oCkBAIC01NCwxMyArNTQsMTMgQEAgcHVibGlj OgogICAgIExheW91dFVuaXQgbGluZUJveFRvcCgpIGNvbnN0IHsgcmV0dXJuIExheW91dFVuaXQ6 OmZyb21GbG9hdFJvdW5kKGxpbmUoKS5saW5lQm94VG9wKCkpOyB9CiAgICAgTGF5b3V0VW5pdCBs aW5lQm94Qm90dG9tKCkgY29uc3QgeyByZXR1cm4gTGF5b3V0VW5pdDo6ZnJvbUZsb2F0Um91bmQo bGluZSgpLmxpbmVCb3hCb3R0b20oKSk7IH0KIAotICAgIExheW91dFVuaXQgZW5jbG9zaW5nVG9w QWRqdXN0ZWRGb3JQcmVjZWRpbmdMaW5lKCkgY29uc3QgeyByZXR1cm4gIW1fbGluZUluZGV4ID8g Y29udGVudExvZ2ljYWxUb3AoKSA6IExpbmVJdGVyYXRvck1vZGVyblBhdGgoKm1faW5saW5lQ29u dGVudCwgbV9saW5lSW5kZXggLSAxKS5lbmNsb3NpbmdCb3R0b21BZGp1c3RlZEZvckZvbGxvd2lu Z0xpbmUoKTsgfQorICAgIExheW91dFVuaXQgY29udGVudExvZ2ljYWxUb3BBZGp1c3RlZEZvclBy ZWNlZGluZ0xpbmUoKSBjb25zdCB7IHJldHVybiAhbV9saW5lSW5kZXggPyBjb250ZW50TG9naWNh bFRvcCgpIDogTGluZUl0ZXJhdG9yTW9kZXJuUGF0aCgqbV9pbmxpbmVDb250ZW50LCBtX2xpbmVJ bmRleCAtIDEpLmNvbnRlbnRMb2dpY2FsQm90dG9tQWRqdXN0ZWRGb3JGb2xsb3dpbmdMaW5lKCk7 IH0KICAgICAvLyBGSVhNRTogUmVtb3ZlIHRoZSBjb250YWluaW5nQmxvY2soKS5ib3JkZXJBbmRQ YWRkaW5nQmVmb3JlKCkgb2Zmc2V0IGFmdGVyIHJldGlyaW5nIGxlZ2FjeSBsaW5lIGxheW91dC4g SXQgYWxzbyByZXF1aXJlcyBjaGFuZ2VzIGluIFJlbmRlclRleHQ6OnBvc2l0aW9uRm9yUG9pbnQg dG8gZmluZCB0aGUgZmlyc3QgbGluZSB3aXRoIG9mZnNldC4KICAgICAvLyAtIHRoZSAiYmVmb3Jl IiB2YWx1ZSBpcyBhbHJlYWR5IGZhY3RvcmVkIGluIHRvIHRoZSBsaW5lIG9mZnNldAogICAgIC8v IC0gdGhpcyBsb2dpYyBuZWdhdGVzIHRoZSBmaXJzdCBsaW5lJ3MgbmF0dXJhbCBvZmZzZXQgKGUu Zy4gYmxvY2sgaGFzIG5vIGJvcmRlci9wYWRkaW5nIGJ1dCB0aGUgZmlyc3QgbGluZSBoYXMgYSBj b21wdXRlZCBvZmZzZXQpLgotICAgIExheW91dFVuaXQgZW5jbG9zaW5nVG9wRm9ySGl0VGVzdGlu ZygpIGNvbnN0IHsgcmV0dXJuICFtX2xpbmVJbmRleCA/IGNvbnRhaW5pbmdCbG9jaygpLmJvcmRl ckFuZFBhZGRpbmdCZWZvcmUoKSA6IGVuY2xvc2luZ1RvcEFkanVzdGVkRm9yUHJlY2VkaW5nTGlu ZSgpOyB9OworICAgIExheW91dFVuaXQgY29udGVudExvZ2ljYWxUb3BGb3JIaXRUZXN0aW5nKCkg Y29uc3QgeyByZXR1cm4gIW1fbGluZUluZGV4ID8gY29udGFpbmluZ0Jsb2NrKCkuYm9yZGVyQW5k UGFkZGluZ0JlZm9yZSgpIDogY29udGVudExvZ2ljYWxUb3BBZGp1c3RlZEZvclByZWNlZGluZ0xp bmUoKTsgfTsKICAgICAvLyBGSVhNRTogSW1wbGVtZW50LgotICAgIExheW91dFVuaXQgZW5jbG9z aW5nQm90dG9tQWRqdXN0ZWRGb3JGb2xsb3dpbmdMaW5lKCkgY29uc3QgeyByZXR1cm4gY29udGVu dExvZ2ljYWxCb3R0b20oKTsgfQorICAgIExheW91dFVuaXQgY29udGVudExvZ2ljYWxCb3R0b21B ZGp1c3RlZEZvckZvbGxvd2luZ0xpbmUoKSBjb25zdCB7IHJldHVybiBjb250ZW50TG9naWNhbEJv dHRvbSgpOyB9CiAKICAgICBmbG9hdCBjb250ZW50TG9naWNhbExlZnQoKSBjb25zdCB7IHJldHVy biBsaW5lKCkubGluZUJveExlZnQoKSArIGxpbmUoKS5jb250ZW50TG9naWNhbE9mZnNldCgpOyB9 CiAgICAgZmxvYXQgY29udGVudExvZ2ljYWxSaWdodCgpIGNvbnN0IHsgcmV0dXJuIGNvbnRlbnRM b2dpY2FsTGVmdCgpICsgbGluZSgpLmNvbnRlbnRMb2dpY2FsV2lkdGgoKTsgfQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xpbmVTZWxlY3Rpb24uaCBiL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MaW5lU2VsZWN0aW9uLmgKaW5kZXggNGM2 OTk4N2QyYzAxOGI4NTcwNzI4MDRlZGRkOTg1ODRlOThlOGM5Mi4uZjJjODgzZTAxNzBjMWQ3MWJh Zjc1OTRiOWRjYTQ1Yzg0N2E1NTYwNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2ludGVncmF0aW9uL0xpbmVTZWxlY3Rpb24uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv aW50ZWdyYXRpb24vTGluZVNlbGVjdGlvbi5oCkBAIC0zMiwxMiArMzIsMTIgQEAgbmFtZXNwYWNl IFdlYkNvcmUgewogCiBjbGFzcyBMaW5lU2VsZWN0aW9uIHsKIHB1YmxpYzoKLSAgICBzdGF0aWMg TGF5b3V0VW5pdCBsb2dpY2FsVG9wKGNvbnN0IElubGluZUl0ZXJhdG9yOjpMaW5lJiBsaW5lKSB7 IHJldHVybiBsaW5lLmVuY2xvc2luZ1RvcEFkanVzdGVkRm9yUHJlY2VkaW5nTGluZSgpOyB9Ci0g ICAgc3RhdGljIExheW91dFVuaXQgbG9naWNhbEJvdHRvbShjb25zdCBJbmxpbmVJdGVyYXRvcjo6 TGluZSYgbGluZSkgeyByZXR1cm4gbGluZS5lbmNsb3NpbmdCb3R0b21BZGp1c3RlZEZvckZvbGxv d2luZ0xpbmUoKTsgfQorICAgIHN0YXRpYyBMYXlvdXRVbml0IGxvZ2ljYWxUb3AoY29uc3QgSW5s aW5lSXRlcmF0b3I6OkxpbmUmIGxpbmUpIHsgcmV0dXJuIGxpbmUuY29udGVudExvZ2ljYWxUb3BB ZGp1c3RlZEZvclByZWNlZGluZ0xpbmUoKTsgfQorICAgIHN0YXRpYyBMYXlvdXRVbml0IGxvZ2lj YWxCb3R0b20oY29uc3QgSW5saW5lSXRlcmF0b3I6OkxpbmUmIGxpbmUpIHsgcmV0dXJuIGxpbmUu Y29udGVudExvZ2ljYWxCb3R0b21BZGp1c3RlZEZvckZvbGxvd2luZ0xpbmUoKTsgfQogCiAgICAg c3RhdGljIExheW91dFJlY3QgbG9naWNhbFJlY3QoY29uc3QgSW5saW5lSXRlcmF0b3I6OkxpbmUm IGxpbmUpCiAgICAgewotICAgICAgICByZXR1cm4geyBMYXlvdXRQb2ludCB7IGxpbmUuY29udGVu dExvZ2ljYWxMZWZ0KCksIGxpbmUuZW5jbG9zaW5nVG9wQWRqdXN0ZWRGb3JQcmVjZWRpbmdMaW5l KCkgfSwgTGF5b3V0UG9pbnQgeyBsaW5lLmNvbnRlbnRMb2dpY2FsUmlnaHQoKSwgbGluZS5lbmNs b3NpbmdCb3R0b21BZGp1c3RlZEZvckZvbGxvd2luZ0xpbmUoKSB9IH07CisgICAgICAgIHJldHVy biB7IExheW91dFBvaW50IHsgbGluZS5jb250ZW50TG9naWNhbExlZnQoKSwgbGluZS5jb250ZW50 TG9naWNhbFRvcEFkanVzdGVkRm9yUHJlY2VkaW5nTGluZSgpIH0sIExheW91dFBvaW50IHsgbGlu ZS5jb250ZW50TG9naWNhbFJpZ2h0KCksIGxpbmUuY29udGVudExvZ2ljYWxCb3R0b21BZGp1c3Rl ZEZvckZvbGxvd2luZ0xpbmUoKSB9IH07CiAgICAgfQogCiAgICAgc3RhdGljIExheW91dFJlY3Qg cGh5c2ljYWxSZWN0KGNvbnN0IElubGluZUl0ZXJhdG9yOjpMaW5lJiBsaW5lKQpAQCAtNTIsNyAr NTIsNyBAQCBwdWJsaWM6CiAgICAgc3RhdGljIExheW91dFVuaXQgbG9naWNhbFRvcEFkanVzdGVk Rm9yUHJlY2VkaW5nQmxvY2soY29uc3QgSW5saW5lSXRlcmF0b3I6OkxpbmUmIGxpbmUpCiAgICAg ewogICAgICAgICAvLyBGSVhNRTogTW92ZSBhZGp1c3RFbmNsb3NpbmdUb3BGb3JQcmVjZWRpbmdC bG9jayBmcm9tIFJlbmRlckJsb2NrRmxvdyB0byBoZXJlLgotICAgICAgICByZXR1cm4gbGluZS5j b250YWluaW5nQmxvY2soKS5hZGp1c3RFbmNsb3NpbmdUb3BGb3JQcmVjZWRpbmdCbG9jayhsaW5l LmVuY2xvc2luZ1RvcEFkanVzdGVkRm9yUHJlY2VkaW5nTGluZSgpKTsKKyAgICAgICAgcmV0dXJu IGxpbmUuY29udGFpbmluZ0Jsb2NrKCkuYWRqdXN0RW5jbG9zaW5nVG9wRm9yUHJlY2VkaW5nQmxv Y2sobGluZS5jb250ZW50TG9naWNhbFRvcEFkanVzdGVkRm9yUHJlY2VkaW5nTGluZSgpKTsKICAg ICB9CiAKICAgICBzdGF0aWMgUmVuZGVyT2JqZWN0OjpIaWdobGlnaHRTdGF0ZSBzZWxlY3Rpb25T dGF0ZShjb25zdCBJbmxpbmVJdGVyYXRvcjo6TGluZSYgbGluZSkKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuY3BwIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHAKaW5kZXggOWRmYTlmZDc4MTI5NGM3OTE4NDlm ZmJkYzBlM2QzNjQ5YWMwMDc4ZC4uY2YwMGI4YzI5YTYwYzM0ZTdlNGY3ODg2Y2Q1ZjE5ODE3MmU0 NDJkNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxv dy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHAK QEAgLTM0MjEsNyArMzQyMSw3IEBAIFZpc2libGVQb3NpdGlvbiBSZW5kZXJCbG9ja0Zsb3c6OnBv c2l0aW9uRm9yUG9pbnRXaXRoSW5saW5lQ2hpbGRyZW4oY29uc3QgTGF5b3V0CiAKICAgICBpZiAo Y2xvc2VzdEJveCkgewogICAgICAgICBpZiAobW92ZUNhcmV0VG9Cb3VuZGFyeSkgewotICAgICAg ICAgICAgTGF5b3V0VW5pdCBmaXJzdExpbmVXaXRoQ2hpbGRyZW5Ub3AgPSBzdGQ6Om1pbihmaXJz dExpbmVXaXRoQ2hpbGRyZW4tPmVuY2xvc2luZ1RvcEZvckhpdFRlc3RpbmcoKSwgTGF5b3V0VW5p dChmaXJzdExpbmVXaXRoQ2hpbGRyZW4tPmNvbnRlbnRMb2dpY2FsVG9wKCkpKTsKKyAgICAgICAg ICAgIExheW91dFVuaXQgZmlyc3RMaW5lV2l0aENoaWxkcmVuVG9wID0gc3RkOjptaW4oZmlyc3RM aW5lV2l0aENoaWxkcmVuLT5jb250ZW50TG9naWNhbFRvcEZvckhpdFRlc3RpbmcoKSwgTGF5b3V0 VW5pdChmaXJzdExpbmVXaXRoQ2hpbGRyZW4tPmNvbnRlbnRMb2dpY2FsVG9wKCkpKTsKICAgICAg ICAgICAgIGlmIChwb2ludEluTG9naWNhbENvbnRlbnRzLnkoKSA8IGZpcnN0TGluZVdpdGhDaGls ZHJlblRvcAogICAgICAgICAgICAgICAgIHx8IChibG9ja3NBcmVGbGlwcGVkICYmIHBvaW50SW5M b2dpY2FsQ29udGVudHMueSgpID09IGZpcnN0TGluZVdpdGhDaGlsZHJlblRvcCkpIHsKICAgICAg ICAgICAgICAgICBhdXRvIGJveCA9IGZpcnN0TGluZVdpdGhDaGlsZHJlbi0+Zmlyc3RMZWFmQm94 KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyUmVwbGFjZWQu Y3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclJlcGxhY2VkLmNwcAppbmRleCBl Zjk2NjcyZjY5MDI4NjgxZWQyMmY5MjA5ZGMzZjJkMzJjN2Y4MjQ5Li5lYTg1NzRiZTU0M2RmZGJk NzZkZDQ1MjkyZGZjZTIzZDY2YWRiNTczIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyUmVwbGFjZWQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJSZXBsYWNlZC5jcHAKQEAgLTcyMiw3ICs3MjIsNyBAQCBWaXNpYmxlUG9zaXRpb24gUmVu ZGVyUmVwbGFjZWQ6OnBvc2l0aW9uRm9yUG9pbnQoY29uc3QgTGF5b3V0UG9pbnQmIHBvaW50LCBj b25zdAogICAgIGF1dG8gW3RvcCwgYm90dG9tXSA9IFsmXSB7CiAgICAgICAgIGlmIChhdXRvIHJ1 biA9IElubGluZUl0ZXJhdG9yOjpib3hGb3IoKnRoaXMpKSB7CiAgICAgICAgICAgICBhdXRvIGxp bmUgPSBydW4tPmxpbmUoKTsKLSAgICAgICAgICAgIHJldHVybiBzdGQ6Om1ha2VfcGFpcihsaW5l LT5lbmNsb3NpbmdUb3BGb3JIaXRUZXN0aW5nKCksIExpbmVTZWxlY3Rpb246OmxvZ2ljYWxCb3R0 b20oKmxpbmUpKTsKKyAgICAgICAgICAgIHJldHVybiBzdGQ6Om1ha2VfcGFpcihsaW5lLT5jb250 ZW50TG9naWNhbFRvcEZvckhpdFRlc3RpbmcoKSwgTGluZVNlbGVjdGlvbjo6bG9naWNhbEJvdHRv bSgqbGluZSkpOwogICAgICAgICB9CiAgICAgICAgIHJldHVybiBzdGQ6Om1ha2VfcGFpcihsb2dp Y2FsVG9wKCksIGxvZ2ljYWxCb3R0b20oKSk7CiAgICAgfSgpOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlclRleHQuY3BwCmluZGV4IDU5YTU2ZDM0ODM3OGM5OWUzYzkxYzU3OWRhOGU0YTRk ZDI3OTM2MjEuLjExNjNhNmY5MDQ3YWE1ZGI3NjdjZWMxYzlmOGQ5ZDMyNDU2OTYzOGYgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0LmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dC5jcHAKQEAgLTY3NCw3ICs2NzQsNyBAQCBW aXNpYmxlUG9zaXRpb24gUmVuZGVyVGV4dDo6cG9zaXRpb25Gb3JQb2ludChjb25zdCBMYXlvdXRQ b2ludCYgcG9pbnQsIGNvbnN0IFJlbgogICAgICAgICAgICAgcnVuLnRyYXZlcnNlTmV4dFRleHRC b3goKTsKIAogICAgICAgICBhdXRvIGxpbmUgPSBydW4tPmxpbmUoKTsKLSAgICAgICAgYXV0byB0 b3AgPSBzdGQ6Om1pbihsaW5lLT5lbmNsb3NpbmdUb3BGb3JIaXRUZXN0aW5nKCksIGxpbmUtPmNv bnRlbnRMb2dpY2FsVG9wKCkpOworICAgICAgICBhdXRvIHRvcCA9IHN0ZDo6bWluKGxpbmUtPmNv bnRlbnRMb2dpY2FsVG9wRm9ySGl0VGVzdGluZygpLCBsaW5lLT5jb250ZW50TG9naWNhbFRvcCgp KTsKICAgICAgICAgaWYgKHBvaW50QmxvY2tEaXJlY3Rpb24gPiB0b3AgfHwgKCFibG9ja3NBcmVG bGlwcGVkICYmIHBvaW50QmxvY2tEaXJlY3Rpb24gPT0gdG9wKSkgewogICAgICAgICAgICAgYXV0 byBib3R0b20gPSBMaW5lU2VsZWN0aW9uOjpsb2dpY2FsQm90dG9tKCpsaW5lKTsKICAgICAgICAg ICAgIGlmIChhdXRvIG5leHRMaW5lID0gbGluZS0+bmV4dCgpKQo=