222522 2021-02-27 16:20:25 -0800 [LFC][IFC] Content left offset means just content left 2021-02-28 16:14:14 -0800 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 1734244 0 zalan 2021-02-27 16:20:25 -0800 "offset" is redundant 1734245 1 421763 zalan 2021-02-27 16:22:01 -0800 Created attachment 421763 Patch 1734293 2 421778 zalan 2021-02-28 12:40:09 -0800 Created attachment 421778 Patch 1734305 3 ews-feeder 2021-02-28 16:13:17 -0800 Committed r273640: <https://commits.webkit.org/r273640> All reviewed patches have been landed. Closing bug and clearing flags on attachment 421778. 1734306 4 webkit-bug-importer 2021-02-28 16:14:14 -0800 <rdar://problem/74844981> 421763 2021-02-27 16:22:01 -0800 2021-02-28 12:40:07 -0800 Patch bug-222522-20210227162200.patch text/plain 15637 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjczNTk5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWI1ZmQ0Y2UzZjg5ODQz ZjQ4OTQyNTljNDhkZDdkYzYzMTMzZGI1ZS4uMGQyMTZiZWJlZDQ1MjJjZWNjNzc2OGVmMDliN2I0 ZGJjNjBhZDgzNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDIxLTAyLTI3ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBDb250ZW50 IGxlZnQgb2Zmc2V0IG1lYW5zIGp1c3QgY29udGVudCBsZWZ0CisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjI1MjIKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lu bGluZUZvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5 b3V0OjpMaW5lQm94QnVpbGRlcjo6YnVpbGQpOgorICAgICAgICAqIGxheW91dC9pbmxpbmVmb3Jt YXR0aW5nL0lubGluZUxpbmVCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5l Qm94OjpMaW5lQm94KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6bV9jb250ZW50TG9naWNh bFdpZHRoKToKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQm94 Lmg6CisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUdlb21ldHJ5 Lmg6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUxpbmVHZW9tZXRyeTo6Y29udGVu dExvZ2ljYWxMZWZ0IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lTGlu ZUdlb21ldHJ5OjpJbmxpbmVMaW5lR2VvbWV0cnkpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0 OjpJbmxpbmVMaW5lR2VvbWV0cnk6OmNvbnRlbnRMb2dpY2FsTGVmdE9mZnNldCBjb25zdCk6IERl bGV0ZWQuCisgICAgICAgICogbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uSW5s aW5lQ29udGVudEJ1aWxkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRp b246OklubGluZUNvbnRlbnRCdWlsZGVyOjpjcmVhdGVEaXNwbGF5TGluZXMgY29uc3QpOgorICAg ICAgICAqIGxheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmUuaDoKKyAgICAg ICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpMaW5lOjpMaW5lKToKKyAgICAgICAgKFdl YkNvcmU6OkxheW91dEludGVncmF0aW9uOjpMaW5lOjpjb250ZW50TGVmdCBjb25zdCk6CisgICAg ICAgIChXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6TGluZTo6Y29udGVudExlZnRPZmZzZXQg Y29uc3QpOiBEZWxldGVkLgorICAgICAgICAqIGxheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRl Z3JhdGlvbkxpbmVJdGVyYXRvck1vZGVyblBhdGguaDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91 dEludGVncmF0aW9uOjpMaW5lSXRlcmF0b3JNb2Rlcm5QYXRoOjpjb250ZW50TG9naWNhbExlZnQg Y29uc3QpOgorICAgICAgICAqIGxheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxp bmVMYXlvdXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246OkxpbmVM YXlvdXQ6OnBhaW50KToKKyAgICAgICAgKiBsYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdy YXRpb25QYWdpbmF0aW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9u OjptYWtlQWRqdXN0ZWRDb250ZW50KToKKyAgICAgICAgKiBsYXlvdXQvaW50ZWdyYXRpb24vTGF5 b3V0SW50ZWdyYXRpb25SdW5JdGVyYXRvck1vZGVyblBhdGguaDoKKyAgICAgICAgKFdlYkNvcmU6 OkxheW91dEludGVncmF0aW9uOjpSdW5JdGVyYXRvck1vZGVyblBhdGg6OmNyZWF0ZVRleHRSdW4g Y29uc3QpOgorCiAyMDIxLTAyLTI3ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAK ICAgICAgICAgW0xGQ11bSUZDXSBMaW5lQm94J3MgaG9yaXpvbnRhbEFsaWdubWVudE9mZnNldCBp cyB0aGUgcm9vdCBpbmxpbmUgYm94J3MgbG9naWNhbCBsZWZ0CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dEdl b21ldHJ5LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGlu ZUZvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCmluZGV4IGQ2ZDEyZmE4ZDljMDQxZTkxNGM3 NmQ4MmZlYjBiYTZmYWJkNjY3ZmEuLmUwZmYxOWYwMGQxOWNmODY4N2JkMWI1YjFlMTE4NDE0YjJl NmI1NjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5n L0lubGluZUZvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnku Y3BwCkBAIC0xNTgsNyArMTU4LDcgQEAgTGluZUJveCBMaW5lQm94QnVpbGRlcjo6YnVpbGQoY29u c3QgTGluZUJ1aWxkZXI6OkxpbmVDb250ZW50JiBsaW5lQ29udGVudCkKICAgICBhdXRvIGxpbmVM b2dpY2FsV2lkdGggPSBsaW5lQ29udGVudC5saW5lTG9naWNhbFdpZHRoOwogICAgIGF1dG8gY29u dGVudExvZ2ljYWxXaWR0aCA9IGxpbmVDb250ZW50LmNvbnRlbnRMb2dpY2FsV2lkdGg7CiAgICAg YXV0byBob3Jpem9udGFsQWxpZ25tZW50T2Zmc2V0ID0gTGF5b3V0Ojpob3Jpem9udGFsQWxpZ25t ZW50T2Zmc2V0KHJ1bnMsIHJvb3RCb3goKS5zdHlsZSgpLnRleHRBbGlnbigpLCBsaW5lTG9naWNh bFdpZHRoLCBjb250ZW50TG9naWNhbFdpZHRoLCBsaW5lQ29udGVudC5pc0xhc3RMaW5lV2l0aElu bGluZUNvbnRlbnQpOwotICAgIGF1dG8gbGluZUJveCA9IExpbmVCb3ggeyByb290Qm94KCksIGxp bmVDb250ZW50LmxvZ2ljYWxUb3BMZWZ0LCBsaW5lTG9naWNhbFdpZHRoLCBjb250ZW50TG9naWNh bFdpZHRoLCBob3Jpem9udGFsQWxpZ25tZW50T2Zmc2V0LCBydW5zLnNpemUoKSB9OworICAgIGF1 dG8gbGluZUJveCA9IExpbmVCb3ggeyByb290Qm94KCksIGxpbmVDb250ZW50LmxvZ2ljYWxUb3BM ZWZ0LCBsaW5lTG9naWNhbFdpZHRoLCBob3Jpem9udGFsQWxpZ25tZW50T2Zmc2V0LnZhbHVlT3Io SW5saW5lTGF5b3V0VW5pdCB7IH0pLCBjb250ZW50TG9naWNhbFdpZHRoLCBydW5zLnNpemUoKSB9 OwogCiAgICAgY29uc3RydWN0SW5saW5lTGV2ZWxCb3hlcyhsaW5lQm94LCBydW5zKTsKICAgICBp ZiAobV9pbmxpbmVMZXZlbEJveGVzTmVlZFZlcnRpY2FsQWxpZ25tZW50KQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQm94LmNw cAppbmRleCBiYzJiNDFkN2E3MTI2OWI0YzFmNjgzMjU1NTE5MDRlZjViMWY1ZDU4Li44Y2RjODMx YzI0ZjYxMDE1ZmRmOGY5Mzk5ZGZiYTY1ZDcxNjEwNWE2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQm94LmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQm94LmNwcApAQCAt ODMsMTEgKzgzLDExIEBAIGJvb2wgTGluZUJveDo6SW5saW5lTGV2ZWxCb3g6Omhhc0xpbmVCb3hS ZWxhdGl2ZUFsaWdubWVudCgpIGNvbnN0CiAgICAgcmV0dXJuIHZlcnRpY2FsQWxpZ25tZW50ID09 IFZlcnRpY2FsQWxpZ246OlRvcCB8fCB2ZXJ0aWNhbEFsaWdubWVudCA9PSBWZXJ0aWNhbEFsaWdu OjpCb3R0b207CiB9CiAKLUxpbmVCb3g6OkxpbmVCb3goY29uc3QgQm94JiByb290TGF5b3V0Qm94 LCBjb25zdCBJbmxpbmVMYXlvdXRQb2ludCYgbG9naWNhbFRvcGxlZnQsIElubGluZUxheW91dFVu aXQgbGluZUxvZ2ljYWxXaWR0aCwgSW5saW5lTGF5b3V0VW5pdCBjb250ZW50TG9naWNhbFdpZHRo LCBPcHRpb25hbDxJbmxpbmVMYXlvdXRVbml0PiBob3Jpem9udGFsQWxpZ25tZW50T2Zmc2V0LCBz aXplX3QgbnVtYmVyT2ZSdW5zKQorTGluZUJveDo6TGluZUJveChjb25zdCBCb3gmIHJvb3RMYXlv dXRCb3gsIGNvbnN0IElubGluZUxheW91dFBvaW50JiBsb2dpY2FsVG9wbGVmdCwgSW5saW5lTGF5 b3V0VW5pdCBsaW5lTG9naWNhbFdpZHRoLCBJbmxpbmVMYXlvdXRVbml0IGNvbnRlbnRMb2dpY2Fs TGVmdCwgSW5saW5lTGF5b3V0VW5pdCBjb250ZW50TG9naWNhbFdpZHRoLCBzaXplX3QgbnVtYmVy T2ZSdW5zKQogICAgIDogbV9sb2dpY2FsUmVjdChsb2dpY2FsVG9wbGVmdCwgSW5saW5lTGF5b3V0 U2l6ZSB7IGxpbmVMb2dpY2FsV2lkdGgsIHsgfSB9KQogICAgICwgbV9jb250ZW50TG9naWNhbFdp ZHRoKGNvbnRlbnRMb2dpY2FsV2lkdGgpCiB7Ci0gICAgbV9yb290SW5saW5lQm94ID0gbWFrZVVu aXF1ZTxMaW5lQm94OjpJbmxpbmVMZXZlbEJveD4ocm9vdExheW91dEJveCwgaG9yaXpvbnRhbEFs aWdubWVudE9mZnNldC52YWx1ZU9yKElubGluZUxheW91dFVuaXQgeyB9KSwgSW5saW5lTGF5b3V0 U2l6ZSB7IGNvbnRlbnRMb2dpY2FsV2lkdGgsIHsgfSB9LCBJbmxpbmVMZXZlbEJveDo6VHlwZTo6 Um9vdElubGluZUJveCk7CisgICAgbV9yb290SW5saW5lQm94ID0gbWFrZVVuaXF1ZTxMaW5lQm94 OjpJbmxpbmVMZXZlbEJveD4ocm9vdExheW91dEJveCwgY29udGVudExvZ2ljYWxMZWZ0LCBJbmxp bmVMYXlvdXRTaXplIHsgY29udGVudExvZ2ljYWxXaWR0aCwgeyB9IH0sIElubGluZUxldmVsQm94 OjpUeXBlOjpSb290SW5saW5lQm94KTsKICAgICBtX25vblJvb3RJbmxpbmVMZXZlbEJveExpc3Qu cmVzZXJ2ZUluaXRpYWxDYXBhY2l0eShudW1iZXJPZlJ1bnMpOwogICAgIG1faW5saW5lTGV2ZWxC b3hSZWN0TWFwLnJlc2VydmVJbml0aWFsQ2FwYWNpdHkobnVtYmVyT2ZSdW5zKTsKICAgICBtX2lu bGluZUxldmVsQm94UmVjdE1hcC5zZXQoJnJvb3RMYXlvdXRCb3gsIG1fcm9vdElubGluZUJveC5n ZXQoKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGlu Zy9JbmxpbmVMaW5lQm94LmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGlu Zy9JbmxpbmVMaW5lQm94LmgKaW5kZXggMDY4M2VjNjZiYmEzZDY1NjM4MTEyZDEyNjNhYTU1MDEw YmE4N2FlNS4uNThlMzAyN2NhOGE5YjA5YjM5MjI4MDFmOWJkZWNjYTViMmRiNTA5ZSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJv eC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxp bmVCb3guaApAQCAtMTMwLDcgKzEzMCw3IEBAIHB1YmxpYzoKICAgICAgICAgVHlwZSBtX3R5cGUg eyBUeXBlOjpJbmxpbmVCb3ggfTsKICAgICB9OwogCi0gICAgTGluZUJveChjb25zdCBCb3gmIHJv b3RMYXlvdXRCb3gsIGNvbnN0IElubGluZUxheW91dFBvaW50JiBsb2dpY2FsVG9wTGVmdCwgSW5s aW5lTGF5b3V0VW5pdCBsaW5lTG9naWNhbFdpZHRoLCBJbmxpbmVMYXlvdXRVbml0IGNvbnRlbnRM b2dpY2FsV2lkdGgsIE9wdGlvbmFsPElubGluZUxheW91dFVuaXQ+IGhvcml6b250YWxBbGlnbm1l bnRPZmZzZXQsIHNpemVfdCBudW1iZXJPZlJ1bnMpOworICAgIExpbmVCb3goY29uc3QgQm94JiBy b290TGF5b3V0Qm94LCBjb25zdCBJbmxpbmVMYXlvdXRQb2ludCYgbG9naWNhbFRvcExlZnQsIElu bGluZUxheW91dFVuaXQgbGluZUxvZ2ljYWxXaWR0aCwgSW5saW5lTGF5b3V0VW5pdCBjb250ZW50 TG9naWNhbExlZnQsIElubGluZUxheW91dFVuaXQgY29udGVudExvZ2ljYWxXaWR0aCwgc2l6ZV90 IG51bWJlck9mUnVucyk7CiAKICAgICBjb25zdCBJbmxpbmVSZWN0JiBsb2dpY2FsUmVjdCgpIGNv bnN0IHsgcmV0dXJuIG1fbG9naWNhbFJlY3Q7IH0KICAgICBJbmxpbmVMYXlvdXRVbml0IGxvZ2lj YWxXaWR0aCgpIGNvbnN0IHsgcmV0dXJuIGxvZ2ljYWxTaXplKCkud2lkdGgoKTsgfQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUdl b21ldHJ5LmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVM aW5lR2VvbWV0cnkuaAppbmRleCBhZmFjNGNhNjNiM2Q1MmIxMzU0YWY0MmQzMDdlYjlkYzA4ZjQ0 N2Y4Li5kNmEyYzU4YTA3NmU0OWMyY2QzYzllMmY5MmFiMzZkMDNmMjcyOWU1IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lR2VvbWV0 cnkuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVM aW5lR2VvbWV0cnkuaApAQCAtNDAsNyArNDAsNyBAQCBwdWJsaWM6CiAgICAgICAgIElubGluZUxh eW91dFVuaXQgdG9wIHsgMCB9OwogICAgICAgICBJbmxpbmVMYXlvdXRVbml0IGJvdHRvbSB7IDAg fTsKICAgICB9OwotICAgIElubGluZUxpbmVHZW9tZXRyeShjb25zdCBJbmxpbmVSZWN0JiBsaW5l Qm94TG9naWNhbFJlY3QsIEVuY2xvc2luZ1RvcEFuZEJvdHRvbSwgSW5saW5lTGF5b3V0VW5pdCBh bGlnbWVudEJhc2VsaW5lLCBJbmxpbmVMYXlvdXRVbml0IGNvbnRlbnRMb2dpY2FsTGVmdE9mZnNl dCwgSW5saW5lTGF5b3V0VW5pdCBjb250ZW50TG9naWNhbFdpZHRoKTsKKyAgICBJbmxpbmVMaW5l R2VvbWV0cnkoY29uc3QgSW5saW5lUmVjdCYgbGluZUJveExvZ2ljYWxSZWN0LCBFbmNsb3NpbmdU b3BBbmRCb3R0b20sIElubGluZUxheW91dFVuaXQgYWxpZ21lbnRCYXNlbGluZSwgSW5saW5lTGF5 b3V0VW5pdCBjb250ZW50TG9naWNhbExlZnQsIElubGluZUxheW91dFVuaXQgY29udGVudExvZ2lj YWxXaWR0aCk7CiAKICAgICBjb25zdCBJbmxpbmVSZWN0JiBsaW5lQm94TG9naWNhbFJlY3QoKSBj b25zdCB7IHJldHVybiBtX2xpbmVCb3hMb2dpY2FsUmVjdDsgfQogCkBAIC00OCw3ICs0OCw3IEBA IHB1YmxpYzoKIAogICAgIElubGluZUxheW91dFVuaXQgYmFzZWxpbmUoKSBjb25zdCB7IHJldHVy biBtX2FsaWdtZW50QmFzZWxpbmU7IH0KIAotICAgIElubGluZUxheW91dFVuaXQgY29udGVudExv Z2ljYWxMZWZ0T2Zmc2V0KCkgY29uc3QgeyByZXR1cm4gbV9jb250ZW50TG9naWNhbExlZnRPZmZz ZXQ7IH0KKyAgICBJbmxpbmVMYXlvdXRVbml0IGNvbnRlbnRMb2dpY2FsTGVmdCgpIGNvbnN0IHsg cmV0dXJuIG1fY29udGVudExvZ2ljYWxMZWZ0OyB9CiAgICAgSW5saW5lTGF5b3V0VW5pdCBjb250 ZW50TG9naWNhbFdpZHRoKCkgY29uc3QgeyByZXR1cm4gbV9jb250ZW50TG9naWNhbFdpZHRoOyB9 CiAKICAgICB2b2lkIG1vdmVWZXJ0aWNhbGx5KElubGluZUxheW91dFVuaXQgb2Zmc2V0KSB7IG1f bGluZUJveExvZ2ljYWxSZWN0Lm1vdmVWZXJ0aWNhbGx5KG9mZnNldCk7IH0KQEAgLTYxLDE1ICs2 MSwxNSBAQCBwcml2YXRlOgogICAgIC8vIHRoZSBsYXlvdXQgYm91bmRzIG9mIHRoZSBpbmxpbmUg bGV2ZWwgYm94ZXMgd2hpY2ggbWF5IGJlIGRpZmZlcmVudCB3aGVuIGxpbmUtaGVpZ2h0IGlzIHBy ZXNlbnQuCiAgICAgRW5jbG9zaW5nVG9wQW5kQm90dG9tIG1fZW5jbG9zaW5nVG9wQW5kQm90dG9t OwogICAgIElubGluZUxheW91dFVuaXQgbV9hbGlnbWVudEJhc2VsaW5lIHsgMCB9OwotICAgIElu bGluZUxheW91dFVuaXQgbV9jb250ZW50TG9naWNhbExlZnRPZmZzZXQgeyAwIH07CisgICAgSW5s aW5lTGF5b3V0VW5pdCBtX2NvbnRlbnRMb2dpY2FsTGVmdCB7IDAgfTsKICAgICBJbmxpbmVMYXlv dXRVbml0IG1fY29udGVudExvZ2ljYWxXaWR0aCB7IDAgfTsKIH07CiAKLWlubGluZSBJbmxpbmVM aW5lR2VvbWV0cnk6OklubGluZUxpbmVHZW9tZXRyeShjb25zdCBJbmxpbmVSZWN0JiBsaW5lQm94 TG9naWNhbFJlY3QsIEVuY2xvc2luZ1RvcEFuZEJvdHRvbSBlbmNsb3NpbmdUb3BBbmRCb3R0b20s IElubGluZUxheW91dFVuaXQgYWxpZ21lbnRCYXNlbGluZSwgSW5saW5lTGF5b3V0VW5pdCBjb250 ZW50TG9naWNhbExlZnRPZmZzZXQsIElubGluZUxheW91dFVuaXQgY29udGVudExvZ2ljYWxXaWR0 aCkKK2lubGluZSBJbmxpbmVMaW5lR2VvbWV0cnk6OklubGluZUxpbmVHZW9tZXRyeShjb25zdCBJ bmxpbmVSZWN0JiBsaW5lQm94TG9naWNhbFJlY3QsIEVuY2xvc2luZ1RvcEFuZEJvdHRvbSBlbmNs b3NpbmdUb3BBbmRCb3R0b20sIElubGluZUxheW91dFVuaXQgYWxpZ21lbnRCYXNlbGluZSwgSW5s aW5lTGF5b3V0VW5pdCBjb250ZW50TG9naWNhbExlZnQsIElubGluZUxheW91dFVuaXQgY29udGVu dExvZ2ljYWxXaWR0aCkKICAgICA6IG1fbGluZUJveExvZ2ljYWxSZWN0KGxpbmVCb3hMb2dpY2Fs UmVjdCkKICAgICAsIG1fZW5jbG9zaW5nVG9wQW5kQm90dG9tKGVuY2xvc2luZ1RvcEFuZEJvdHRv bSkKICAgICAsIG1fYWxpZ21lbnRCYXNlbGluZShhbGlnbWVudEJhc2VsaW5lKQotICAgICwgbV9j b250ZW50TG9naWNhbExlZnRPZmZzZXQoY29udGVudExvZ2ljYWxMZWZ0T2Zmc2V0KQorICAgICwg bV9jb250ZW50TG9naWNhbExlZnQoY29udGVudExvZ2ljYWxMZWZ0KQogICAgICwgbV9jb250ZW50 TG9naWNhbFdpZHRoKGNvbnRlbnRMb2dpY2FsV2lkdGgpCiB7CiB9CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25JbmxpbmVDb250 ZW50QnVpbGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0 SW50ZWdyYXRpb25JbmxpbmVDb250ZW50QnVpbGRlci5jcHAKaW5kZXggODY5ZTQ3NTczNDZjYzEw ZmIyZjY1YmJkNmNjYTBlMzExMDdlMWY5Mi4uMmIxYWU3OTJiY2JhMTEzYTBlMjIxZjE4OGZmZGZj NzI1NDdmNjYyZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9u L0xheW91dEludGVncmF0aW9uSW5saW5lQ29udGVudEJ1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbklubGluZUNvbnRlbnRC dWlsZGVyLmNwcApAQCAtMzU5LDcgKzM1OSw3IEBAIHZvaWQgSW5saW5lQ29udGVudEJ1aWxkZXI6 OmNyZWF0ZURpc3BsYXlMaW5lcyhjb25zdCBMYXlvdXQ6OklubGluZUZvcm1hdHRpbmdTdGF0CiAg ICAgICAgICAgICBlbmNsb3NpbmdUb3BBbmRCb3R0b20uYm90dG9tID0gcm91bmRUb0ludChlbmNs b3NpbmdUb3BBbmRCb3R0b20uYm90dG9tKTsKICAgICAgICAgfQogICAgICAgICBhdXRvIHJ1bkNv dW50ID0gcnVuSW5kZXggLSBmaXJzdFJ1bkluZGV4OwotICAgICAgICBpbmxpbmVDb250ZW50Lmxp bmVzLmFwcGVuZCh7IGZpcnN0UnVuSW5kZXgsIHJ1bkNvdW50LCBhZGp1c3RlZExpbmVCb3hSZWN0 LCBlbmNsb3NpbmdUb3BBbmRCb3R0b20udG9wLCBlbmNsb3NpbmdUb3BBbmRCb3R0b20uYm90dG9t LCBzY3JvbGxhYmxlT3ZlcmZsb3dSZWN0LCBsaW5lSW5rT3ZlcmZsb3dSZWN0LCBsaW5lLmJhc2Vs aW5lKCksIGxpbmUuY29udGVudExvZ2ljYWxMZWZ0T2Zmc2V0KCksIGxpbmUuY29udGVudExvZ2lj YWxXaWR0aCgpIH0pOworICAgICAgICBpbmxpbmVDb250ZW50LmxpbmVzLmFwcGVuZCh7IGZpcnN0 UnVuSW5kZXgsIHJ1bkNvdW50LCBhZGp1c3RlZExpbmVCb3hSZWN0LCBlbmNsb3NpbmdUb3BBbmRC b3R0b20udG9wLCBlbmNsb3NpbmdUb3BBbmRCb3R0b20uYm90dG9tLCBzY3JvbGxhYmxlT3ZlcmZs b3dSZWN0LCBsaW5lSW5rT3ZlcmZsb3dSZWN0LCBsaW5lLmJhc2VsaW5lKCksIGxpbmUuY29udGVu dExvZ2ljYWxMZWZ0KCksIGxpbmUuY29udGVudExvZ2ljYWxXaWR0aCgpIH0pOwogICAgIH0KIH0K IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dElu dGVncmF0aW9uTGluZS5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91 dEludGVncmF0aW9uTGluZS5oCmluZGV4IDJmMTE4MDNiNWJiZWVkNDYyMzc3ZjE2ZmU0MTYzZmVj OGUyYjQ0NTIuLmQyZGM1N2ZjNTNiZDhhMTNlMTY0ZmFiOWJjNWNiZGZkZjE5OWQwZjIgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlv bkxpbmUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50 ZWdyYXRpb25MaW5lLmgKQEAgLTM2LDcgKzM2LDcgQEAgbmFtZXNwYWNlIExheW91dEludGVncmF0 aW9uIHsKIGNsYXNzIExpbmUgewogICAgIFdURl9NQUtFX0ZBU1RfQUxMT0NBVEVEOwogcHVibGlj OgotICAgIExpbmUoc2l6ZV90IGZpcnN0UnVuSW5kZXgsIHNpemVfdCBydW5Db3VudCwgY29uc3Qg RmxvYXRSZWN0JiBsaW5lQm94UmVjdCwgZmxvYXQgZW5jbG9zaW5nQ29udGVudFRvcCwgZmxvYXQg ZW5jbG9zaW5nQ29udGVudEJvdHRvbSwgY29uc3QgRmxvYXRSZWN0JiBzY3JvbGxhYmxlT3ZlcmZs b3csIGNvbnN0IEZsb2F0UmVjdCYgaW5rT3ZlcmZsb3csIGZsb2F0IGJhc2VsaW5lLCBmbG9hdCBj b250ZW50TGVmdE9mZnNldCwgZmxvYXQgY29udGVudFdpZHRoKQorICAgIExpbmUoc2l6ZV90IGZp cnN0UnVuSW5kZXgsIHNpemVfdCBydW5Db3VudCwgY29uc3QgRmxvYXRSZWN0JiBsaW5lQm94UmVj dCwgZmxvYXQgZW5jbG9zaW5nQ29udGVudFRvcCwgZmxvYXQgZW5jbG9zaW5nQ29udGVudEJvdHRv bSwgY29uc3QgRmxvYXRSZWN0JiBzY3JvbGxhYmxlT3ZlcmZsb3csIGNvbnN0IEZsb2F0UmVjdCYg aW5rT3ZlcmZsb3csIGZsb2F0IGJhc2VsaW5lLCBmbG9hdCBjb250ZW50TGVmdCwgZmxvYXQgY29u dGVudFdpZHRoKQogICAgICAgICA6IG1fZmlyc3RSdW5JbmRleChmaXJzdFJ1bkluZGV4KQogICAg ICAgICAsIG1fcnVuQ291bnQocnVuQ291bnQpCiAgICAgICAgICwgbV9saW5lQm94UmVjdChsaW5l Qm94UmVjdCkKQEAgLTQ1LDcgKzQ1LDcgQEAgcHVibGljOgogICAgICAgICAsIG1fc2Nyb2xsYWJs ZU92ZXJmbG93KHNjcm9sbGFibGVPdmVyZmxvdykKICAgICAgICAgLCBtX2lua092ZXJmbG93KGlu a092ZXJmbG93KQogICAgICAgICAsIG1fYmFzZWxpbmUoYmFzZWxpbmUpCi0gICAgICAgICwgbV9j b250ZW50TGVmdE9mZnNldChjb250ZW50TGVmdE9mZnNldCkKKyAgICAgICAgLCBtX2NvbnRlbnRM ZWZ0KGNvbnRlbnRMZWZ0KQogICAgICAgICAsIG1fY29udGVudFdpZHRoKGNvbnRlbnRXaWR0aCkK ICAgICB7CiAgICAgfQpAQCAtNjYsNyArNjYsNyBAQCBwdWJsaWM6CiAKICAgICBmbG9hdCBiYXNl bGluZSgpIGNvbnN0IHsgcmV0dXJuIG1fYmFzZWxpbmU7IH0KIAotICAgIGZsb2F0IGNvbnRlbnRM ZWZ0T2Zmc2V0KCkgY29uc3QgeyByZXR1cm4gbV9jb250ZW50TGVmdE9mZnNldDsgfQorICAgIGZs b2F0IGNvbnRlbnRMZWZ0KCkgY29uc3QgeyByZXR1cm4gbV9jb250ZW50TGVmdDsgfQogICAgIGZs b2F0IGNvbnRlbnRXaWR0aCgpIGNvbnN0IHsgcmV0dXJuIG1fY29udGVudFdpZHRoOyB9CiAKIHBy aXZhdGU6CkBAIC04Miw3ICs4Miw3IEBAIHByaXZhdGU6CiAgICAgRmxvYXRSZWN0IG1fc2Nyb2xs YWJsZU92ZXJmbG93OwogICAgIEZsb2F0UmVjdCBtX2lua092ZXJmbG93OwogICAgIGZsb2F0IG1f YmFzZWxpbmUgeyAwIH07Ci0gICAgZmxvYXQgbV9jb250ZW50TGVmdE9mZnNldCB7IDAgfTsKKyAg ICBmbG9hdCBtX2NvbnRlbnRMZWZ0IHsgMCB9OwogICAgIGZsb2F0IG1fY29udGVudFdpZHRoIHsg MCB9OwogfTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9u L0xheW91dEludGVncmF0aW9uTGluZUl0ZXJhdG9yTW9kZXJuUGF0aC5oIGIvU291cmNlL1dlYkNv cmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uTGluZUl0ZXJhdG9yTW9kZXJu UGF0aC5oCmluZGV4IDMwZTNlZDQ2MzlkNWM0MmNmMDUzMzhkN2RjYWZhMjk1ZmY2ZTVkYWYuLjg5 MjdkYzRiNzhjNDU0YjZiMGJhYjA4MzE3OGRmMDUxY2U4Y2NhY2EgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVJdGVyYXRv ck1vZGVyblBhdGguaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5 b3V0SW50ZWdyYXRpb25MaW5lSXRlcmF0b3JNb2Rlcm5QYXRoLmgKQEAgLTU5LDcgKzU5LDcgQEAg cHVibGljOgogICAgIExheW91dFVuaXQgc2VsZWN0aW9uVG9wRm9ySGl0VGVzdGluZygpIGNvbnN0 IHsgcmV0dXJuIHRvcCgpOyB9CiAgICAgTGF5b3V0VW5pdCBzZWxlY3Rpb25Cb3R0b20oKSBjb25z dCB7IHJldHVybiBib3R0b20oKTsgfQogCi0gICAgZmxvYXQgY29udGVudExvZ2ljYWxMZWZ0KCkg Y29uc3QgeyByZXR1cm4gbGluZSgpLmxpbmVCb3hMZWZ0KCkgKyBsaW5lKCkuY29udGVudExlZnRP ZmZzZXQoKTsgfQorICAgIGZsb2F0IGNvbnRlbnRMb2dpY2FsTGVmdCgpIGNvbnN0IHsgcmV0dXJu IGxpbmUoKS5saW5lQm94TGVmdCgpICsgbGluZSgpLmNvbnRlbnRMZWZ0KCk7IH0KICAgICBmbG9h dCBjb250ZW50TG9naWNhbFJpZ2h0KCkgY29uc3QgeyByZXR1cm4gY29udGVudExvZ2ljYWxMZWZ0 KCkgKyBsaW5lKCkuY29udGVudFdpZHRoKCk7IH0KICAgICBmbG9hdCB5KCkgY29uc3QgeyByZXR1 cm4gbGluZUJveFRvcCgpOyB9CiAgICAgZmxvYXQgbG9naWNhbEhlaWdodCgpIGNvbnN0IHsgcmV0 dXJuIGxpbmVCb3hCb3R0b20oKSAtIGxpbmVCb3hUb3AoKTsgfQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uTGluZUxheW91dC5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25M aW5lTGF5b3V0LmNwcAppbmRleCA2NmMwZThkNjQ5NWEyM2I4NWMzMWYwOTY3YzI2NjU4MGE2ZGUw MzE3Li41ZWNmZTIzOWUxNjI2ZmQ1MDlkNmUxODdkY2MwMzA4ZjdjODIxY2RjIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25MaW5l TGF5b3V0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0 SW50ZWdyYXRpb25MaW5lTGF5b3V0LmNwcApAQCAtNDkzLDcgKzQ5Myw3IEBAIHZvaWQgTGluZUxh eW91dDo6cGFpbnQoUGFpbnRJbmZvJiBwYWludEluZm8sIGNvbnN0IExheW91dFBvaW50JiBwYWlu dE9mZnNldCkKICAgICAgICAgLy8gVGV4dFJ1biBleHBlY3RzIHRoZSB4UG9zIHRvIGJlIGFkanVz dGVkIHdpdGggdGhlIGFsaWdtZW50IG9mZnNldCAoZS5nLiB3aGVuIHRoZSBsaW5lIGlzIGNlbnRl ciBhbGlnbmVkCiAgICAgICAgIC8vIGFuZCB0aGUgcnVuIHN0YXJ0cyBhdCAxMDBweCwgZHVlIHRv IHRoZSBob3Jpem9udGFsIGFsaWdtZW50LCB0aGUgeHBvcyBpcyBzdXBwb3NlZCB0byBiZSBhdCAw cHgpLgogICAgICAgICBhdXRvJiBmb250Q2FzY2FkZSA9IHN0eWxlLmZvbnRDYXNjYWRlKCk7Ci0g ICAgICAgIGF1dG8geFBvcyA9IHJlY3QueCgpIC0gKGxpbmUubGluZUJveExlZnQoKSArIGxpbmUu Y29udGVudExlZnRPZmZzZXQoKSk7CisgICAgICAgIGF1dG8geFBvcyA9IHJlY3QueCgpIC0gKGxp bmUubGluZUJveExlZnQoKSArIGxpbmUuY29udGVudExlZnQoKSk7CiAgICAgICAgIFdlYkNvcmU6 OlRleHRSdW4gdGV4dFJ1biB7IHRleHRDb250ZW50LnJlbmRlcmVkQ29udGVudCgpLCB4UG9zLCBl eHBhbnNpb24uaG9yaXpvbnRhbEV4cGFuc2lvbiwgZXhwYW5zaW9uLmJlaGF2aW9yIH07CiAgICAg ICAgIHRleHRSdW4uc2V0VGFiU2l6ZSghc3R5bGUuY29sbGFwc2VXaGl0ZVNwYWNlKCksIHN0eWxl LnRhYlNpemUoKSk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3Jh dGlvbi9MYXlvdXRJbnRlZ3JhdGlvblBhZ2luYXRpb24uY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uUGFnaW5hdGlvbi5jcHAKaW5kZXggZGRi Y2RkYjk2Y2YzNzY4NmRiNjc4YzE4YWFkYWZkM2MyZDljMjkxZS4uNGFlY2I0N2UzOTQzODdiODFh OGRhNGU0ODkxOWRmOGEwYzIzOTM5MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uUGFnaW5hdGlvbi5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uUGFnaW5hdGlvbi5j cHAKQEAgLTEzNSw3ICsxMzUsNyBAQCBzdGF0aWMgUmVmPElubGluZUNvbnRlbnQ+IG1ha2VBZGp1 c3RlZENvbnRlbnQoY29uc3QgSW5saW5lQ29udGVudCYgaW5saW5lQ29udGVudAogICAgICAgICAg ICAgbW92ZVZlcnRpY2FsbHkobGluZS5zY3JvbGxhYmxlT3ZlcmZsb3coKSwgb2Zmc2V0KSwKICAg ICAgICAgICAgIG1vdmVWZXJ0aWNhbGx5KGxpbmUuaW5rT3ZlcmZsb3coKSwgb2Zmc2V0KSwKICAg ICAgICAgICAgIGxpbmUuYmFzZWxpbmUoKSwKLSAgICAgICAgICAgIGxpbmUuY29udGVudExlZnRP ZmZzZXQoKSwKKyAgICAgICAgICAgIGxpbmUuY29udGVudExlZnQoKSwKICAgICAgICAgICAgIGxp bmUuY29udGVudFdpZHRoKCkKICAgICAgICAgfTsKICAgICB9OwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uUnVuSXRlcmF0b3JN b2Rlcm5QYXRoLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50 ZWdyYXRpb25SdW5JdGVyYXRvck1vZGVyblBhdGguaAppbmRleCA0Yjk3YmRjOWRhODdhNGVkMmYx YTEzYTk5MWNiZTQ0MGEwMWMwMjM4Li5jYjcxMzFlZmIxZDJmODAwMzg2ZTYzZWI3MzY0NzZmNGFh ZTUwMDM5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5 b3V0SW50ZWdyYXRpb25SdW5JdGVyYXRvck1vZGVyblBhdGguaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25SdW5JdGVyYXRvck1vZGVyblBh dGguaApAQCAtMjIxLDcgKzIyMSw3IEBAIHByaXZhdGU6CiAgICAgICAgIGF1dG8mIHN0eWxlID0g cnVuKCkuc3R5bGUoKTsKICAgICAgICAgYXV0byBleHBhbnNpb24gPSBydW4oKS5leHBhbnNpb24o KTsKICAgICAgICAgYXV0byByZWN0ID0gdGhpcy0+cmVjdCgpOwotICAgICAgICBhdXRvIHhQb3Mg PSByZWN0LngoKSAtIChsaW5lKCkubGluZUJveExlZnQoKSArIGxpbmUoKS5jb250ZW50TGVmdE9m ZnNldCgpKTsKKyAgICAgICAgYXV0byB4UG9zID0gcmVjdC54KCkgLSAobGluZSgpLmxpbmVCb3hM ZWZ0KCkgKyBsaW5lKCkuY29udGVudExlZnQoKSk7CiAKICAgICAgICAgYXV0byB0ZXh0Rm9yUnVu ID0gWyZdIHsKICAgICAgICAgICAgIGlmIChoeXBoZW5Nb2RlID09IEh5cGhlbk1vZGU6Oklnbm9y ZSB8fCAhaGFzSHlwaGVuKCkpCg== 421778 2021-02-28 12:40:09 -0800 2021-02-28 16:13:18 -0800 Patch bug-222522-20210228124009.patch text/plain 15570 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjczNjM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2VkNzNlZTk0YzdhYmNm NTFhYjkzODJlOTA5ZGU1MzNhY2U0MzY5ZS4uMmM1OTA0OWM4YTBlOGVjNzdlNTY4NmU4Zjg3OGM5 N2Y3NzQ1M2EwOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDIxLTAyLTI4ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBDb250ZW50 IGxlZnQgb2Zmc2V0IG1lYW5zIGp1c3QgY29udGVudCBsZWZ0CisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjI1MjIKKworICAgICAgICBSZXZpZXdlZCBi eSBBbnR0aSBLb2l2aXN0by4KKworICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lu bGluZUZvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5 b3V0OjpMaW5lQm94QnVpbGRlcjo6YnVpbGQpOgorICAgICAgICAqIGxheW91dC9pbmxpbmVmb3Jt YXR0aW5nL0lubGluZUxpbmVCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5l Qm94OjpMaW5lQm94KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6bV9jb250ZW50TG9naWNh bFdpZHRoKToKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQm94 Lmg6CisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUdlb21ldHJ5 Lmg6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUxpbmVHZW9tZXRyeTo6Y29udGVu dExvZ2ljYWxMZWZ0IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lTGlu ZUdlb21ldHJ5OjpJbmxpbmVMaW5lR2VvbWV0cnkpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0 OjpJbmxpbmVMaW5lR2VvbWV0cnk6OmNvbnRlbnRMb2dpY2FsTGVmdE9mZnNldCBjb25zdCk6IERl bGV0ZWQuCisgICAgICAgICogbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uSW5s aW5lQ29udGVudEJ1aWxkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRp b246OklubGluZUNvbnRlbnRCdWlsZGVyOjpjcmVhdGVEaXNwbGF5TGluZXMgY29uc3QpOgorICAg ICAgICAqIGxheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmUuaDoKKyAgICAg ICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpMaW5lOjpMaW5lKToKKyAgICAgICAgKFdl YkNvcmU6OkxheW91dEludGVncmF0aW9uOjpMaW5lOjpjb250ZW50TGVmdCBjb25zdCk6CisgICAg ICAgIChXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6TGluZTo6Y29udGVudExlZnRPZmZzZXQg Y29uc3QpOiBEZWxldGVkLgorICAgICAgICAqIGxheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRl Z3JhdGlvbkxpbmVJdGVyYXRvck1vZGVyblBhdGguaDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91 dEludGVncmF0aW9uOjpMaW5lSXRlcmF0b3JNb2Rlcm5QYXRoOjpjb250ZW50TG9naWNhbExlZnQg Y29uc3QpOgorICAgICAgICAqIGxheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxp bmVMYXlvdXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246OkxpbmVM YXlvdXQ6OnBhaW50KToKKyAgICAgICAgKiBsYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdy YXRpb25QYWdpbmF0aW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9u OjptYWtlQWRqdXN0ZWRDb250ZW50KToKKyAgICAgICAgKiBsYXlvdXQvaW50ZWdyYXRpb24vTGF5 b3V0SW50ZWdyYXRpb25SdW5JdGVyYXRvck1vZGVyblBhdGguaDoKKyAgICAgICAgKFdlYkNvcmU6 OkxheW91dEludGVncmF0aW9uOjpSdW5JdGVyYXRvck1vZGVyblBhdGg6OmNyZWF0ZVRleHRSdW4g Y29uc3QpOgorCiAyMDIxLTAyLTI4ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAK ICAgICAgICAgW0xGQ11bSUZDXSBMaW5lQm94J3MgaG9yaXpvbnRhbEFsaWdubWVudE9mZnNldCBp cyB0aGUgcm9vdCBpbmxpbmUgYm94J3MgbG9naWNhbCBsZWZ0CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dEdl b21ldHJ5LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGlu ZUZvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCmluZGV4IGQ2ZDEyZmE4ZDljMDQxZTkxNGM3 NmQ4MmZlYjBiYTZmYWJkNjY3ZmEuLmUwZmYxOWYwMGQxOWNmODY4N2JkMWI1YjFlMTE4NDE0YjJl NmI1NjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5n L0lubGluZUZvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnku Y3BwCkBAIC0xNTgsNyArMTU4LDcgQEAgTGluZUJveCBMaW5lQm94QnVpbGRlcjo6YnVpbGQoY29u c3QgTGluZUJ1aWxkZXI6OkxpbmVDb250ZW50JiBsaW5lQ29udGVudCkKICAgICBhdXRvIGxpbmVM b2dpY2FsV2lkdGggPSBsaW5lQ29udGVudC5saW5lTG9naWNhbFdpZHRoOwogICAgIGF1dG8gY29u dGVudExvZ2ljYWxXaWR0aCA9IGxpbmVDb250ZW50LmNvbnRlbnRMb2dpY2FsV2lkdGg7CiAgICAg YXV0byBob3Jpem9udGFsQWxpZ25tZW50T2Zmc2V0ID0gTGF5b3V0Ojpob3Jpem9udGFsQWxpZ25t ZW50T2Zmc2V0KHJ1bnMsIHJvb3RCb3goKS5zdHlsZSgpLnRleHRBbGlnbigpLCBsaW5lTG9naWNh bFdpZHRoLCBjb250ZW50TG9naWNhbFdpZHRoLCBsaW5lQ29udGVudC5pc0xhc3RMaW5lV2l0aElu bGluZUNvbnRlbnQpOwotICAgIGF1dG8gbGluZUJveCA9IExpbmVCb3ggeyByb290Qm94KCksIGxp bmVDb250ZW50LmxvZ2ljYWxUb3BMZWZ0LCBsaW5lTG9naWNhbFdpZHRoLCBjb250ZW50TG9naWNh bFdpZHRoLCBob3Jpem9udGFsQWxpZ25tZW50T2Zmc2V0LCBydW5zLnNpemUoKSB9OworICAgIGF1 dG8gbGluZUJveCA9IExpbmVCb3ggeyByb290Qm94KCksIGxpbmVDb250ZW50LmxvZ2ljYWxUb3BM ZWZ0LCBsaW5lTG9naWNhbFdpZHRoLCBob3Jpem9udGFsQWxpZ25tZW50T2Zmc2V0LnZhbHVlT3Io SW5saW5lTGF5b3V0VW5pdCB7IH0pLCBjb250ZW50TG9naWNhbFdpZHRoLCBydW5zLnNpemUoKSB9 OwogCiAgICAgY29uc3RydWN0SW5saW5lTGV2ZWxCb3hlcyhsaW5lQm94LCBydW5zKTsKICAgICBp ZiAobV9pbmxpbmVMZXZlbEJveGVzTmVlZFZlcnRpY2FsQWxpZ25tZW50KQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQm94LmNw cAppbmRleCAwYWI1M2ZlOTljMzQ3ZTRmNzdkYTZkMGI5YTEwMTI4YjdiNTMxMThjLi44ZDBmODJh YTdhNTc3ZmRhMmFiZjY5NzM0YmUzNDcyMDc0N2JhZDU1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQm94LmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQm94LmNwcApAQCAt ODMsMTAgKzgzLDEwIEBAIGJvb2wgTGluZUJveDo6SW5saW5lTGV2ZWxCb3g6Omhhc0xpbmVCb3hS ZWxhdGl2ZUFsaWdubWVudCgpIGNvbnN0CiAgICAgcmV0dXJuIHZlcnRpY2FsQWxpZ25tZW50ID09 IFZlcnRpY2FsQWxpZ246OlRvcCB8fCB2ZXJ0aWNhbEFsaWdubWVudCA9PSBWZXJ0aWNhbEFsaWdu OjpCb3R0b207CiB9CiAKLUxpbmVCb3g6OkxpbmVCb3goY29uc3QgQm94JiByb290TGF5b3V0Qm94 LCBjb25zdCBJbmxpbmVMYXlvdXRQb2ludCYgbG9naWNhbFRvcGxlZnQsIElubGluZUxheW91dFVu aXQgbGluZUxvZ2ljYWxXaWR0aCwgSW5saW5lTGF5b3V0VW5pdCBjb250ZW50TG9naWNhbFdpZHRo LCBPcHRpb25hbDxJbmxpbmVMYXlvdXRVbml0PiBob3Jpem9udGFsQWxpZ25tZW50T2Zmc2V0LCBz aXplX3QgbnVtYmVyT2ZSdW5zKQorTGluZUJveDo6TGluZUJveChjb25zdCBCb3gmIHJvb3RMYXlv dXRCb3gsIGNvbnN0IElubGluZUxheW91dFBvaW50JiBsb2dpY2FsVG9wbGVmdCwgSW5saW5lTGF5 b3V0VW5pdCBsaW5lTG9naWNhbFdpZHRoLCBJbmxpbmVMYXlvdXRVbml0IGNvbnRlbnRMb2dpY2Fs TGVmdCwgSW5saW5lTGF5b3V0VW5pdCBjb250ZW50TG9naWNhbFdpZHRoLCBzaXplX3QgbnVtYmVy T2ZSdW5zKQogICAgIDogbV9sb2dpY2FsUmVjdChsb2dpY2FsVG9wbGVmdCwgSW5saW5lTGF5b3V0 U2l6ZSB7IGxpbmVMb2dpY2FsV2lkdGgsIHsgfSB9KQogICAgICwgbV9jb250ZW50TG9naWNhbFdp ZHRoKGNvbnRlbnRMb2dpY2FsV2lkdGgpCi0gICAgLCBtX3Jvb3RJbmxpbmVCb3gobWFrZVVuaXF1 ZVJlZjxMaW5lQm94OjpJbmxpbmVMZXZlbEJveD4ocm9vdExheW91dEJveCwgaG9yaXpvbnRhbEFs aWdubWVudE9mZnNldC52YWx1ZU9yKElubGluZUxheW91dFVuaXQgeyB9KSwgSW5saW5lTGF5b3V0 U2l6ZSB7IGNvbnRlbnRMb2dpY2FsV2lkdGgsIHsgfSB9LCBJbmxpbmVMZXZlbEJveDo6VHlwZTo6 Um9vdElubGluZUJveCkpCisgICAgLCBtX3Jvb3RJbmxpbmVCb3gobWFrZVVuaXF1ZVJlZjxMaW5l Qm94OjpJbmxpbmVMZXZlbEJveD4ocm9vdExheW91dEJveCwgY29udGVudExvZ2ljYWxMZWZ0LCBJ bmxpbmVMYXlvdXRTaXplIHsgY29udGVudExvZ2ljYWxXaWR0aCwgeyB9IH0sIElubGluZUxldmVs Qm94OjpUeXBlOjpSb290SW5saW5lQm94KSkKIHsKICAgICBtX25vblJvb3RJbmxpbmVMZXZlbEJv eExpc3QucmVzZXJ2ZUluaXRpYWxDYXBhY2l0eShudW1iZXJPZlJ1bnMpOwogICAgIG1faW5saW5l TGV2ZWxCb3hSZWN0TWFwLnJlc2VydmVJbml0aWFsQ2FwYWNpdHkobnVtYmVyT2ZSdW5zKTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxp bmVCb3guaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxp bmVCb3guaAppbmRleCAxYjdiZmM3YzkwNWMwOTdjNTM4NzExOWU1NzdkMWY3YTVkMWE3MWUzLi4w YzIzNDQ0NjZkNjI5MmMzNjlmZmFkM2ExYzgyNDk0NDYzM2UzZDkwIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQm94LmgKKysrIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5oCkBA IC0xMzEsNyArMTMxLDcgQEAgcHVibGljOgogICAgICAgICBUeXBlIG1fdHlwZSB7IFR5cGU6Oklu bGluZUJveCB9OwogICAgIH07CiAKLSAgICBMaW5lQm94KGNvbnN0IEJveCYgcm9vdExheW91dEJv eCwgY29uc3QgSW5saW5lTGF5b3V0UG9pbnQmIGxvZ2ljYWxUb3BMZWZ0LCBJbmxpbmVMYXlvdXRV bml0IGxpbmVMb2dpY2FsV2lkdGgsIElubGluZUxheW91dFVuaXQgY29udGVudExvZ2ljYWxXaWR0 aCwgT3B0aW9uYWw8SW5saW5lTGF5b3V0VW5pdD4gaG9yaXpvbnRhbEFsaWdubWVudE9mZnNldCwg c2l6ZV90IG51bWJlck9mUnVucyk7CisgICAgTGluZUJveChjb25zdCBCb3gmIHJvb3RMYXlvdXRC b3gsIGNvbnN0IElubGluZUxheW91dFBvaW50JiBsb2dpY2FsVG9wTGVmdCwgSW5saW5lTGF5b3V0 VW5pdCBjb250ZW50TG9naWNhbExlZnQsIElubGluZUxheW91dFVuaXQgbGluZUxvZ2ljYWxXaWR0 aCwgSW5saW5lTGF5b3V0VW5pdCBjb250ZW50TG9naWNhbFdpZHRoLCBzaXplX3QgbnVtYmVyT2ZS dW5zKTsKIAogICAgIGNvbnN0IElubGluZVJlY3QmIGxvZ2ljYWxSZWN0KCkgY29uc3QgeyByZXR1 cm4gbV9sb2dpY2FsUmVjdDsgfQogICAgIElubGluZUxheW91dFVuaXQgbG9naWNhbFdpZHRoKCkg Y29uc3QgeyByZXR1cm4gbG9naWNhbFNpemUoKS53aWR0aCgpOyB9CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lR2VvbWV0cnkuaCBi L1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVHZW9tZXRy eS5oCmluZGV4IGFmYWM0Y2E2M2IzZDUyYjEzNTRhZjQyZDMwN2ViOWRjMDhmNDQ3ZjguLmQ2YTJj NThhMDc2ZTQ5YzJjZDNjOWUyZjkyYWIzNmQwM2YyNzI5ZTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVHZW9tZXRyeS5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVHZW9tZXRy eS5oCkBAIC00MCw3ICs0MCw3IEBAIHB1YmxpYzoKICAgICAgICAgSW5saW5lTGF5b3V0VW5pdCB0 b3AgeyAwIH07CiAgICAgICAgIElubGluZUxheW91dFVuaXQgYm90dG9tIHsgMCB9OwogICAgIH07 Ci0gICAgSW5saW5lTGluZUdlb21ldHJ5KGNvbnN0IElubGluZVJlY3QmIGxpbmVCb3hMb2dpY2Fs UmVjdCwgRW5jbG9zaW5nVG9wQW5kQm90dG9tLCBJbmxpbmVMYXlvdXRVbml0IGFsaWdtZW50QmFz ZWxpbmUsIElubGluZUxheW91dFVuaXQgY29udGVudExvZ2ljYWxMZWZ0T2Zmc2V0LCBJbmxpbmVM YXlvdXRVbml0IGNvbnRlbnRMb2dpY2FsV2lkdGgpOworICAgIElubGluZUxpbmVHZW9tZXRyeShj b25zdCBJbmxpbmVSZWN0JiBsaW5lQm94TG9naWNhbFJlY3QsIEVuY2xvc2luZ1RvcEFuZEJvdHRv bSwgSW5saW5lTGF5b3V0VW5pdCBhbGlnbWVudEJhc2VsaW5lLCBJbmxpbmVMYXlvdXRVbml0IGNv bnRlbnRMb2dpY2FsTGVmdCwgSW5saW5lTGF5b3V0VW5pdCBjb250ZW50TG9naWNhbFdpZHRoKTsK IAogICAgIGNvbnN0IElubGluZVJlY3QmIGxpbmVCb3hMb2dpY2FsUmVjdCgpIGNvbnN0IHsgcmV0 dXJuIG1fbGluZUJveExvZ2ljYWxSZWN0OyB9CiAKQEAgLTQ4LDcgKzQ4LDcgQEAgcHVibGljOgog CiAgICAgSW5saW5lTGF5b3V0VW5pdCBiYXNlbGluZSgpIGNvbnN0IHsgcmV0dXJuIG1fYWxpZ21l bnRCYXNlbGluZTsgfQogCi0gICAgSW5saW5lTGF5b3V0VW5pdCBjb250ZW50TG9naWNhbExlZnRP ZmZzZXQoKSBjb25zdCB7IHJldHVybiBtX2NvbnRlbnRMb2dpY2FsTGVmdE9mZnNldDsgfQorICAg IElubGluZUxheW91dFVuaXQgY29udGVudExvZ2ljYWxMZWZ0KCkgY29uc3QgeyByZXR1cm4gbV9j b250ZW50TG9naWNhbExlZnQ7IH0KICAgICBJbmxpbmVMYXlvdXRVbml0IGNvbnRlbnRMb2dpY2Fs V2lkdGgoKSBjb25zdCB7IHJldHVybiBtX2NvbnRlbnRMb2dpY2FsV2lkdGg7IH0KIAogICAgIHZv aWQgbW92ZVZlcnRpY2FsbHkoSW5saW5lTGF5b3V0VW5pdCBvZmZzZXQpIHsgbV9saW5lQm94TG9n aWNhbFJlY3QubW92ZVZlcnRpY2FsbHkob2Zmc2V0KTsgfQpAQCAtNjEsMTUgKzYxLDE1IEBAIHBy aXZhdGU6CiAgICAgLy8gdGhlIGxheW91dCBib3VuZHMgb2YgdGhlIGlubGluZSBsZXZlbCBib3hl cyB3aGljaCBtYXkgYmUgZGlmZmVyZW50IHdoZW4gbGluZS1oZWlnaHQgaXMgcHJlc2VudC4KICAg ICBFbmNsb3NpbmdUb3BBbmRCb3R0b20gbV9lbmNsb3NpbmdUb3BBbmRCb3R0b207CiAgICAgSW5s aW5lTGF5b3V0VW5pdCBtX2FsaWdtZW50QmFzZWxpbmUgeyAwIH07Ci0gICAgSW5saW5lTGF5b3V0 VW5pdCBtX2NvbnRlbnRMb2dpY2FsTGVmdE9mZnNldCB7IDAgfTsKKyAgICBJbmxpbmVMYXlvdXRV bml0IG1fY29udGVudExvZ2ljYWxMZWZ0IHsgMCB9OwogICAgIElubGluZUxheW91dFVuaXQgbV9j b250ZW50TG9naWNhbFdpZHRoIHsgMCB9OwogfTsKIAotaW5saW5lIElubGluZUxpbmVHZW9tZXRy eTo6SW5saW5lTGluZUdlb21ldHJ5KGNvbnN0IElubGluZVJlY3QmIGxpbmVCb3hMb2dpY2FsUmVj dCwgRW5jbG9zaW5nVG9wQW5kQm90dG9tIGVuY2xvc2luZ1RvcEFuZEJvdHRvbSwgSW5saW5lTGF5 b3V0VW5pdCBhbGlnbWVudEJhc2VsaW5lLCBJbmxpbmVMYXlvdXRVbml0IGNvbnRlbnRMb2dpY2Fs TGVmdE9mZnNldCwgSW5saW5lTGF5b3V0VW5pdCBjb250ZW50TG9naWNhbFdpZHRoKQoraW5saW5l IElubGluZUxpbmVHZW9tZXRyeTo6SW5saW5lTGluZUdlb21ldHJ5KGNvbnN0IElubGluZVJlY3Qm IGxpbmVCb3hMb2dpY2FsUmVjdCwgRW5jbG9zaW5nVG9wQW5kQm90dG9tIGVuY2xvc2luZ1RvcEFu ZEJvdHRvbSwgSW5saW5lTGF5b3V0VW5pdCBhbGlnbWVudEJhc2VsaW5lLCBJbmxpbmVMYXlvdXRV bml0IGNvbnRlbnRMb2dpY2FsTGVmdCwgSW5saW5lTGF5b3V0VW5pdCBjb250ZW50TG9naWNhbFdp ZHRoKQogICAgIDogbV9saW5lQm94TG9naWNhbFJlY3QobGluZUJveExvZ2ljYWxSZWN0KQogICAg ICwgbV9lbmNsb3NpbmdUb3BBbmRCb3R0b20oZW5jbG9zaW5nVG9wQW5kQm90dG9tKQogICAgICwg bV9hbGlnbWVudEJhc2VsaW5lKGFsaWdtZW50QmFzZWxpbmUpCi0gICAgLCBtX2NvbnRlbnRMb2dp Y2FsTGVmdE9mZnNldChjb250ZW50TG9naWNhbExlZnRPZmZzZXQpCisgICAgLCBtX2NvbnRlbnRM b2dpY2FsTGVmdChjb250ZW50TG9naWNhbExlZnQpCiAgICAgLCBtX2NvbnRlbnRMb2dpY2FsV2lk dGgoY29udGVudExvZ2ljYWxXaWR0aCkKIHsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbklubGluZUNvbnRlbnRCdWlsZGVy LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlv bklubGluZUNvbnRlbnRCdWlsZGVyLmNwcAppbmRleCA4NjllNDc1NzM0NmNjMTBmYjJmNjViYmQ2 Y2NhMGUzMTEwN2UxZjkyLi4yYjFhZTc5MmJjYmExMTNhMGUyMjFmMTg4ZmZkZmM3MjU0N2Y2NjJl IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50 ZWdyYXRpb25JbmxpbmVDb250ZW50QnVpbGRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uSW5saW5lQ29udGVudEJ1aWxkZXIuY3Bw CkBAIC0zNTksNyArMzU5LDcgQEAgdm9pZCBJbmxpbmVDb250ZW50QnVpbGRlcjo6Y3JlYXRlRGlz cGxheUxpbmVzKGNvbnN0IExheW91dDo6SW5saW5lRm9ybWF0dGluZ1N0YXQKICAgICAgICAgICAg IGVuY2xvc2luZ1RvcEFuZEJvdHRvbS5ib3R0b20gPSByb3VuZFRvSW50KGVuY2xvc2luZ1RvcEFu ZEJvdHRvbS5ib3R0b20pOwogICAgICAgICB9CiAgICAgICAgIGF1dG8gcnVuQ291bnQgPSBydW5J bmRleCAtIGZpcnN0UnVuSW5kZXg7Ci0gICAgICAgIGlubGluZUNvbnRlbnQubGluZXMuYXBwZW5k KHsgZmlyc3RSdW5JbmRleCwgcnVuQ291bnQsIGFkanVzdGVkTGluZUJveFJlY3QsIGVuY2xvc2lu Z1RvcEFuZEJvdHRvbS50b3AsIGVuY2xvc2luZ1RvcEFuZEJvdHRvbS5ib3R0b20sIHNjcm9sbGFi bGVPdmVyZmxvd1JlY3QsIGxpbmVJbmtPdmVyZmxvd1JlY3QsIGxpbmUuYmFzZWxpbmUoKSwgbGlu ZS5jb250ZW50TG9naWNhbExlZnRPZmZzZXQoKSwgbGluZS5jb250ZW50TG9naWNhbFdpZHRoKCkg fSk7CisgICAgICAgIGlubGluZUNvbnRlbnQubGluZXMuYXBwZW5kKHsgZmlyc3RSdW5JbmRleCwg cnVuQ291bnQsIGFkanVzdGVkTGluZUJveFJlY3QsIGVuY2xvc2luZ1RvcEFuZEJvdHRvbS50b3As IGVuY2xvc2luZ1RvcEFuZEJvdHRvbS5ib3R0b20sIHNjcm9sbGFibGVPdmVyZmxvd1JlY3QsIGxp bmVJbmtPdmVyZmxvd1JlY3QsIGxpbmUuYmFzZWxpbmUoKSwgbGluZS5jb250ZW50TG9naWNhbExl ZnQoKSwgbGluZS5jb250ZW50TG9naWNhbFdpZHRoKCkgfSk7CiAgICAgfQogfQogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25M aW5lLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRp b25MaW5lLmgKaW5kZXggMmYxMTgwM2I1YmJlZWQ0NjIzNzdmMTZmZTQxNjNmZWM4ZTJiNDQ1Mi4u ZDJkYzU3ZmM1M2JkOGExM2UxNjRmYWI5YmM1Y2JkZmRmMTk5ZDBmMiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uTGluZS5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxp bmUuaApAQCAtMzYsNyArMzYsNyBAQCBuYW1lc3BhY2UgTGF5b3V0SW50ZWdyYXRpb24gewogY2xh c3MgTGluZSB7CiAgICAgV1RGX01BS0VfRkFTVF9BTExPQ0FURUQ7CiBwdWJsaWM6Ci0gICAgTGlu ZShzaXplX3QgZmlyc3RSdW5JbmRleCwgc2l6ZV90IHJ1bkNvdW50LCBjb25zdCBGbG9hdFJlY3Qm IGxpbmVCb3hSZWN0LCBmbG9hdCBlbmNsb3NpbmdDb250ZW50VG9wLCBmbG9hdCBlbmNsb3NpbmdD b250ZW50Qm90dG9tLCBjb25zdCBGbG9hdFJlY3QmIHNjcm9sbGFibGVPdmVyZmxvdywgY29uc3Qg RmxvYXRSZWN0JiBpbmtPdmVyZmxvdywgZmxvYXQgYmFzZWxpbmUsIGZsb2F0IGNvbnRlbnRMZWZ0 T2Zmc2V0LCBmbG9hdCBjb250ZW50V2lkdGgpCisgICAgTGluZShzaXplX3QgZmlyc3RSdW5JbmRl eCwgc2l6ZV90IHJ1bkNvdW50LCBjb25zdCBGbG9hdFJlY3QmIGxpbmVCb3hSZWN0LCBmbG9hdCBl bmNsb3NpbmdDb250ZW50VG9wLCBmbG9hdCBlbmNsb3NpbmdDb250ZW50Qm90dG9tLCBjb25zdCBG bG9hdFJlY3QmIHNjcm9sbGFibGVPdmVyZmxvdywgY29uc3QgRmxvYXRSZWN0JiBpbmtPdmVyZmxv dywgZmxvYXQgYmFzZWxpbmUsIGZsb2F0IGNvbnRlbnRMZWZ0LCBmbG9hdCBjb250ZW50V2lkdGgp CiAgICAgICAgIDogbV9maXJzdFJ1bkluZGV4KGZpcnN0UnVuSW5kZXgpCiAgICAgICAgICwgbV9y dW5Db3VudChydW5Db3VudCkKICAgICAgICAgLCBtX2xpbmVCb3hSZWN0KGxpbmVCb3hSZWN0KQpA QCAtNDUsNyArNDUsNyBAQCBwdWJsaWM6CiAgICAgICAgICwgbV9zY3JvbGxhYmxlT3ZlcmZsb3co c2Nyb2xsYWJsZU92ZXJmbG93KQogICAgICAgICAsIG1faW5rT3ZlcmZsb3coaW5rT3ZlcmZsb3cp CiAgICAgICAgICwgbV9iYXNlbGluZShiYXNlbGluZSkKLSAgICAgICAgLCBtX2NvbnRlbnRMZWZ0 T2Zmc2V0KGNvbnRlbnRMZWZ0T2Zmc2V0KQorICAgICAgICAsIG1fY29udGVudExlZnQoY29udGVu dExlZnQpCiAgICAgICAgICwgbV9jb250ZW50V2lkdGgoY29udGVudFdpZHRoKQogICAgIHsKICAg ICB9CkBAIC02Niw3ICs2Niw3IEBAIHB1YmxpYzoKIAogICAgIGZsb2F0IGJhc2VsaW5lKCkgY29u c3QgeyByZXR1cm4gbV9iYXNlbGluZTsgfQogCi0gICAgZmxvYXQgY29udGVudExlZnRPZmZzZXQo KSBjb25zdCB7IHJldHVybiBtX2NvbnRlbnRMZWZ0T2Zmc2V0OyB9CisgICAgZmxvYXQgY29udGVu dExlZnQoKSBjb25zdCB7IHJldHVybiBtX2NvbnRlbnRMZWZ0OyB9CiAgICAgZmxvYXQgY29udGVu dFdpZHRoKCkgY29uc3QgeyByZXR1cm4gbV9jb250ZW50V2lkdGg7IH0KIAogcHJpdmF0ZToKQEAg LTgyLDcgKzgyLDcgQEAgcHJpdmF0ZToKICAgICBGbG9hdFJlY3QgbV9zY3JvbGxhYmxlT3ZlcmZs b3c7CiAgICAgRmxvYXRSZWN0IG1faW5rT3ZlcmZsb3c7CiAgICAgZmxvYXQgbV9iYXNlbGluZSB7 IDAgfTsKLSAgICBmbG9hdCBtX2NvbnRlbnRMZWZ0T2Zmc2V0IHsgMCB9OworICAgIGZsb2F0IG1f Y29udGVudExlZnQgeyAwIH07CiAgICAgZmxvYXQgbV9jb250ZW50V2lkdGggeyAwIH07CiB9Owog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50 ZWdyYXRpb25MaW5lSXRlcmF0b3JNb2Rlcm5QYXRoLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv aW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25MaW5lSXRlcmF0b3JNb2Rlcm5QYXRoLmgKaW5k ZXggMzBlM2VkNDYzOWQ1YzQyY2YwNTMzOGQ3ZGNhZmEyOTVmZjZlNWRhZi4uODkyN2RjNGI3OGM0 NTRiNmIwYmFiMDgzMTc4ZGYwNTFjZThjY2FjYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv bGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uTGluZUl0ZXJhdG9yTW9kZXJuUGF0 aC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3Jh dGlvbkxpbmVJdGVyYXRvck1vZGVyblBhdGguaApAQCAtNTksNyArNTksNyBAQCBwdWJsaWM6CiAg ICAgTGF5b3V0VW5pdCBzZWxlY3Rpb25Ub3BGb3JIaXRUZXN0aW5nKCkgY29uc3QgeyByZXR1cm4g dG9wKCk7IH0KICAgICBMYXlvdXRVbml0IHNlbGVjdGlvbkJvdHRvbSgpIGNvbnN0IHsgcmV0dXJu IGJvdHRvbSgpOyB9CiAKLSAgICBmbG9hdCBjb250ZW50TG9naWNhbExlZnQoKSBjb25zdCB7IHJl dHVybiBsaW5lKCkubGluZUJveExlZnQoKSArIGxpbmUoKS5jb250ZW50TGVmdE9mZnNldCgpOyB9 CisgICAgZmxvYXQgY29udGVudExvZ2ljYWxMZWZ0KCkgY29uc3QgeyByZXR1cm4gbGluZSgpLmxp bmVCb3hMZWZ0KCkgKyBsaW5lKCkuY29udGVudExlZnQoKTsgfQogICAgIGZsb2F0IGNvbnRlbnRM b2dpY2FsUmlnaHQoKSBjb25zdCB7IHJldHVybiBjb250ZW50TG9naWNhbExlZnQoKSArIGxpbmUo KS5jb250ZW50V2lkdGgoKTsgfQogICAgIGZsb2F0IHkoKSBjb25zdCB7IHJldHVybiBsaW5lQm94 VG9wKCk7IH0KICAgICBmbG9hdCBsb2dpY2FsSGVpZ2h0KCkgY29uc3QgeyByZXR1cm4gbGluZUJv eEJvdHRvbSgpIC0gbGluZUJveFRvcCgpOyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25MaW5lTGF5b3V0LmNwcCBiL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlvdXQu Y3BwCmluZGV4IDY2YzBlOGQ2NDk1YTIzYjg1YzMxZjA5NjdjMjY2NTgwYTZkZTAzMTcuLjVlY2Zl MjM5ZTE2MjZmZDUwOWQ2ZTE4N2RjYzAzMDhmN2M4MjFjZGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlvdXQuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlv bkxpbmVMYXlvdXQuY3BwCkBAIC00OTMsNyArNDkzLDcgQEAgdm9pZCBMaW5lTGF5b3V0OjpwYWlu dChQYWludEluZm8mIHBhaW50SW5mbywgY29uc3QgTGF5b3V0UG9pbnQmIHBhaW50T2Zmc2V0KQog ICAgICAgICAvLyBUZXh0UnVuIGV4cGVjdHMgdGhlIHhQb3MgdG8gYmUgYWRqdXN0ZWQgd2l0aCB0 aGUgYWxpZ21lbnQgb2Zmc2V0IChlLmcuIHdoZW4gdGhlIGxpbmUgaXMgY2VudGVyIGFsaWduZWQK ICAgICAgICAgLy8gYW5kIHRoZSBydW4gc3RhcnRzIGF0IDEwMHB4LCBkdWUgdG8gdGhlIGhvcml6 b250YWwgYWxpZ21lbnQsIHRoZSB4cG9zIGlzIHN1cHBvc2VkIHRvIGJlIGF0IDBweCkuCiAgICAg ICAgIGF1dG8mIGZvbnRDYXNjYWRlID0gc3R5bGUuZm9udENhc2NhZGUoKTsKLSAgICAgICAgYXV0 byB4UG9zID0gcmVjdC54KCkgLSAobGluZS5saW5lQm94TGVmdCgpICsgbGluZS5jb250ZW50TGVm dE9mZnNldCgpKTsKKyAgICAgICAgYXV0byB4UG9zID0gcmVjdC54KCkgLSAobGluZS5saW5lQm94 TGVmdCgpICsgbGluZS5jb250ZW50TGVmdCgpKTsKICAgICAgICAgV2ViQ29yZTo6VGV4dFJ1biB0 ZXh0UnVuIHsgdGV4dENvbnRlbnQucmVuZGVyZWRDb250ZW50KCksIHhQb3MsIGV4cGFuc2lvbi5o b3Jpem9udGFsRXhwYW5zaW9uLCBleHBhbnNpb24uYmVoYXZpb3IgfTsKICAgICAgICAgdGV4dFJ1 bi5zZXRUYWJTaXplKCFzdHlsZS5jb2xsYXBzZVdoaXRlU3BhY2UoKSwgc3R5bGUudGFiU2l6ZSgp KTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91 dEludGVncmF0aW9uUGFnaW5hdGlvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdy YXRpb24vTGF5b3V0SW50ZWdyYXRpb25QYWdpbmF0aW9uLmNwcAppbmRleCBkZGJjZGRiOTZjZjM3 Njg2ZGI2NzhjMThhYWRhZmQzYzJkOWMyOTFlLi40YWVjYjQ3ZTM5NDM4N2I4MWE4ZGE0ZTQ4OTE5 ZGY4YTBjMjM5MzkxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRp b24vTGF5b3V0SW50ZWdyYXRpb25QYWdpbmF0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25QYWdpbmF0aW9uLmNwcApAQCAtMTM1 LDcgKzEzNSw3IEBAIHN0YXRpYyBSZWY8SW5saW5lQ29udGVudD4gbWFrZUFkanVzdGVkQ29udGVu dChjb25zdCBJbmxpbmVDb250ZW50JiBpbmxpbmVDb250ZW50CiAgICAgICAgICAgICBtb3ZlVmVy dGljYWxseShsaW5lLnNjcm9sbGFibGVPdmVyZmxvdygpLCBvZmZzZXQpLAogICAgICAgICAgICAg bW92ZVZlcnRpY2FsbHkobGluZS5pbmtPdmVyZmxvdygpLCBvZmZzZXQpLAogICAgICAgICAgICAg bGluZS5iYXNlbGluZSgpLAotICAgICAgICAgICAgbGluZS5jb250ZW50TGVmdE9mZnNldCgpLAor ICAgICAgICAgICAgbGluZS5jb250ZW50TGVmdCgpLAogICAgICAgICAgICAgbGluZS5jb250ZW50 V2lkdGgoKQogICAgICAgICB9OwogICAgIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25SdW5JdGVyYXRvck1vZGVyblBhdGgu aCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvblJ1 bkl0ZXJhdG9yTW9kZXJuUGF0aC5oCmluZGV4IDRiOTdiZGM5ZGE4N2E0ZWQyZjFhMTNhOTkxY2Jl NDQwYTAxYzAyMzguLmNiNzEzMWVmYjFkMmY4MDAzODZlNjNlYjczNjQ3NmY0YWFlNTAwMzkgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3Jh dGlvblJ1bkl0ZXJhdG9yTW9kZXJuUGF0aC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9p bnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvblJ1bkl0ZXJhdG9yTW9kZXJuUGF0aC5oCkBAIC0y MjEsNyArMjIxLDcgQEAgcHJpdmF0ZToKICAgICAgICAgYXV0byYgc3R5bGUgPSBydW4oKS5zdHls ZSgpOwogICAgICAgICBhdXRvIGV4cGFuc2lvbiA9IHJ1bigpLmV4cGFuc2lvbigpOwogICAgICAg ICBhdXRvIHJlY3QgPSB0aGlzLT5yZWN0KCk7Ci0gICAgICAgIGF1dG8geFBvcyA9IHJlY3QueCgp IC0gKGxpbmUoKS5saW5lQm94TGVmdCgpICsgbGluZSgpLmNvbnRlbnRMZWZ0T2Zmc2V0KCkpOwor ICAgICAgICBhdXRvIHhQb3MgPSByZWN0LngoKSAtIChsaW5lKCkubGluZUJveExlZnQoKSArIGxp bmUoKS5jb250ZW50TGVmdCgpKTsKIAogICAgICAgICBhdXRvIHRleHRGb3JSdW4gPSBbJl0gewog ICAgICAgICAgICAgaWYgKGh5cGhlbk1vZGUgPT0gSHlwaGVuTW9kZTo6SWdub3JlIHx8ICFoYXNI eXBoZW4oKSkK