237996 2022-03-16 18:41:36 -0700 [IFC][Integration] Replace enclosingTop/Bottom/height calls with Line::enclosingLogicalRect when applicable 2022-03-17 08:26:17 -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 pdr simon.fraser webkit-bug-importer zalan oldest_to_newest 1852103 0 zalan 2022-03-16 18:41:36 -0700 ssia 1852107 1 454924 zalan 2022-03-16 18:52:04 -0700 Created attachment 454924 Patch 1852121 2 454928 zalan 2022-03-16 20:23:27 -0700 Created attachment 454928 Patch 1852308 3 ews-feeder 2022-03-17 08:25:47 -0700 Committed r291409 (248539@main): <https://commits.webkit.org/248539@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 454928. 1852310 4 webkit-bug-importer 2022-03-17 08:26:17 -0700 <rdar://problem/90432299> 454924 2022-03-16 18:52:04 -0700 2022-03-16 20:23:25 -0700 Patch bug-237996-20220316185203.patch text/plain 9153 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjkxMzI0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTRiZjZkYjNjNGU5MzVm YjBlMTU0YmJhZGYyZTA0ZmE5YTc1MmMzOC4uMzY3NWM5YTE5M2Y4ZTc4MWEzMTllZjNkODc0NjMx NWM0MzVmMTMxYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIyLTAzLTE2ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbSUZDXVtJbnRlZ3JhdGlvbl0g UmVwbGFjZSBlbmNsb3NpbmdUb3AvQm90dG9tL2hlaWdodCBjYWxscyB3aXRoIExpbmU6OmVuY2xv c2luZ0xvZ2ljYWxSZWN0IHdoZW4gYXBwbGljYWJsZQorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM3OTk2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBpcyBpbiBwcmVwYXJhdGlvbiBmb3IgcmVtb3Zp bmcgc2VsZWN0aW9uL2hpdHRlc3RpbmcgcmVsYXRlZCBmdW5jdGlvbnMgZnJvbSBJbmxpbmVJdGVy YXRvcjo6TGluZS4KKworICAgICAgICAqIGxheW91dC9pbnRlZ3JhdGlvbi9JbmxpbmVJdGVyYXRv ckxpbmUuaDoKKyAgICAgICAgKFdlYkNvcmU6OklubGluZUl0ZXJhdG9yOjpMaW5lOjplbmNsb3Np bmdIZWlnaHQgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAqIGxheW91dC9pbnRlZ3JhdGlvbi9J bmxpbmVJdGVyYXRvclRleHRCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5saW5lSXRlcmF0 b3I6OlRleHRCb3g6OnNlbGVjdGlvblJlY3QgY29uc3QpOgorICAgICAgICAqIHJlbmRlcmluZy9S ZW5kZXJCbG9ja0Zsb3cuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2tGbG93Ojpp bmxpbmVTZWxlY3Rpb25HYXBzKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrRmxvdzo6 cG9zaXRpb25Gb3JQb2ludFdpdGhJbmxpbmVDaGlsZHJlbik6CisgICAgICAgICogcmVuZGVyaW5n L1JlbmRlckltYWdlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckltYWdlOjpjb2xsZWN0 U2VsZWN0aW9uR2VvbWV0cmllcyk6CisgICAgICAgICogcmVuZGVyaW5nL1RleHRCb3hQYWludGVy LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlRleHRCb3hQYWludGVyOjpwYWludEJhY2tncm91bmQp OgorCiAyMDIyLTAzLTE1ICBBbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAg ICBbSUZDXVtJbnRlZ3JhdGlvbl0gTW92ZSBmaXJzdFNlbGVjdGVkQm94L2xhc3RTZWxlY3RlZEJv eCBvdXQgb2YgSW5saW5lSXRlcmF0b3I6OkxpbmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9pbnRlZ3JhdGlvbi9JbmxpbmVJdGVyYXRvckxpbmUuaCBiL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9pbnRlZ3JhdGlvbi9JbmxpbmVJdGVyYXRvckxpbmUuaAppbmRleCAzNzlkYWZlNzVk YjMyMzMxZmNlMjMwNzIxNzM5YmUwNWRhODMyNTg2Li4xNWU4YmQwNWI0Y2QxY2RiYWQ1YjViNDM4 ZjE3YmFlN2U5N2FiNDBmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdy YXRpb24vSW5saW5lSXRlcmF0b3JMaW5lLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lu dGVncmF0aW9uL0lubGluZUl0ZXJhdG9yTGluZS5oCkBAIC02MCw3ICs2MCw2IEBAIHB1YmxpYzoK IAogICAgIExheW91dFVuaXQgZW5jbG9zaW5nVG9wKCkgY29uc3Q7CiAgICAgTGF5b3V0VW5pdCBl bmNsb3NpbmdCb3R0b20oKSBjb25zdDsKLSAgICBMYXlvdXRVbml0IGVuY2xvc2luZ0hlaWdodCgp IGNvbnN0OwogCiAgICAgTGF5b3V0UmVjdCBlbmNsb3NpbmdMb2dpY2FsUmVjdCgpIGNvbnN0Owog ICAgIExheW91dFJlY3QgZW5jbG9zaW5nUGh5c2ljYWxSZWN0KCkgY29uc3Q7CkBAIC0xNzcsMTEg KzE3Niw2IEBAIGlubGluZSBMYXlvdXRVbml0IExpbmU6OmVuY2xvc2luZ0JvdHRvbSgpIGNvbnN0 CiAgICAgfSk7CiB9CiAKLWlubGluZSBMYXlvdXRVbml0IExpbmU6OmVuY2xvc2luZ0hlaWdodCgp IGNvbnN0Ci17Ci0gICAgcmV0dXJuIGVuY2xvc2luZ0JvdHRvbSgpIC0gZW5jbG9zaW5nVG9wKCk7 Ci19Ci0KIGlubGluZSBMYXlvdXRVbml0IExpbmU6OmxpbmVCb3hUb3AoKSBjb25zdAogewogICAg IHJldHVybiBXVEY6OnN3aXRjaE9uKG1fcGF0aFZhcmlhbnQsIFtdKGNvbnN0IGF1dG8mIHBhdGgp IHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9JbmxpbmVJ dGVyYXRvclRleHRCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0lu bGluZUl0ZXJhdG9yVGV4dEJveC5jcHAKaW5kZXggNTA0NDIxYjIwYjFhOWFjZGRjMzZkY2ZiY2Jm MzAyYmE4ZmFkNWY2ZS4uMGNjOWI5MzY3OWE5YTNhMTg1Mzg5ZWU1NDg5N2ZhMzliY2Y0YjZlMyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0lubGluZUl0ZXJh dG9yVGV4dEJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0lu bGluZUl0ZXJhdG9yVGV4dEJveC5jcHAKQEAgLTQ1LDE2ICs0NSwxNCBAQCBMYXlvdXRSZWN0IFRl eHRCb3g6OnNlbGVjdGlvblJlY3QodW5zaWduZWQgcmFuZ2VTdGFydCwgdW5zaWduZWQgcmFuZ2VF bmQpIGNvbnN0CiAgICAgaWYgKGNsYW1wZWRTdGFydCA+PSBjbGFtcGVkRW5kICYmICEocmFuZ2VT dGFydCA9PSByYW5nZUVuZCAmJiByYW5nZVN0YXJ0ID49IHN0YXJ0KCkgJiYgcmFuZ2VTdGFydCA8 PSBlbmQoKSkpCiAgICAgICAgIHJldHVybiB7IH07CiAKLSAgICBhdXRvIHNlbGVjdGlvblRvcCA9 IGxpbmUoKS0+ZW5jbG9zaW5nVG9wKCk7Ci0gICAgYXV0byBzZWxlY3Rpb25IZWlnaHQgPSBsaW5l KCktPmVuY2xvc2luZ0hlaWdodCgpOwotCi0gICAgTGF5b3V0UmVjdCBzZWxlY3Rpb25SZWN0IHsg bG9naWNhbExlZnQoKSwgc2VsZWN0aW9uVG9wLCBsb2dpY2FsV2lkdGgoKSwgc2VsZWN0aW9uSGVp Z2h0IH07CisgICAgYXV0byBsaW5lU2VsZWN0aW9uUmVjdCA9IGxpbmUoKS0+ZW5jbG9zaW5nTG9n aWNhbFJlY3QoKTsKKyAgICBhdXRvIHNlbGVjdGlvblJlY3QgPSBMYXlvdXRSZWN0IHsgbG9naWNh bExlZnQoKSwgbGluZVNlbGVjdGlvblJlY3QueSgpLCBsb2dpY2FsV2lkdGgoKSwgbGluZVNlbGVj dGlvblJlY3QuaGVpZ2h0KCkgfTsKIAogICAgIFRleHRSdW4gdGV4dFJ1biA9IGNyZWF0ZVRleHRS dW4oKTsKICAgICBpZiAoY2xhbXBlZFN0YXJ0IHx8IGNsYW1wZWRFbmQgIT0gdGV4dFJ1bi5sZW5n dGgoKSkKICAgICAgICAgZm9udENhc2NhZGUoKS5hZGp1c3RTZWxlY3Rpb25SZWN0Rm9yVGV4dCh0 ZXh0UnVuLCBzZWxlY3Rpb25SZWN0LCBjbGFtcGVkU3RhcnQsIGNsYW1wZWRFbmQpOwogCi0gICAg cmV0dXJuIHNuYXBwZWRTZWxlY3Rpb25SZWN0KHNlbGVjdGlvblJlY3QsIGxvZ2ljYWxSaWdodCgp LCBzZWxlY3Rpb25Ub3AsIHNlbGVjdGlvbkhlaWdodCwgaXNIb3Jpem9udGFsKCkpOworICAgIHJl dHVybiBzbmFwcGVkU2VsZWN0aW9uUmVjdChzZWxlY3Rpb25SZWN0LCBsb2dpY2FsUmlnaHQoKSwg bGluZVNlbGVjdGlvblJlY3QueSgpLCBsaW5lU2VsZWN0aW9uUmVjdC5oZWlnaHQoKSwgaXNIb3Jp em9udGFsKCkpOwogfQogCiB1bnNpZ25lZCBUZXh0Qm94OjpvZmZzZXRGb3JQb3NpdGlvbihmbG9h dCB4LCBib29sIGluY2x1ZGVQYXJ0aWFsR2x5cGhzKSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNwcAppbmRleCAzNjFlZTBiMTQwYWY0YWJjMzY5YmUz ZDhiNDAxYzhjN2ExMTA1NWZkLi42YTljNzViMjk4ZGE2NjU2MGMyZDg4OWM5N2U4NTFjZTMyOGE0 MGU5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93 LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNwcApA QCAtMzE4Nyw5ICszMTg3LDEwIEBAIEdhcFJlY3RzIFJlbmRlckJsb2NrRmxvdzo6aW5saW5lU2Vs ZWN0aW9uR2FwcyhSZW5kZXJCbG9jayYgcm9vdEJsb2NrLCBjb25zdCBMYXlvCiAKICAgICBpZiAo bGFzdFNlbGVjdGVkTGluZSAmJiBzZWxlY3Rpb25TdGF0ZSgpICE9IEhpZ2hsaWdodFN0YXRlOjpF bmQgJiYgc2VsZWN0aW9uU3RhdGUoKSAhPSBIaWdobGlnaHRTdGF0ZTo6Qm90aCkgewogICAgICAg ICAvLyBVcGRhdGUgb3VyIGxhc3RZIHRvIGJlIHRoZSBib3R0b20gb2YgdGhlIGxhc3Qgc2VsZWN0 ZWQgbGluZS4KLSAgICAgICAgbGFzdExvZ2ljYWxUb3AgPSBibG9ja0RpcmVjdGlvbk9mZnNldChy b290QmxvY2ssIG9mZnNldEZyb21Sb290QmxvY2spICsgbGFzdFNlbGVjdGVkTGluZS0+ZW5jbG9z aW5nQm90dG9tKCk7Ci0gICAgICAgIGxhc3RMb2dpY2FsTGVmdCA9IGxvZ2ljYWxMZWZ0U2VsZWN0 aW9uT2Zmc2V0KHJvb3RCbG9jaywgbGFzdFNlbGVjdGVkTGluZS0+ZW5jbG9zaW5nQm90dG9tKCks IGNhY2hlKTsKLSAgICAgICAgbGFzdExvZ2ljYWxSaWdodCA9IGxvZ2ljYWxSaWdodFNlbGVjdGlv bk9mZnNldChyb290QmxvY2ssIGxhc3RTZWxlY3RlZExpbmUtPmVuY2xvc2luZ0JvdHRvbSgpLCBj YWNoZSk7CisgICAgICAgIGF1dG8gbGFzdExpbmVTZWxlY3Rpb25Cb3R0b20gPSBsYXN0U2VsZWN0 ZWRMaW5lLT5lbmNsb3NpbmdCb3R0b20oKTsKKyAgICAgICAgbGFzdExvZ2ljYWxUb3AgPSBibG9j a0RpcmVjdGlvbk9mZnNldChyb290QmxvY2ssIG9mZnNldEZyb21Sb290QmxvY2spICsgbGFzdExp bmVTZWxlY3Rpb25Cb3R0b207CisgICAgICAgIGxhc3RMb2dpY2FsTGVmdCA9IGxvZ2ljYWxMZWZ0 U2VsZWN0aW9uT2Zmc2V0KHJvb3RCbG9jaywgbGFzdExpbmVTZWxlY3Rpb25Cb3R0b20sIGNhY2hl KTsKKyAgICAgICAgbGFzdExvZ2ljYWxSaWdodCA9IGxvZ2ljYWxSaWdodFNlbGVjdGlvbk9mZnNl dChyb290QmxvY2ssIGxhc3RMaW5lU2VsZWN0aW9uQm90dG9tLCBjYWNoZSk7CiAgICAgfQogICAg IHJldHVybiByZXN1bHQ7CiB9CkBAIC0zMzkzLDcgKzMzOTQsOCBAQCBWaXNpYmxlUG9zaXRpb24g UmVuZGVyQmxvY2tGbG93Ojpwb3NpdGlvbkZvclBvaW50V2l0aElubGluZUNoaWxkcmVuKGNvbnN0 IExheW91dAogICAgICAgICBsYXN0TGluZVdpdGhDaGlsZHJlbiA9IGxpbmU7CiAKICAgICAgICAg Ly8gY2hlY2sgaWYgdGhpcyByb290IGxpbmUgYm94IGlzIGxvY2F0ZWQgYXQgdGhpcyB5IGNvb3Jk aW5hdGUKLSAgICAgICAgaWYgKHBvaW50SW5Mb2dpY2FsQ29udGVudHMueSgpIDwgbGluZS0+ZW5j bG9zaW5nQm90dG9tKCkgfHwgKGJsb2Nrc0FyZUZsaXBwZWQgJiYgcG9pbnRJbkxvZ2ljYWxDb250 ZW50cy55KCkgPT0gbGluZS0+ZW5jbG9zaW5nQm90dG9tKCkpKSB7CisgICAgICAgIGF1dG8gc2Vs ZWN0aW9uQm90dG9tID0gbGluZS0+ZW5jbG9zaW5nQm90dG9tKCk7CisgICAgICAgIGlmIChwb2lu dEluTG9naWNhbENvbnRlbnRzLnkoKSA8IHNlbGVjdGlvbkJvdHRvbSB8fCAoYmxvY2tzQXJlRmxp cHBlZCAmJiBwb2ludEluTG9naWNhbENvbnRlbnRzLnkoKSA9PSBzZWxlY3Rpb25Cb3R0b20pKSB7 CiAgICAgICAgICAgICBpZiAobGluZXNBcmVGbGlwcGVkKSB7CiAgICAgICAgICAgICAgICAgYXV0 byBuZXh0TGluZVdpdGhDaGlsZHJlbiA9IGxpbmUtPm5leHQoKTsKICAgICAgICAgICAgICAgICB3 aGlsZSAobmV4dExpbmVXaXRoQ2hpbGRyZW4gJiYgIW5leHRMaW5lV2l0aENoaWxkcmVuLT5maXJz dExlYWZCb3goKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJJ bWFnZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySW1hZ2UuY3BwCmluZGV4 IDAyZWEzM2Q2NjQwYmI0YmIwNTcxNzRkMThmMjM5MDhkMGY0MGViMDguLjA1M2I0NzZhYjU0MDE3 YzJiMTUwMmFiYmZhMTc0MjE5NDZkOWZmZDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJJbWFnZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckltYWdlLmNwcApAQCAtMTA5LDkgKzEwOSw5IEBAIHZvaWQgUmVuZGVySW1hZ2U6OmNvbGxl Y3RTZWxlY3Rpb25HZW9tZXRyaWVzKFZlY3RvcjxTZWxlY3Rpb25HZW9tZXRyeT4mIGdlb21ldHJp CiAgICAgICAgICAgICBsaW5lRXh0ZW50UmVjdC5zZXRIZWlnaHQoY29udGFpbmluZ0Jsb2NrLT5o ZWlnaHQoKSk7CiAgICAgICAgIH0KICAgICB9IGVsc2UgewotICAgICAgICBhdXRvIGxpbmUgPSBy dW4tPmxpbmUoKTsKLSAgICAgICAgTGF5b3V0VW5pdCBzZWxlY3Rpb25Ub3AgPSAhY29udGFpbmlu Z0Jsb2NrLT5zdHlsZSgpLmlzRmxpcHBlZEJsb2Nrc1dyaXRpbmdNb2RlKCkgPyBsaW5lLT5lbmNs b3NpbmdUb3AoKSAtIGxvZ2ljYWxUb3AoKSA6IGxvZ2ljYWxCb3R0b20oKSAtIGxpbmUtPmVuY2xv c2luZ0JvdHRvbSgpOwotICAgICAgICBpbWFnZVJlY3QgPSBJbnRSZWN0KDAsICBzZWxlY3Rpb25U b3AsIGxvZ2ljYWxXaWR0aCgpLCBsaW5lLT5lbmNsb3NpbmdIZWlnaHQoKSk7CisgICAgICAgIGF1 dG8gc2VsZWN0aW9uTG9naWNhbFJlY3QgPSBydW4tPmxpbmUoKS0+ZW5jbG9zaW5nTG9naWNhbFJl Y3QoKTsKKyAgICAgICAgYXV0byBzZWxlY3Rpb25Ub3AgPSAhY29udGFpbmluZ0Jsb2NrLT5zdHls ZSgpLmlzRmxpcHBlZEJsb2Nrc1dyaXRpbmdNb2RlKCkgPyBzZWxlY3Rpb25Mb2dpY2FsUmVjdC55 KCkgLSBsb2dpY2FsVG9wKCkgOiBsb2dpY2FsQm90dG9tKCkgLSBzZWxlY3Rpb25Mb2dpY2FsUmVj dC5tYXhZKCk7CisgICAgICAgIGltYWdlUmVjdCA9IEludFJlY3QgeyAwLCAgc2VsZWN0aW9uVG9w LCBsb2dpY2FsV2lkdGgoKSwgc2VsZWN0aW9uTG9naWNhbFJlY3QuaGVpZ2h0KCkgfTsKICAgICAg ICAgaXNGaXJzdE9uTGluZSA9ICFydW4tPnByZXZpb3VzT25MaW5lKCk7CiAgICAgICAgIGlzTGFz dE9uTGluZSA9ICFydW4tPm5leHRPbkxpbmUoKTsKICAgICAgICAgTG9naWNhbFNlbGVjdGlvbk9m ZnNldENhY2hlcyBjYWNoZSgqY29udGFpbmluZ0Jsb2NrKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9UZXh0Qm94UGFpbnRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvVGV4dEJveFBhaW50ZXIuY3BwCmluZGV4IGY4MTM1YTA1N2Q5NzQ0ODA4M2IwYTgxNTFk MzNjZjliZWQwZjFjZDMuLjFmZDNlODc0M2U2YWQ0MDY3MWRlNzU5Y2UxOGFlMDYyZjJjMzAzZDcg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9UZXh0Qm94UGFpbnRlci5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1RleHRCb3hQYWludGVyLmNwcApAQCAtMjg4 LDE3ICsyODgsMTIgQEAgdm9pZCBUZXh0Qm94UGFpbnRlcjo6cGFpbnRCYWNrZ3JvdW5kKHVuc2ln bmVkIHN0YXJ0T2Zmc2V0LCB1bnNpZ25lZCBlbmRPZmZzZXQsIGMKIAogICAgIC8vIE5vdGUgdGhh dCBpZiB0aGUgdGV4dCBpcyB0cnVuY2F0ZWQsIHdlIGxldCB0aGUgdGhpbmcgYmVpbmcgcGFpbnRl ZCBpbiB0aGUgdHJ1bmNhdGlvbgogICAgIC8vIGRyYXcgaXRzIG93biBoaWdobGlnaHQuCi0KLSAg ICBjb25zdCBhdXRvIGxpbmUgPSB0ZXh0Qm94KCkubGluZSgpOwotICAgIExheW91dFVuaXQgc2Vs ZWN0aW9uQm90dG9tID0gbGluZS0+ZW5jbG9zaW5nQm90dG9tKCk7Ci0gICAgTGF5b3V0VW5pdCBz ZWxlY3Rpb25Ub3AgPSBsaW5lLT5lbmNsb3NpbmdUb3BBZGp1c3RlZEZvclByZWNlZGluZ0Jsb2Nr KCk7Ci0KKyAgICBhdXRvIHNlbGVjdGlvbkxvZ2ljYWxSZWN0ID0gdGV4dEJveCgpLmxpbmUoKS0+ ZW5jbG9zaW5nTG9naWNhbFJlY3QoKTsKICAgICAvLyBVc2Ugc2FtZSB5IHBvc2l0aW9uaW5nIGFu ZCBoZWlnaHQgYXMgZm9yIHNlbGVjdGlvbiwgc28gdGhhdCB3aGVuIHRoZSBzZWxlY3Rpb24gYW5k IHRoaXMgc3VicmFuZ2UgYXJlIG9uCiAgICAgLy8gdGhlIHNhbWUgd29yZCB0aGVyZSBhcmUgbm8g cGllY2VzIHN0aWNraW5nIG91dC4KLSAgICBMYXlvdXRVbml0IGRlbHRhWSB7IG1fc3R5bGUuaXNG bGlwcGVkTGluZXNXcml0aW5nTW9kZSgpID8gc2VsZWN0aW9uQm90dG9tIC0gdGV4dEJveCgpLmxv Z2ljYWxCb3R0b20oKSA6IHRleHRCb3goKS5sb2dpY2FsVG9wKCkgLSBzZWxlY3Rpb25Ub3AgfTsK LSAgICBMYXlvdXRVbml0IHNlbGVjdGlvbkhlaWdodCA9IHN0ZDo6bWF4PExheW91dFVuaXQ+KDAs IHNlbGVjdGlvbkJvdHRvbSAtIHNlbGVjdGlvblRvcCk7Ci0KLSAgICBMYXlvdXRSZWN0IHNlbGVj dGlvblJlY3QgeyBMYXlvdXRVbml0KG1fcGFpbnRSZWN0LngoKSksIExheW91dFVuaXQobV9wYWlu dFJlY3QueSgpIC0gZGVsdGFZKSwgTGF5b3V0VW5pdCh0ZXh0Qm94KCkubG9naWNhbFdpZHRoKCkp LCBzZWxlY3Rpb25IZWlnaHQgfTsKKyAgICBhdXRvIGRlbHRhWSA9IExheW91dFVuaXQgeyBtX3N0 eWxlLmlzRmxpcHBlZExpbmVzV3JpdGluZ01vZGUoKSA/IHNlbGVjdGlvbkxvZ2ljYWxSZWN0Lm1h eFkoKSAtIHRleHRCb3goKS5sb2dpY2FsQm90dG9tKCkgOiB0ZXh0Qm94KCkubG9naWNhbFRvcCgp IC0gc2VsZWN0aW9uTG9naWNhbFJlY3QueSgpIH07CisgICAgYXV0byBzZWxlY3Rpb25IZWlnaHQg PSBMYXlvdXRVbml0IHsgc3RkOjptYXgoMF9sdSwgc2VsZWN0aW9uTG9naWNhbFJlY3QuaGVpZ2h0 KCkpIH07CisgICAgYXV0byBzZWxlY3Rpb25SZWN0ID0gTGF5b3V0UmVjdCB7IExheW91dFVuaXQo bV9wYWludFJlY3QueCgpKSwgTGF5b3V0VW5pdChtX3BhaW50UmVjdC55KCkgLSBkZWx0YVkpLCBM YXlvdXRVbml0KHRleHRCb3goKS5sb2dpY2FsV2lkdGgoKSksIHNlbGVjdGlvbkhlaWdodCB9Owog ICAgIGZvbnRDYXNjYWRlKCkuYWRqdXN0U2VsZWN0aW9uUmVjdEZvclRleHQobV9wYWludFRleHRS dW4sIHNlbGVjdGlvblJlY3QsIHN0YXJ0T2Zmc2V0LCBlbmRPZmZzZXQpOwogCiAgICAgLy8gRklY TUU6IFN1cHBvcnQgcGFpbnRpbmcgY29tYmluZWQgdGV4dC4gU2VlIDxodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTgwOTkzPi4K 454928 2022-03-16 20:23:27 -0700 2022-03-17 08:25:50 -0700 Patch bug-237996-20220316202327.patch text/plain 9215 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjkxMzI0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTRiZjZkYjNjNGU5MzVm YjBlMTU0YmJhZGYyZTA0ZmE5YTc1MmMzOC4uMzY3NWM5YTE5M2Y4ZTc4MWEzMTllZjNkODc0NjMx NWM0MzVmMTMxYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIyLTAzLTE2ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbSUZDXVtJbnRlZ3JhdGlvbl0g UmVwbGFjZSBlbmNsb3NpbmdUb3AvQm90dG9tL2hlaWdodCBjYWxscyB3aXRoIExpbmU6OmVuY2xv c2luZ0xvZ2ljYWxSZWN0IHdoZW4gYXBwbGljYWJsZQorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM3OTk2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBpcyBpbiBwcmVwYXJhdGlvbiBmb3IgcmVtb3Zp bmcgc2VsZWN0aW9uL2hpdHRlc3RpbmcgcmVsYXRlZCBmdW5jdGlvbnMgZnJvbSBJbmxpbmVJdGVy YXRvcjo6TGluZS4KKworICAgICAgICAqIGxheW91dC9pbnRlZ3JhdGlvbi9JbmxpbmVJdGVyYXRv ckxpbmUuaDoKKyAgICAgICAgKFdlYkNvcmU6OklubGluZUl0ZXJhdG9yOjpMaW5lOjplbmNsb3Np bmdIZWlnaHQgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAqIGxheW91dC9pbnRlZ3JhdGlvbi9J bmxpbmVJdGVyYXRvclRleHRCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5saW5lSXRlcmF0 b3I6OlRleHRCb3g6OnNlbGVjdGlvblJlY3QgY29uc3QpOgorICAgICAgICAqIHJlbmRlcmluZy9S ZW5kZXJCbG9ja0Zsb3cuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2tGbG93Ojpp bmxpbmVTZWxlY3Rpb25HYXBzKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrRmxvdzo6 cG9zaXRpb25Gb3JQb2ludFdpdGhJbmxpbmVDaGlsZHJlbik6CisgICAgICAgICogcmVuZGVyaW5n L1JlbmRlckltYWdlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckltYWdlOjpjb2xsZWN0 U2VsZWN0aW9uR2VvbWV0cmllcyk6CisgICAgICAgICogcmVuZGVyaW5nL1RleHRCb3hQYWludGVy LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlRleHRCb3hQYWludGVyOjpwYWludEJhY2tncm91bmQp OgorCiAyMDIyLTAzLTE1ICBBbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAg ICBbSUZDXVtJbnRlZ3JhdGlvbl0gTW92ZSBmaXJzdFNlbGVjdGVkQm94L2xhc3RTZWxlY3RlZEJv eCBvdXQgb2YgSW5saW5lSXRlcmF0b3I6OkxpbmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9pbnRlZ3JhdGlvbi9JbmxpbmVJdGVyYXRvckxpbmUuaCBiL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9pbnRlZ3JhdGlvbi9JbmxpbmVJdGVyYXRvckxpbmUuaAppbmRleCAzNzlkYWZlNzVk YjMyMzMxZmNlMjMwNzIxNzM5YmUwNWRhODMyNTg2Li4xNWU4YmQwNWI0Y2QxY2RiYWQ1YjViNDM4 ZjE3YmFlN2U5N2FiNDBmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdy YXRpb24vSW5saW5lSXRlcmF0b3JMaW5lLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lu dGVncmF0aW9uL0lubGluZUl0ZXJhdG9yTGluZS5oCkBAIC02MCw3ICs2MCw2IEBAIHB1YmxpYzoK IAogICAgIExheW91dFVuaXQgZW5jbG9zaW5nVG9wKCkgY29uc3Q7CiAgICAgTGF5b3V0VW5pdCBl bmNsb3NpbmdCb3R0b20oKSBjb25zdDsKLSAgICBMYXlvdXRVbml0IGVuY2xvc2luZ0hlaWdodCgp IGNvbnN0OwogCiAgICAgTGF5b3V0UmVjdCBlbmNsb3NpbmdMb2dpY2FsUmVjdCgpIGNvbnN0Owog ICAgIExheW91dFJlY3QgZW5jbG9zaW5nUGh5c2ljYWxSZWN0KCkgY29uc3Q7CkBAIC0xNzcsMTEg KzE3Niw2IEBAIGlubGluZSBMYXlvdXRVbml0IExpbmU6OmVuY2xvc2luZ0JvdHRvbSgpIGNvbnN0 CiAgICAgfSk7CiB9CiAKLWlubGluZSBMYXlvdXRVbml0IExpbmU6OmVuY2xvc2luZ0hlaWdodCgp IGNvbnN0Ci17Ci0gICAgcmV0dXJuIGVuY2xvc2luZ0JvdHRvbSgpIC0gZW5jbG9zaW5nVG9wKCk7 Ci19Ci0KIGlubGluZSBMYXlvdXRVbml0IExpbmU6OmxpbmVCb3hUb3AoKSBjb25zdAogewogICAg IHJldHVybiBXVEY6OnN3aXRjaE9uKG1fcGF0aFZhcmlhbnQsIFtdKGNvbnN0IGF1dG8mIHBhdGgp IHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9JbmxpbmVJ dGVyYXRvclRleHRCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0lu bGluZUl0ZXJhdG9yVGV4dEJveC5jcHAKaW5kZXggNTA0NDIxYjIwYjFhOWFjZGRjMzZkY2ZiY2Jm MzAyYmE4ZmFkNWY2ZS4uMGNjOWI5MzY3OWE5YTNhMTg1Mzg5ZWU1NDg5N2ZhMzliY2Y0YjZlMyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0lubGluZUl0ZXJh dG9yVGV4dEJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0lu bGluZUl0ZXJhdG9yVGV4dEJveC5jcHAKQEAgLTQ1LDE2ICs0NSwxNCBAQCBMYXlvdXRSZWN0IFRl eHRCb3g6OnNlbGVjdGlvblJlY3QodW5zaWduZWQgcmFuZ2VTdGFydCwgdW5zaWduZWQgcmFuZ2VF bmQpIGNvbnN0CiAgICAgaWYgKGNsYW1wZWRTdGFydCA+PSBjbGFtcGVkRW5kICYmICEocmFuZ2VT dGFydCA9PSByYW5nZUVuZCAmJiByYW5nZVN0YXJ0ID49IHN0YXJ0KCkgJiYgcmFuZ2VTdGFydCA8 PSBlbmQoKSkpCiAgICAgICAgIHJldHVybiB7IH07CiAKLSAgICBhdXRvIHNlbGVjdGlvblRvcCA9 IGxpbmUoKS0+ZW5jbG9zaW5nVG9wKCk7Ci0gICAgYXV0byBzZWxlY3Rpb25IZWlnaHQgPSBsaW5l KCktPmVuY2xvc2luZ0hlaWdodCgpOwotCi0gICAgTGF5b3V0UmVjdCBzZWxlY3Rpb25SZWN0IHsg bG9naWNhbExlZnQoKSwgc2VsZWN0aW9uVG9wLCBsb2dpY2FsV2lkdGgoKSwgc2VsZWN0aW9uSGVp Z2h0IH07CisgICAgYXV0byBsaW5lU2VsZWN0aW9uUmVjdCA9IGxpbmUoKS0+ZW5jbG9zaW5nTG9n aWNhbFJlY3QoKTsKKyAgICBhdXRvIHNlbGVjdGlvblJlY3QgPSBMYXlvdXRSZWN0IHsgbG9naWNh bExlZnQoKSwgbGluZVNlbGVjdGlvblJlY3QueSgpLCBsb2dpY2FsV2lkdGgoKSwgbGluZVNlbGVj dGlvblJlY3QuaGVpZ2h0KCkgfTsKIAogICAgIFRleHRSdW4gdGV4dFJ1biA9IGNyZWF0ZVRleHRS dW4oKTsKICAgICBpZiAoY2xhbXBlZFN0YXJ0IHx8IGNsYW1wZWRFbmQgIT0gdGV4dFJ1bi5sZW5n dGgoKSkKICAgICAgICAgZm9udENhc2NhZGUoKS5hZGp1c3RTZWxlY3Rpb25SZWN0Rm9yVGV4dCh0 ZXh0UnVuLCBzZWxlY3Rpb25SZWN0LCBjbGFtcGVkU3RhcnQsIGNsYW1wZWRFbmQpOwogCi0gICAg cmV0dXJuIHNuYXBwZWRTZWxlY3Rpb25SZWN0KHNlbGVjdGlvblJlY3QsIGxvZ2ljYWxSaWdodCgp LCBzZWxlY3Rpb25Ub3AsIHNlbGVjdGlvbkhlaWdodCwgaXNIb3Jpem9udGFsKCkpOworICAgIHJl dHVybiBzbmFwcGVkU2VsZWN0aW9uUmVjdChzZWxlY3Rpb25SZWN0LCBsb2dpY2FsUmlnaHQoKSwg bGluZVNlbGVjdGlvblJlY3QueSgpLCBsaW5lU2VsZWN0aW9uUmVjdC5oZWlnaHQoKSwgaXNIb3Jp em9udGFsKCkpOwogfQogCiB1bnNpZ25lZCBUZXh0Qm94OjpvZmZzZXRGb3JQb3NpdGlvbihmbG9h dCB4LCBib29sIGluY2x1ZGVQYXJ0aWFsR2x5cGhzKSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNwcAppbmRleCAzNjFlZTBiMTQwYWY0YWJjMzY5YmUz ZDhiNDAxYzhjN2ExMTA1NWZkLi42YTljNzViMjk4ZGE2NjU2MGMyZDg4OWM5N2U4NTFjZTMyOGE0 MGU5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93 LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNwcApA QCAtMzE4Nyw5ICszMTg3LDEwIEBAIEdhcFJlY3RzIFJlbmRlckJsb2NrRmxvdzo6aW5saW5lU2Vs ZWN0aW9uR2FwcyhSZW5kZXJCbG9jayYgcm9vdEJsb2NrLCBjb25zdCBMYXlvCiAKICAgICBpZiAo bGFzdFNlbGVjdGVkTGluZSAmJiBzZWxlY3Rpb25TdGF0ZSgpICE9IEhpZ2hsaWdodFN0YXRlOjpF bmQgJiYgc2VsZWN0aW9uU3RhdGUoKSAhPSBIaWdobGlnaHRTdGF0ZTo6Qm90aCkgewogICAgICAg ICAvLyBVcGRhdGUgb3VyIGxhc3RZIHRvIGJlIHRoZSBib3R0b20gb2YgdGhlIGxhc3Qgc2VsZWN0 ZWQgbGluZS4KLSAgICAgICAgbGFzdExvZ2ljYWxUb3AgPSBibG9ja0RpcmVjdGlvbk9mZnNldChy b290QmxvY2ssIG9mZnNldEZyb21Sb290QmxvY2spICsgbGFzdFNlbGVjdGVkTGluZS0+ZW5jbG9z aW5nQm90dG9tKCk7Ci0gICAgICAgIGxhc3RMb2dpY2FsTGVmdCA9IGxvZ2ljYWxMZWZ0U2VsZWN0 aW9uT2Zmc2V0KHJvb3RCbG9jaywgbGFzdFNlbGVjdGVkTGluZS0+ZW5jbG9zaW5nQm90dG9tKCks IGNhY2hlKTsKLSAgICAgICAgbGFzdExvZ2ljYWxSaWdodCA9IGxvZ2ljYWxSaWdodFNlbGVjdGlv bk9mZnNldChyb290QmxvY2ssIGxhc3RTZWxlY3RlZExpbmUtPmVuY2xvc2luZ0JvdHRvbSgpLCBj YWNoZSk7CisgICAgICAgIGF1dG8gbGFzdExpbmVTZWxlY3Rpb25Cb3R0b20gPSBsYXN0U2VsZWN0 ZWRMaW5lLT5lbmNsb3NpbmdCb3R0b20oKTsKKyAgICAgICAgbGFzdExvZ2ljYWxUb3AgPSBibG9j a0RpcmVjdGlvbk9mZnNldChyb290QmxvY2ssIG9mZnNldEZyb21Sb290QmxvY2spICsgbGFzdExp bmVTZWxlY3Rpb25Cb3R0b207CisgICAgICAgIGxhc3RMb2dpY2FsTGVmdCA9IGxvZ2ljYWxMZWZ0 U2VsZWN0aW9uT2Zmc2V0KHJvb3RCbG9jaywgbGFzdExpbmVTZWxlY3Rpb25Cb3R0b20sIGNhY2hl KTsKKyAgICAgICAgbGFzdExvZ2ljYWxSaWdodCA9IGxvZ2ljYWxSaWdodFNlbGVjdGlvbk9mZnNl dChyb290QmxvY2ssIGxhc3RMaW5lU2VsZWN0aW9uQm90dG9tLCBjYWNoZSk7CiAgICAgfQogICAg IHJldHVybiByZXN1bHQ7CiB9CkBAIC0zMzkzLDcgKzMzOTQsOCBAQCBWaXNpYmxlUG9zaXRpb24g UmVuZGVyQmxvY2tGbG93Ojpwb3NpdGlvbkZvclBvaW50V2l0aElubGluZUNoaWxkcmVuKGNvbnN0 IExheW91dAogICAgICAgICBsYXN0TGluZVdpdGhDaGlsZHJlbiA9IGxpbmU7CiAKICAgICAgICAg Ly8gY2hlY2sgaWYgdGhpcyByb290IGxpbmUgYm94IGlzIGxvY2F0ZWQgYXQgdGhpcyB5IGNvb3Jk aW5hdGUKLSAgICAgICAgaWYgKHBvaW50SW5Mb2dpY2FsQ29udGVudHMueSgpIDwgbGluZS0+ZW5j bG9zaW5nQm90dG9tKCkgfHwgKGJsb2Nrc0FyZUZsaXBwZWQgJiYgcG9pbnRJbkxvZ2ljYWxDb250 ZW50cy55KCkgPT0gbGluZS0+ZW5jbG9zaW5nQm90dG9tKCkpKSB7CisgICAgICAgIGF1dG8gc2Vs ZWN0aW9uQm90dG9tID0gbGluZS0+ZW5jbG9zaW5nQm90dG9tKCk7CisgICAgICAgIGlmIChwb2lu dEluTG9naWNhbENvbnRlbnRzLnkoKSA8IHNlbGVjdGlvbkJvdHRvbSB8fCAoYmxvY2tzQXJlRmxp cHBlZCAmJiBwb2ludEluTG9naWNhbENvbnRlbnRzLnkoKSA9PSBzZWxlY3Rpb25Cb3R0b20pKSB7 CiAgICAgICAgICAgICBpZiAobGluZXNBcmVGbGlwcGVkKSB7CiAgICAgICAgICAgICAgICAgYXV0 byBuZXh0TGluZVdpdGhDaGlsZHJlbiA9IGxpbmUtPm5leHQoKTsKICAgICAgICAgICAgICAgICB3 aGlsZSAobmV4dExpbmVXaXRoQ2hpbGRyZW4gJiYgIW5leHRMaW5lV2l0aENoaWxkcmVuLT5maXJz dExlYWZCb3goKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJJ bWFnZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVySW1hZ2UuY3BwCmluZGV4 IDAyZWEzM2Q2NjQwYmI0YmIwNTcxNzRkMThmMjM5MDhkMGY0MGViMDguLjA1M2I0NzZhYjU0MDE3 YzJiMTUwMmFiYmZhMTc0MjE5NDZkOWZmZDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJJbWFnZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckltYWdlLmNwcApAQCAtMTA5LDkgKzEwOSw5IEBAIHZvaWQgUmVuZGVySW1hZ2U6OmNvbGxl Y3RTZWxlY3Rpb25HZW9tZXRyaWVzKFZlY3RvcjxTZWxlY3Rpb25HZW9tZXRyeT4mIGdlb21ldHJp CiAgICAgICAgICAgICBsaW5lRXh0ZW50UmVjdC5zZXRIZWlnaHQoY29udGFpbmluZ0Jsb2NrLT5o ZWlnaHQoKSk7CiAgICAgICAgIH0KICAgICB9IGVsc2UgewotICAgICAgICBhdXRvIGxpbmUgPSBy dW4tPmxpbmUoKTsKLSAgICAgICAgTGF5b3V0VW5pdCBzZWxlY3Rpb25Ub3AgPSAhY29udGFpbmlu Z0Jsb2NrLT5zdHlsZSgpLmlzRmxpcHBlZEJsb2Nrc1dyaXRpbmdNb2RlKCkgPyBsaW5lLT5lbmNs b3NpbmdUb3AoKSAtIGxvZ2ljYWxUb3AoKSA6IGxvZ2ljYWxCb3R0b20oKSAtIGxpbmUtPmVuY2xv c2luZ0JvdHRvbSgpOwotICAgICAgICBpbWFnZVJlY3QgPSBJbnRSZWN0KDAsICBzZWxlY3Rpb25U b3AsIGxvZ2ljYWxXaWR0aCgpLCBsaW5lLT5lbmNsb3NpbmdIZWlnaHQoKSk7CisgICAgICAgIGF1 dG8gc2VsZWN0aW9uTG9naWNhbFJlY3QgPSBydW4tPmxpbmUoKS0+ZW5jbG9zaW5nTG9naWNhbFJl Y3QoKTsKKyAgICAgICAgYXV0byBzZWxlY3Rpb25Ub3AgPSAhY29udGFpbmluZ0Jsb2NrLT5zdHls ZSgpLmlzRmxpcHBlZEJsb2Nrc1dyaXRpbmdNb2RlKCkgPyBzZWxlY3Rpb25Mb2dpY2FsUmVjdC55 KCkgLSBsb2dpY2FsVG9wKCkgOiBsb2dpY2FsQm90dG9tKCkgLSBzZWxlY3Rpb25Mb2dpY2FsUmVj dC5tYXhZKCk7CisgICAgICAgIGltYWdlUmVjdCA9IEludFJlY3QgeyAwLCAgc2VsZWN0aW9uVG9w LCBsb2dpY2FsV2lkdGgoKSwgc2VsZWN0aW9uTG9naWNhbFJlY3QuaGVpZ2h0KCkgfTsKICAgICAg ICAgaXNGaXJzdE9uTGluZSA9ICFydW4tPnByZXZpb3VzT25MaW5lKCk7CiAgICAgICAgIGlzTGFz dE9uTGluZSA9ICFydW4tPm5leHRPbkxpbmUoKTsKICAgICAgICAgTG9naWNhbFNlbGVjdGlvbk9m ZnNldENhY2hlcyBjYWNoZSgqY29udGFpbmluZ0Jsb2NrKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9UZXh0Qm94UGFpbnRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvVGV4dEJveFBhaW50ZXIuY3BwCmluZGV4IGY4MTM1YTA1N2Q5NzQ0ODA4M2IwYTgxNTFk MzNjZjliZWQwZjFjZDMuLmYxN2ZiODVjNWZmZjAwMjA0NjZjZjgxNzhlZmI4N2M2YTYwMjAzOWIg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9UZXh0Qm94UGFpbnRlci5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1RleHRCb3hQYWludGVyLmNwcApAQCAtMjg4 LDE3ICsyODgsMTQgQEAgdm9pZCBUZXh0Qm94UGFpbnRlcjo6cGFpbnRCYWNrZ3JvdW5kKHVuc2ln bmVkIHN0YXJ0T2Zmc2V0LCB1bnNpZ25lZCBlbmRPZmZzZXQsIGMKIAogICAgIC8vIE5vdGUgdGhh dCBpZiB0aGUgdGV4dCBpcyB0cnVuY2F0ZWQsIHdlIGxldCB0aGUgdGhpbmcgYmVpbmcgcGFpbnRl ZCBpbiB0aGUgdHJ1bmNhdGlvbgogICAgIC8vIGRyYXcgaXRzIG93biBoaWdobGlnaHQuCi0KLSAg ICBjb25zdCBhdXRvIGxpbmUgPSB0ZXh0Qm94KCkubGluZSgpOwotICAgIExheW91dFVuaXQgc2Vs ZWN0aW9uQm90dG9tID0gbGluZS0+ZW5jbG9zaW5nQm90dG9tKCk7Ci0gICAgTGF5b3V0VW5pdCBz ZWxlY3Rpb25Ub3AgPSBsaW5lLT5lbmNsb3NpbmdUb3BBZGp1c3RlZEZvclByZWNlZGluZ0Jsb2Nr KCk7Ci0KKyAgICBhdXRvIGxpbmUgPSB0ZXh0Qm94KCkubGluZSgpOworICAgIGF1dG8gc2VsZWN0 aW9uQm90dG9tID0gbGluZS0+ZW5jbG9zaW5nQm90dG9tKCk7CisgICAgYXV0byBzZWxlY3Rpb25U b3AgPSBsaW5lLT5lbmNsb3NpbmdUb3BBZGp1c3RlZEZvclByZWNlZGluZ0Jsb2NrKCk7CiAgICAg Ly8gVXNlIHNhbWUgeSBwb3NpdGlvbmluZyBhbmQgaGVpZ2h0IGFzIGZvciBzZWxlY3Rpb24sIHNv IHRoYXQgd2hlbiB0aGUgc2VsZWN0aW9uIGFuZCB0aGlzIHN1YnJhbmdlIGFyZSBvbgogICAgIC8v IHRoZSBzYW1lIHdvcmQgdGhlcmUgYXJlIG5vIHBpZWNlcyBzdGlja2luZyBvdXQuCi0gICAgTGF5 b3V0VW5pdCBkZWx0YVkgeyBtX3N0eWxlLmlzRmxpcHBlZExpbmVzV3JpdGluZ01vZGUoKSA/IHNl bGVjdGlvbkJvdHRvbSAtIHRleHRCb3goKS5sb2dpY2FsQm90dG9tKCkgOiB0ZXh0Qm94KCkubG9n aWNhbFRvcCgpIC0gc2VsZWN0aW9uVG9wIH07Ci0gICAgTGF5b3V0VW5pdCBzZWxlY3Rpb25IZWln aHQgPSBzdGQ6Om1heDxMYXlvdXRVbml0PigwLCBzZWxlY3Rpb25Cb3R0b20gLSBzZWxlY3Rpb25U b3ApOwotCi0gICAgTGF5b3V0UmVjdCBzZWxlY3Rpb25SZWN0IHsgTGF5b3V0VW5pdChtX3BhaW50 UmVjdC54KCkpLCBMYXlvdXRVbml0KG1fcGFpbnRSZWN0LnkoKSAtIGRlbHRhWSksIExheW91dFVu aXQodGV4dEJveCgpLmxvZ2ljYWxXaWR0aCgpKSwgc2VsZWN0aW9uSGVpZ2h0IH07CisgICAgYXV0 byBkZWx0YVkgPSBMYXlvdXRVbml0IHsgbV9zdHlsZS5pc0ZsaXBwZWRMaW5lc1dyaXRpbmdNb2Rl KCkgPyBzZWxlY3Rpb25Cb3R0b20gLSB0ZXh0Qm94KCkubG9naWNhbEJvdHRvbSgpIDogdGV4dEJv eCgpLmxvZ2ljYWxUb3AoKSAtIHNlbGVjdGlvblRvcCB9OworICAgIGF1dG8gc2VsZWN0aW9uSGVp Z2h0ID0gTGF5b3V0VW5pdCB7IHN0ZDo6bWF4KDBfbHUsIHNlbGVjdGlvbkJvdHRvbSAtIHNlbGVj dGlvblRvcCkgfTsKKyAgICBhdXRvIHNlbGVjdGlvblJlY3QgPSBMYXlvdXRSZWN0IHsgTGF5b3V0 VW5pdChtX3BhaW50UmVjdC54KCkpLCBMYXlvdXRVbml0KG1fcGFpbnRSZWN0LnkoKSAtIGRlbHRh WSksIExheW91dFVuaXQodGV4dEJveCgpLmxvZ2ljYWxXaWR0aCgpKSwgc2VsZWN0aW9uSGVpZ2h0 IH07CiAgICAgZm9udENhc2NhZGUoKS5hZGp1c3RTZWxlY3Rpb25SZWN0Rm9yVGV4dChtX3BhaW50 VGV4dFJ1biwgc2VsZWN0aW9uUmVjdCwgc3RhcnRPZmZzZXQsIGVuZE9mZnNldCk7CiAKICAgICAv LyBGSVhNRTogU3VwcG9ydCBwYWludGluZyBjb21iaW5lZCB0ZXh0LiBTZWUgPGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODA5OTM+Lgo=