219230 2020-11-20 16:27:54 -0800 [LFC][Integration] LayoutIntegration::Line::rect is way too ambiguous 2020-11-21 09:04:29 -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 1709696 0 zalan 2020-11-20 16:27:54 -0800 let's use lineBox* helpers instead 1709697 1 414744 zalan 2020-11-20 16:31:17 -0800 Created attachment 414744 Patch 1709731 2 414744 koivisto 2020-11-20 22:23:11 -0800 Comment on attachment 414744 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=414744&action=review > Source/WebCore/layout/integration/LayoutIntegrationLineIteratorModernPath.h:62 > - LayoutUnit lineBoxTop() const { return LayoutUnit::fromFloatRound(line().rect().y()); } > - LayoutUnit lineBoxBottom() const { return LayoutUnit::fromFloatRound(line().rect().maxY()); } > + LayoutUnit lineBoxTop() const { return LayoutUnit::fromFloatRound(line().lineBoxTop()); } > + LayoutUnit lineBoxBottom() const { return LayoutUnit::fromFloatRound(line().lineBoxBottom()); } > > // FIXME: What should these really be? > LayoutUnit selectionTop() const { return top(); } > LayoutUnit selectionTopForHitTesting() const { return top(); } > LayoutUnit selectionBottom() const { return bottom(); } > > - float contentLogicalLeft() const { return line().rect().x() + line().contentLeftOffset(); } > + float contentLogicalLeft() const { return line().lineBoxLeft() + line().contentLeftOffset(); } Much better! 1709754 3 414760 zalan 2020-11-21 06:13:59 -0800 Created attachment 414760 Patch 1709756 4 ews-feeder 2020-11-21 07:15:43 -0800 Committed r270146: <https://trac.webkit.org/changeset/270146> All reviewed patches have been landed. Closing bug and clearing flags on attachment 414760. 1709757 5 webkit-bug-importer 2020-11-21 07:16:18 -0800 <rdar://problem/71655183> 414744 2020-11-20 16:31:17 -0800 2020-11-21 06:13:58 -0800 Patch bug-219230-20201120163116.patch text/plain 11706 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjcwMTIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjJkMDNlZjliY2EwZjM2 MTE3NjMyMTlhM2NhMzk4ZGU0NDY3OTViYS4uNWI4NDcyZDM3ZDBkYmYzNmQxZGFlZDU5MjM0MDIz OGY2YjlkNzYyMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDIwLTExLTIwICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSW50ZWdyYXRpb25d IExheW91dEludGVncmF0aW9uOjpMaW5lOjpyZWN0IGlzIHdheSB0b28gYW1iaWd1b3VzCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTkyMzAKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBMaW5lOjpyZWN0KCkg aXMgYWN0dWFsbHkgdGhlIGxpbmUgYm94IChzZWUgaHR0cHM6Ly93d3cudzMub3JnL1RSL2Nzcy1p bmxpbmUtMy8jbGluZS1ib3gpLgorCisgICAgICAgICogbGF5b3V0L2ludGVncmF0aW9uL0xheW91 dEludGVncmF0aW9uTGluZS5oOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246 OkxpbmU6OmxpbmVCb3hUb3AgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdy YXRpb246OkxpbmU6OmxpbmVCb3hCb3R0b20gY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5 b3V0SW50ZWdyYXRpb246OkxpbmU6OmxpbmVCb3hMZWZ0IGNvbnN0KToKKyAgICAgICAgKFdlYkNv cmU6OkxheW91dEludGVncmF0aW9uOjpMaW5lOjpsaW5lQm94UmlnaHQgY29uc3QpOgorICAgICAg ICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246OkxpbmU6OnJlY3QgY29uc3QpOiBEZWxldGVk LgorICAgICAgICAqIGxheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVJdGVy YXRvck1vZGVyblBhdGguaDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpM aW5lSXRlcmF0b3JNb2Rlcm5QYXRoOjpsaW5lQm94VG9wIGNvbnN0KToKKyAgICAgICAgKFdlYkNv cmU6OkxheW91dEludGVncmF0aW9uOjpMaW5lSXRlcmF0b3JNb2Rlcm5QYXRoOjpsaW5lQm94Qm90 dG9tIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpMaW5lSXRl cmF0b3JNb2Rlcm5QYXRoOjpjb250ZW50TG9naWNhbExlZnQgY29uc3QpOgorICAgICAgICAoV2Vi Q29yZTo6TGF5b3V0SW50ZWdyYXRpb246OkxpbmVJdGVyYXRvck1vZGVyblBhdGg6OmxvZ2ljYWxI ZWlnaHQgY29uc3QpOgorICAgICAgICAqIGxheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3Jh dGlvbkxpbmVMYXlvdXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246 OkxpbmVMYXlvdXQ6OmNvbnRlbnRMb2dpY2FsSGVpZ2h0IGNvbnN0KToKKyAgICAgICAgKFdlYkNv cmU6OkxheW91dEludGVncmF0aW9uOjpMaW5lTGF5b3V0OjpmaXJzdExpbmVCYXNlbGluZSBjb25z dCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6TGluZUxheW91dDo6bGFz dExpbmVCYXNlbGluZSBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlv bjo6TGluZUxheW91dDo6YWRqdXN0Rm9yUGFnaW5hdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpM YXlvdXRJbnRlZ3JhdGlvbjo6TGluZUxheW91dDo6cGFpbnQpOgorICAgICAgICAqIGxheW91dC9p bnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvblBhZ2luYXRpb24uY3BwOgorICAgICAgICAoV2Vi Q29yZTo6TGF5b3V0SW50ZWdyYXRpb246OnVwZGF0ZU1pbmltdW1QYWdlSGVpZ2h0KToKKyAgICAg ICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjptYWtlQWRqdXN0ZWRDb250ZW50KToKKyAg ICAgICAgKiBsYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25SdW5JdGVyYXRvck1v ZGVyblBhdGguaDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpSdW5JdGVy YXRvck1vZGVyblBhdGg6OmNyZWF0ZVRleHRSdW4gY29uc3QpOgorCiAyMDIwLTExLTIwICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xGQ11bSW50ZWdyYXRpb25d IFJlbW92ZSByZWR1bmRhbnQgbGluZUJveFdpZHRoIGZyb20gTGluZQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uTGluZS5oIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uTGluZS5o CmluZGV4IDQ2YTdhNGNiMzI2OTkyOGM2ZjU1NWY2MzNkMzg2MDI0YjU2ZWRlZDEuLmU1ODFkMDA2 Y2E4ZDdiY2I2MDQzYTc5MWIxZmE5ZDM2YzhiZTI2MWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmUuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25MaW5lLmgKQEAg LTU1LDEyICs1NSwyMCBAQCBwdWJsaWM6CiAKICAgICBzaXplX3QgZmlyc3RSdW5JbmRleCgpIGNv bnN0IHsgcmV0dXJuIG1fZmlyc3RSdW5JbmRleDsgfQogICAgIHNpemVfdCBydW5Db3VudCgpIGNv bnN0IHsgcmV0dXJuIG1fcnVuQ291bnQ7IH0KLSAgICBjb25zdCBGbG9hdFJlY3QmIHJlY3QoKSBj b25zdCB7IHJldHVybiBtX2xpbmVCb3hSZWN0OyB9CisKKyAgICBmbG9hdCBsaW5lQm94VG9wKCkg Y29uc3QgeyByZXR1cm4gbV9saW5lQm94UmVjdC55KCk7IH0KKyAgICBmbG9hdCBsaW5lQm94Qm90 dG9tKCkgY29uc3QgeyByZXR1cm4gbV9saW5lQm94UmVjdC5tYXhZKCk7IH0KKyAgICBmbG9hdCBs aW5lQm94TGVmdCgpIGNvbnN0IHsgcmV0dXJuIG1fbGluZUJveFJlY3QueCgpOyB9CisgICAgZmxv YXQgbGluZUJveFJpZ2h0KCkgY29uc3QgeyByZXR1cm4gbV9saW5lQm94UmVjdC5tYXhYKCk7IH0K KwogICAgIGZsb2F0IGVuY2xvc2luZ0NvbnRlbnRUb3AoKSBjb25zdCB7IHJldHVybiBtX2VuY2xv c2luZ1RvcEFuZEJvdHRvbS50b3A7IH0KICAgICBmbG9hdCBlbmNsb3NpbmdDb250ZW50Qm90dG9t KCkgY29uc3QgeyByZXR1cm4gbV9lbmNsb3NpbmdUb3BBbmRCb3R0b20uYm90dG9tOyB9CisKICAg ICBjb25zdCBGbG9hdFJlY3QmIHNjcm9sbGFibGVPdmVyZmxvdygpIGNvbnN0IHsgcmV0dXJuIG1f c2Nyb2xsYWJsZU92ZXJmbG93OyB9CiAgICAgY29uc3QgRmxvYXRSZWN0JiBpbmtPdmVyZmxvdygp IGNvbnN0IHsgcmV0dXJuIG1faW5rT3ZlcmZsb3c7IH0KKwogICAgIGZsb2F0IGJhc2VsaW5lKCkg Y29uc3QgeyByZXR1cm4gbV9iYXNlbGluZTsgfQorCiAgICAgZmxvYXQgY29udGVudExlZnRPZmZz ZXQoKSBjb25zdCB7IHJldHVybiBtX2NvbnRlbnRMZWZ0T2Zmc2V0OyB9CiAgICAgZmxvYXQgY29u dGVudFdpZHRoKCkgY29uc3QgeyByZXR1cm4gbV9jb250ZW50V2lkdGg7IH0KIApAQCAtNjksOCAr NzcsOSBAQCBwcml2YXRlOgogICAgIHNpemVfdCBtX3J1bkNvdW50IHsgMCB9OwogICAgIC8vIFRo aXMgaXMgbGluZSBib3ggZ2VvbWV0cnkgKHNlZSBodHRwczovL3d3dy53My5vcmcvVFIvY3NzLWlu bGluZS0zLyNsaW5lLWJveCkuCiAgICAgRmxvYXRSZWN0IG1fbGluZUJveFJlY3Q7Ci0gICAgLy8g RW5jbG9zaW5nIHRvcCBhbmQgYm90dG9tIGluY2x1ZGVzIGFsbCBpbmxpbmUgbGV2ZWwgYm94ZXMg KGJvcmRlciBib3gpIHZlcnRpY2FsbHkuIEluIGNlcnRhaW4gY2FzZXMgKHNlZSBsaW5lLWhlaWdo dCBwcm9wZXJ0eSkKLSAgICAvLyB0aGUgbGluZSAoYW5kIHRoZSBsaW5lIGJveCkgaXMgbm90IGFz IHRhbGwgYXMgdGhlIGlubGluZSBsZXZlbCBib3hlcyBvbiB0aGUgbGluZS4KKyAgICAvLyBFbmNs b3NpbmcgdG9wIGFuZCBib3R0b20gaW5jbHVkZXMgYWxsIGlubGluZSBsZXZlbCBib3hlcyAoYm9y ZGVyIGJveCkgdmVydGljYWxseS4KKyAgICAvLyBXaGlsZSB0aGUgbGluZSBib3ggdXN1YWxseSBl bmNsb3NlIHRoZW0gYXMgd2VsbCwgaXRzIHZlcnRpY2FsIGdlb21ldHJ5IGlzIGJhc2VkIG9uCisg ICAgLy8gdGhlIGxheW91dCBib3VuZHMgb2YgdGhlIGlubGluZSBsZXZlbCBib3hlcyB3aGljaCBt YXkgYmUgZGlmZmVyZW50IHdoZW4gbGluZS1oZWlnaHQgaXMgcHJlc2VudC4KICAgICBFbmNsb3Np bmdUb3BBbmRCb3R0b20gbV9lbmNsb3NpbmdUb3BBbmRCb3R0b207CiAgICAgRmxvYXRSZWN0IG1f c2Nyb2xsYWJsZU92ZXJmbG93OwogICAgIEZsb2F0UmVjdCBtX2lua092ZXJmbG93OwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9u TGluZUl0ZXJhdG9yTW9kZXJuUGF0aC5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0 aW9uL0xheW91dEludGVncmF0aW9uTGluZUl0ZXJhdG9yTW9kZXJuUGF0aC5oCmluZGV4IGI2Yjg1 ZGRiMGFiNzM4ZDliZWI3ODY4ODkyNWJhYjg0N2M4Y2NkM2EuLjMwZTNlZDQ2MzlkNWM0MmNmMDUz MzhkN2RjYWZhMjk1ZmY2ZTVkYWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9p bnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVJdGVyYXRvck1vZGVyblBhdGguaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25MaW5l SXRlcmF0b3JNb2Rlcm5QYXRoLmgKQEAgLTUxLDE4ICs1MSwxOCBAQCBwdWJsaWM6CiAKICAgICBM YXlvdXRVbml0IHRvcCgpIGNvbnN0IHsgcmV0dXJuIExheW91dFVuaXQ6OmZyb21GbG9hdFJvdW5k KGxpbmUoKS5lbmNsb3NpbmdDb250ZW50VG9wKCkpOyB9CiAgICAgTGF5b3V0VW5pdCBib3R0b20o KSBjb25zdCB7IHJldHVybiBMYXlvdXRVbml0Ojpmcm9tRmxvYXRSb3VuZChsaW5lKCkuZW5jbG9z aW5nQ29udGVudEJvdHRvbSgpKTsgfQotICAgIExheW91dFVuaXQgbGluZUJveFRvcCgpIGNvbnN0 IHsgcmV0dXJuIExheW91dFVuaXQ6OmZyb21GbG9hdFJvdW5kKGxpbmUoKS5yZWN0KCkueSgpKTsg fQotICAgIExheW91dFVuaXQgbGluZUJveEJvdHRvbSgpIGNvbnN0IHsgcmV0dXJuIExheW91dFVu aXQ6OmZyb21GbG9hdFJvdW5kKGxpbmUoKS5yZWN0KCkubWF4WSgpKTsgfQorICAgIExheW91dFVu aXQgbGluZUJveFRvcCgpIGNvbnN0IHsgcmV0dXJuIExheW91dFVuaXQ6OmZyb21GbG9hdFJvdW5k KGxpbmUoKS5saW5lQm94VG9wKCkpOyB9CisgICAgTGF5b3V0VW5pdCBsaW5lQm94Qm90dG9tKCkg Y29uc3QgeyByZXR1cm4gTGF5b3V0VW5pdDo6ZnJvbUZsb2F0Um91bmQobGluZSgpLmxpbmVCb3hC b3R0b20oKSk7IH0KIAogICAgIC8vIEZJWE1FOiBXaGF0IHNob3VsZCB0aGVzZSByZWFsbHkgYmU/ CiAgICAgTGF5b3V0VW5pdCBzZWxlY3Rpb25Ub3AoKSBjb25zdCB7IHJldHVybiB0b3AoKTsgfQog ICAgIExheW91dFVuaXQgc2VsZWN0aW9uVG9wRm9ySGl0VGVzdGluZygpIGNvbnN0IHsgcmV0dXJu IHRvcCgpOyB9CiAgICAgTGF5b3V0VW5pdCBzZWxlY3Rpb25Cb3R0b20oKSBjb25zdCB7IHJldHVy biBib3R0b20oKTsgfQogCi0gICAgZmxvYXQgY29udGVudExvZ2ljYWxMZWZ0KCkgY29uc3QgeyBy ZXR1cm4gbGluZSgpLnJlY3QoKS54KCkgKyBsaW5lKCkuY29udGVudExlZnRPZmZzZXQoKTsgfQor ICAgIGZsb2F0IGNvbnRlbnRMb2dpY2FsTGVmdCgpIGNvbnN0IHsgcmV0dXJuIGxpbmUoKS5saW5l Qm94TGVmdCgpICsgbGluZSgpLmNvbnRlbnRMZWZ0T2Zmc2V0KCk7IH0KICAgICBmbG9hdCBjb250 ZW50TG9naWNhbFJpZ2h0KCkgY29uc3QgeyByZXR1cm4gY29udGVudExvZ2ljYWxMZWZ0KCkgKyBs aW5lKCkuY29udGVudFdpZHRoKCk7IH0KICAgICBmbG9hdCB5KCkgY29uc3QgeyByZXR1cm4gbGlu ZUJveFRvcCgpOyB9Ci0gICAgZmxvYXQgbG9naWNhbEhlaWdodCgpIGNvbnN0IHsgcmV0dXJuIGxp bmUoKS5yZWN0KCkuaGVpZ2h0KCk7IH0KKyAgICBmbG9hdCBsb2dpY2FsSGVpZ2h0KCkgY29uc3Qg eyByZXR1cm4gbGluZUJveEJvdHRvbSgpIC0gbGluZUJveFRvcCgpOyB9CiAgICAgYm9vbCBpc0hv cml6b250YWwoKSBjb25zdCB7IHJldHVybiB0cnVlOyB9CiAKICAgICBjb25zdCBSZW5kZXJCbG9j a0Zsb3cmIGNvbnRhaW5pbmdCbG9jaygpIGNvbnN0IHsgcmV0dXJuIG1faW5saW5lQ29udGVudC0+ Y29udGFpbmluZ0Jsb2NrKCk7IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9p bnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlvdXQuY3BwIGIvU291cmNlL1dlYkNv cmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uTGluZUxheW91dC5jcHAKaW5k ZXggZTI5YjUxYTBmY2Q4ZDE3ZWVlMWU2YWI0YWZmZWU4MDMzZmFiYTlkZi4uMmY2YjMwMTdiYzNm YTY3OTJkMDBkOWRiOTY2YTkwYzc3ZDg3YjE0NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv bGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uTGluZUxheW91dC5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uTGluZUxh eW91dC5jcHAKQEAgLTIzMiw3ICsyMzIsNyBAQCBMYXlvdXRVbml0IExpbmVMYXlvdXQ6OmNvbnRl bnRMb2dpY2FsSGVpZ2h0KCkgY29uc3QKICAgICAgICAgcmV0dXJuIHsgfTsKIAogICAgIGF1dG8m IGxpbmVzID0gbV9pbmxpbmVDb250ZW50LT5saW5lczsKLSAgICByZXR1cm4gTGF5b3V0VW5pdCB7 IGxpbmVzLmxhc3QoKS5yZWN0KCkubWF4WSgpIC0gbGluZXMuZmlyc3QoKS5yZWN0KCkueSgpICsg bV9pbmxpbmVDb250ZW50LT5jbGVhckdhcEFmdGVyTGFzdExpbmUgfTsKKyAgICByZXR1cm4gTGF5 b3V0VW5pdCB7IGxpbmVzLmxhc3QoKS5saW5lQm94Qm90dG9tKCkgLSBsaW5lcy5maXJzdCgpLmxp bmVCb3hUb3AoKSArIG1faW5saW5lQ29udGVudC0+Y2xlYXJHYXBBZnRlckxhc3RMaW5lIH07CiB9 CiAKIHNpemVfdCBMaW5lTGF5b3V0OjpsaW5lQ291bnQoKSBjb25zdApAQCAtMjUzLDcgKzI1Myw3 IEBAIExheW91dFVuaXQgTGluZUxheW91dDo6Zmlyc3RMaW5lQmFzZWxpbmUoKSBjb25zdAogICAg IH0KIAogICAgIGF1dG8mIGZpcnN0TGluZSA9IG1faW5saW5lQ29udGVudC0+bGluZXMuZmlyc3Qo KTsKLSAgICByZXR1cm4gTGF5b3V0VW5pdCB7IGZpcnN0TGluZS5yZWN0KCkueSgpICsgZmlyc3RM aW5lLmJhc2VsaW5lKCkgfTsKKyAgICByZXR1cm4gTGF5b3V0VW5pdCB7IGZpcnN0TGluZS5saW5l Qm94VG9wKCkgKyBmaXJzdExpbmUuYmFzZWxpbmUoKSB9OwogfQogCiBMYXlvdXRVbml0IExpbmVM YXlvdXQ6Omxhc3RMaW5lQmFzZWxpbmUoKSBjb25zdApAQCAtMjY0LDcgKzI2NCw3IEBAIExheW91 dFVuaXQgTGluZUxheW91dDo6bGFzdExpbmVCYXNlbGluZSgpIGNvbnN0CiAgICAgfQogCiAgICAg YXV0byYgbGFzdExpbmUgPSBtX2lubGluZUNvbnRlbnQtPmxpbmVzLmxhc3QoKTsKLSAgICByZXR1 cm4gTGF5b3V0VW5pdCB7IGxhc3RMaW5lLnJlY3QoKS55KCkgKyBsYXN0TGluZS5iYXNlbGluZSgp IH07CisgICAgcmV0dXJuIExheW91dFVuaXQgeyBsYXN0TGluZS5saW5lQm94VG9wKCkgKyBsYXN0 TGluZS5iYXNlbGluZSgpIH07CiB9CiAKIHZvaWQgTGluZUxheW91dDo6YWRqdXN0Rm9yUGFnaW5h dGlvbigpCkBAIC0yNzYsNyArMjc2LDcgQEAgdm9pZCBMaW5lTGF5b3V0OjphZGp1c3RGb3JQYWdp bmF0aW9uKCkKICAgICB9CiAKICAgICBhdXRvJiBsaW5lcyA9IHBhZ2luZWRJbmxpbmVDb250ZW50 LT5saW5lczsKLSAgICBtX3BhZ2luYXRlZEhlaWdodCA9IExheW91dFVuaXQgeyBsaW5lcy5sYXN0 KCkucmVjdCgpLm1heFkoKSAtIGxpbmVzLmZpcnN0KCkucmVjdCgpLnkoKSB9OworICAgIG1fcGFn aW5hdGVkSGVpZ2h0ID0gTGF5b3V0VW5pdCB7IGxpbmVzLmxhc3QoKS5saW5lQm94Qm90dG9tKCkg LSBsaW5lcy5maXJzdCgpLmxpbmVCb3hUb3AoKSB9OwogCiAgICAgbV9pbmxpbmVDb250ZW50ID0g V1RGTW92ZShwYWdpbmVkSW5saW5lQ29udGVudCk7CiB9CkBAIC00MTEsMTEgKzQxMSwxMSBAQCB2 b2lkIExpbmVMYXlvdXQ6OnBhaW50KFBhaW50SW5mbyYgcGFpbnRJbmZvLCBjb25zdCBMYXlvdXRQ b2ludCYgcGFpbnRPZmZzZXQpCiAgICAgICAgIH0KIAogICAgICAgICBhdXRvJiBsaW5lID0gaW5s aW5lQ29udGVudC5saW5lRm9yUnVuKHJ1bik7Ci0gICAgICAgIGF1dG8gYmFzZWxpbmUgPSBwYWlu dE9mZnNldC55KCkgKyBsaW5lLnJlY3QoKS55KCkgKyBsaW5lLmJhc2VsaW5lKCk7CisgICAgICAg IGF1dG8gYmFzZWxpbmUgPSBwYWludE9mZnNldC55KCkgKyBsaW5lLmxpbmVCb3hUb3AoKSArIGxp bmUuYmFzZWxpbmUoKTsKICAgICAgICAgYXV0byBleHBhbnNpb24gPSBydW4uZXhwYW5zaW9uKCk7 CiAgICAgICAgIC8vIFRleHRSdW4gZXhwZWN0cyB0aGUgeFBvcyB0byBiZSBhZGp1c3RlZCB3aXRo IHRoZSBhbGlnbWVudCBvZmZzZXQgKGUuZy4gd2hlbiB0aGUgbGluZSBpcyBjZW50ZXIgYWxpZ25l ZAogICAgICAgICAvLyBhbmQgdGhlIHJ1biBzdGFydHMgYXQgMTAwcHgsIGR1ZSB0byB0aGUgaG9y aXpvbnRhbCBhbGlnbWVudCwgdGhlIHhwb3MgaXMgc3VwcG9zZWQgdG8gYmUgYXQgMHB4KS4KLSAg ICAgICAgYXV0byB4UG9zID0gcmVjdC54KCkgLSAobGluZS5yZWN0KCkueCgpICsgbGluZS5jb250 ZW50TGVmdE9mZnNldCgpKTsKKyAgICAgICAgYXV0byB4UG9zID0gcmVjdC54KCkgLSAobGluZS5s aW5lQm94TGVmdCgpICsgbGluZS5jb250ZW50TGVmdE9mZnNldCgpKTsKICAgICAgICAgV2ViQ29y ZTo6VGV4dFJ1biB0ZXh0UnVuIHsgdGV4dENvbnRlbnQucmVuZGVyZWRDb250ZW50KCksIHhQb3Ms IGV4cGFuc2lvbi5ob3Jpem9udGFsRXhwYW5zaW9uLCBleHBhbnNpb24uYmVoYXZpb3IgfTsKICAg ICAgICAgdGV4dFJ1bi5zZXRUYWJTaXplKCFzdHlsZS5jb2xsYXBzZVdoaXRlU3BhY2UoKSwgc3R5 bGUudGFiU2l6ZSgpKTsKICAgICAgICAgRmxvYXRQb2ludCB0ZXh0T3JpZ2luIHsgcmVjdC54KCkg KyBwYWludE9mZnNldC54KCksIHJvdW5kVG9EZXZpY2VQaXhlbChiYXNlbGluZSwgZGV2aWNlU2Nh bGVGYWN0b3IpIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRp b24vTGF5b3V0SW50ZWdyYXRpb25QYWdpbmF0aW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvblBhZ2luYXRpb24uY3BwCmluZGV4IDdlNjc1 YmQ4ZGRjZDc1NmQ2ZTZlNzkzYWMyMzYzODhjYjMyMmQxYTIuLjg0YzViMTJkMTE1Y2MxNDA2NWVi NmM5MDI3MTBmYmZkMTkzOGYxOWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9p bnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvblBhZ2luYXRpb24uY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvblBhZ2luYXRpb24uY3Bw CkBAIC0xMTQsNyArMTE0LDcgQEAgc3RhdGljIHZvaWQgdXBkYXRlTWluaW11bVBhZ2VIZWlnaHQo UmVuZGVyQmxvY2tGbG93JiBmbG93LCBjb25zdCBJbmxpbmVDb250ZW50JgogICAgIGF1dG8gd2lk b3dzID0gc3R5bGUuaGFzQXV0b1dpZG93cygpID8gMSA6IHN0ZDo6bWF4PGludD4oc3R5bGUud2lk b3dzKCksIDEpOwogICAgIGF1dG8gb3JwaGFucyA9IHN0eWxlLmhhc0F1dG9PcnBoYW5zKCkgPyAx IDogc3RkOjptYXg8aW50PihzdHlsZS5vcnBoYW5zKCksIDEpOwogICAgIGF1dG8gbWluaW11bUxp bmVDb3VudCA9IHN0ZDo6bWluPHVuc2lnbmVkPihzdGQ6Om1heCh3aWRvd3MsIG9ycGhhbnMpLCBs aW5lQ291bnQpOwotICAgIGZsb3cudXBkYXRlTWluaW11bVBhZ2VIZWlnaHQoMCwgTGF5b3V0VW5p dChpbmxpbmVDb250ZW50LmxpbmVzW21pbmltdW1MaW5lQ291bnQgLSAxXS5yZWN0KCkubWF4WSgp KSk7CisgICAgZmxvdy51cGRhdGVNaW5pbXVtUGFnZUhlaWdodCgwLCBMYXlvdXRVbml0KGlubGlu ZUNvbnRlbnQubGluZXNbbWluaW11bUxpbmVDb3VudCAtIDFdLmxpbmVCb3hCb3R0b20oKSkpOwog fQogCiBzdGF0aWMgUmVmPElubGluZUNvbnRlbnQ+IG1ha2VBZGp1c3RlZENvbnRlbnQoY29uc3Qg SW5saW5lQ29udGVudCYgaW5saW5lQ29udGVudCwgVmVjdG9yPGZsb2F0PiBhZGp1c3RtZW50cykK QEAgLTEyOSw3ICsxMjksNyBAQCBzdGF0aWMgUmVmPElubGluZUNvbnRlbnQ+IG1ha2VBZGp1c3Rl ZENvbnRlbnQoY29uc3QgSW5saW5lQ29udGVudCYgaW5saW5lQ29udGVudAogICAgICAgICByZXR1 cm4gTGluZSB7CiAgICAgICAgICAgICBsaW5lLmZpcnN0UnVuSW5kZXgoKSwKICAgICAgICAgICAg IGxpbmUucnVuQ291bnQoKSwKLSAgICAgICAgICAgIG1vdmVWZXJ0aWNhbGx5KGxpbmUucmVjdCgp LCBvZmZzZXQpLAorICAgICAgICAgICAgbW92ZVZlcnRpY2FsbHkoeyBGbG9hdFBvaW50IHsgbGlu ZS5saW5lQm94TGVmdCgpLCBsaW5lLmxpbmVCb3hUb3AoKSB9LCBGbG9hdFBvaW50IHsgbGluZS5s aW5lQm94UmlnaHQoKSwgbGluZS5saW5lQm94Qm90dG9tKCkgfSB9LCBvZmZzZXQpLAogICAgICAg ICAgICAgeyBsaW5lLmVuY2xvc2luZ0NvbnRlbnRUb3AoKSArIG9mZnNldCwgbGluZS5lbmNsb3Np bmdDb250ZW50Qm90dG9tKCkgKyBvZmZzZXQgfSwKICAgICAgICAgICAgIG1vdmVWZXJ0aWNhbGx5 KGxpbmUuc2Nyb2xsYWJsZU92ZXJmbG93KCksIG9mZnNldCksCiAgICAgICAgICAgICBtb3ZlVmVy dGljYWxseShsaW5lLmlua092ZXJmbG93KCksIG9mZnNldCksCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25SdW5JdGVyYXRvck1v ZGVyblBhdGguaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRl Z3JhdGlvblJ1bkl0ZXJhdG9yTW9kZXJuUGF0aC5oCmluZGV4IDA3N2IzZTdhOWQ5NzExMGE1OTZk NTE2YjNiZGE3MjZkNTJiODkxZGIuLjRiOTdiZGM5ZGE4N2E0ZWQyZjFhMTNhOTkxY2JlNDQwYTAx YzAyMzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlv dXRJbnRlZ3JhdGlvblJ1bkl0ZXJhdG9yTW9kZXJuUGF0aC5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvblJ1bkl0ZXJhdG9yTW9kZXJuUGF0 aC5oCkBAIC0yMjEsNyArMjIxLDcgQEAgcHJpdmF0ZToKICAgICAgICAgYXV0byYgc3R5bGUgPSBy dW4oKS5zdHlsZSgpOwogICAgICAgICBhdXRvIGV4cGFuc2lvbiA9IHJ1bigpLmV4cGFuc2lvbigp OwogICAgICAgICBhdXRvIHJlY3QgPSB0aGlzLT5yZWN0KCk7Ci0gICAgICAgIGF1dG8geFBvcyA9 IHJlY3QueCgpIC0gKGxpbmUoKS5yZWN0KCkueCgpICsgbGluZSgpLmNvbnRlbnRMZWZ0T2Zmc2V0 KCkpOworICAgICAgICBhdXRvIHhQb3MgPSByZWN0LngoKSAtIChsaW5lKCkubGluZUJveExlZnQo KSArIGxpbmUoKS5jb250ZW50TGVmdE9mZnNldCgpKTsKIAogICAgICAgICBhdXRvIHRleHRGb3JS dW4gPSBbJl0gewogICAgICAgICAgICAgaWYgKGh5cGhlbk1vZGUgPT0gSHlwaGVuTW9kZTo6SWdu b3JlIHx8ICFoYXNIeXBoZW4oKSkK 414760 2020-11-21 06:13:59 -0800 2020-11-21 09:04:29 -0800 Patch bug-219230-20201121061358.patch text/plain 11706 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjcwMTQ1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGQ0YTQyYjhjMzZlYzg0 MDY3OTUwOWE1NGExNDVlZTMxMGExMDBjZi4uOWIyZTVkZjcyNDczZDczN2E5ZTAxOTRhZWVkNmUz YTc1ZjljNGZjYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDIwLTExLTIxICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSW50ZWdyYXRpb25d IExheW91dEludGVncmF0aW9uOjpMaW5lOjpyZWN0IGlzIHdheSB0b28gYW1iaWd1b3VzCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTkyMzAKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBMaW5lOjpyZWN0KCkg aXMgYWN0dWFsbHkgdGhlIGxpbmUgYm94IChzZWUgaHR0cHM6Ly93d3cudzMub3JnL1RSL2Nzcy1p bmxpbmUtMy8jbGluZS1ib3gpLgorCisgICAgICAgICogbGF5b3V0L2ludGVncmF0aW9uL0xheW91 dEludGVncmF0aW9uTGluZS5oOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246 OkxpbmU6OmxpbmVCb3hUb3AgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdy YXRpb246OkxpbmU6OmxpbmVCb3hCb3R0b20gY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5 b3V0SW50ZWdyYXRpb246OkxpbmU6OmxpbmVCb3hMZWZ0IGNvbnN0KToKKyAgICAgICAgKFdlYkNv cmU6OkxheW91dEludGVncmF0aW9uOjpMaW5lOjpsaW5lQm94UmlnaHQgY29uc3QpOgorICAgICAg ICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246OkxpbmU6OnJlY3QgY29uc3QpOiBEZWxldGVk LgorICAgICAgICAqIGxheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVJdGVy YXRvck1vZGVyblBhdGguaDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpM aW5lSXRlcmF0b3JNb2Rlcm5QYXRoOjpsaW5lQm94VG9wIGNvbnN0KToKKyAgICAgICAgKFdlYkNv cmU6OkxheW91dEludGVncmF0aW9uOjpMaW5lSXRlcmF0b3JNb2Rlcm5QYXRoOjpsaW5lQm94Qm90 dG9tIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpMaW5lSXRl cmF0b3JNb2Rlcm5QYXRoOjpjb250ZW50TG9naWNhbExlZnQgY29uc3QpOgorICAgICAgICAoV2Vi Q29yZTo6TGF5b3V0SW50ZWdyYXRpb246OkxpbmVJdGVyYXRvck1vZGVyblBhdGg6OmxvZ2ljYWxI ZWlnaHQgY29uc3QpOgorICAgICAgICAqIGxheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3Jh dGlvbkxpbmVMYXlvdXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246 OkxpbmVMYXlvdXQ6OmNvbnRlbnRMb2dpY2FsSGVpZ2h0IGNvbnN0KToKKyAgICAgICAgKFdlYkNv cmU6OkxheW91dEludGVncmF0aW9uOjpMaW5lTGF5b3V0OjpmaXJzdExpbmVCYXNlbGluZSBjb25z dCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6TGluZUxheW91dDo6bGFz dExpbmVCYXNlbGluZSBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlv bjo6TGluZUxheW91dDo6YWRqdXN0Rm9yUGFnaW5hdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpM YXlvdXRJbnRlZ3JhdGlvbjo6TGluZUxheW91dDo6cGFpbnQpOgorICAgICAgICAqIGxheW91dC9p bnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvblBhZ2luYXRpb24uY3BwOgorICAgICAgICAoV2Vi Q29yZTo6TGF5b3V0SW50ZWdyYXRpb246OnVwZGF0ZU1pbmltdW1QYWdlSGVpZ2h0KToKKyAgICAg ICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjptYWtlQWRqdXN0ZWRDb250ZW50KToKKyAg ICAgICAgKiBsYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25SdW5JdGVyYXRvck1v ZGVyblBhdGguaDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpSdW5JdGVy YXRvck1vZGVyblBhdGg6OmNyZWF0ZVRleHRSdW4gY29uc3QpOgorCiAyMDIwLTExLTIxICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xGQ11bSW50ZWdyYXRpb25d IFJlbW92ZSByZWR1bmRhbnQgbGluZUJveFdpZHRoIGZyb20gTGluZQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uTGluZS5oIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uTGluZS5o CmluZGV4IDQ2YTdhNGNiMzI2OTkyOGM2ZjU1NWY2MzNkMzg2MDI0YjU2ZWRlZDEuLmU1ODFkMDA2 Y2E4ZDdiY2I2MDQzYTc5MWIxZmE5ZDM2YzhiZTI2MWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmUuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25MaW5lLmgKQEAg LTU1LDEyICs1NSwyMCBAQCBwdWJsaWM6CiAKICAgICBzaXplX3QgZmlyc3RSdW5JbmRleCgpIGNv bnN0IHsgcmV0dXJuIG1fZmlyc3RSdW5JbmRleDsgfQogICAgIHNpemVfdCBydW5Db3VudCgpIGNv bnN0IHsgcmV0dXJuIG1fcnVuQ291bnQ7IH0KLSAgICBjb25zdCBGbG9hdFJlY3QmIHJlY3QoKSBj b25zdCB7IHJldHVybiBtX2xpbmVCb3hSZWN0OyB9CisKKyAgICBmbG9hdCBsaW5lQm94VG9wKCkg Y29uc3QgeyByZXR1cm4gbV9saW5lQm94UmVjdC55KCk7IH0KKyAgICBmbG9hdCBsaW5lQm94Qm90 dG9tKCkgY29uc3QgeyByZXR1cm4gbV9saW5lQm94UmVjdC5tYXhZKCk7IH0KKyAgICBmbG9hdCBs aW5lQm94TGVmdCgpIGNvbnN0IHsgcmV0dXJuIG1fbGluZUJveFJlY3QueCgpOyB9CisgICAgZmxv YXQgbGluZUJveFJpZ2h0KCkgY29uc3QgeyByZXR1cm4gbV9saW5lQm94UmVjdC5tYXhYKCk7IH0K KwogICAgIGZsb2F0IGVuY2xvc2luZ0NvbnRlbnRUb3AoKSBjb25zdCB7IHJldHVybiBtX2VuY2xv c2luZ1RvcEFuZEJvdHRvbS50b3A7IH0KICAgICBmbG9hdCBlbmNsb3NpbmdDb250ZW50Qm90dG9t KCkgY29uc3QgeyByZXR1cm4gbV9lbmNsb3NpbmdUb3BBbmRCb3R0b20uYm90dG9tOyB9CisKICAg ICBjb25zdCBGbG9hdFJlY3QmIHNjcm9sbGFibGVPdmVyZmxvdygpIGNvbnN0IHsgcmV0dXJuIG1f c2Nyb2xsYWJsZU92ZXJmbG93OyB9CiAgICAgY29uc3QgRmxvYXRSZWN0JiBpbmtPdmVyZmxvdygp IGNvbnN0IHsgcmV0dXJuIG1faW5rT3ZlcmZsb3c7IH0KKwogICAgIGZsb2F0IGJhc2VsaW5lKCkg Y29uc3QgeyByZXR1cm4gbV9iYXNlbGluZTsgfQorCiAgICAgZmxvYXQgY29udGVudExlZnRPZmZz ZXQoKSBjb25zdCB7IHJldHVybiBtX2NvbnRlbnRMZWZ0T2Zmc2V0OyB9CiAgICAgZmxvYXQgY29u dGVudFdpZHRoKCkgY29uc3QgeyByZXR1cm4gbV9jb250ZW50V2lkdGg7IH0KIApAQCAtNjksOCAr NzcsOSBAQCBwcml2YXRlOgogICAgIHNpemVfdCBtX3J1bkNvdW50IHsgMCB9OwogICAgIC8vIFRo aXMgaXMgbGluZSBib3ggZ2VvbWV0cnkgKHNlZSBodHRwczovL3d3dy53My5vcmcvVFIvY3NzLWlu bGluZS0zLyNsaW5lLWJveCkuCiAgICAgRmxvYXRSZWN0IG1fbGluZUJveFJlY3Q7Ci0gICAgLy8g RW5jbG9zaW5nIHRvcCBhbmQgYm90dG9tIGluY2x1ZGVzIGFsbCBpbmxpbmUgbGV2ZWwgYm94ZXMg KGJvcmRlciBib3gpIHZlcnRpY2FsbHkuIEluIGNlcnRhaW4gY2FzZXMgKHNlZSBsaW5lLWhlaWdo dCBwcm9wZXJ0eSkKLSAgICAvLyB0aGUgbGluZSAoYW5kIHRoZSBsaW5lIGJveCkgaXMgbm90IGFz IHRhbGwgYXMgdGhlIGlubGluZSBsZXZlbCBib3hlcyBvbiB0aGUgbGluZS4KKyAgICAvLyBFbmNs b3NpbmcgdG9wIGFuZCBib3R0b20gaW5jbHVkZXMgYWxsIGlubGluZSBsZXZlbCBib3hlcyAoYm9y ZGVyIGJveCkgdmVydGljYWxseS4KKyAgICAvLyBXaGlsZSB0aGUgbGluZSBib3ggdXN1YWxseSBl bmNsb3NlIHRoZW0gYXMgd2VsbCwgaXRzIHZlcnRpY2FsIGdlb21ldHJ5IGlzIGJhc2VkIG9uCisg ICAgLy8gdGhlIGxheW91dCBib3VuZHMgb2YgdGhlIGlubGluZSBsZXZlbCBib3hlcyB3aGljaCBt YXkgYmUgZGlmZmVyZW50IHdoZW4gbGluZS1oZWlnaHQgaXMgcHJlc2VudC4KICAgICBFbmNsb3Np bmdUb3BBbmRCb3R0b20gbV9lbmNsb3NpbmdUb3BBbmRCb3R0b207CiAgICAgRmxvYXRSZWN0IG1f c2Nyb2xsYWJsZU92ZXJmbG93OwogICAgIEZsb2F0UmVjdCBtX2lua092ZXJmbG93OwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9u TGluZUl0ZXJhdG9yTW9kZXJuUGF0aC5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0 aW9uL0xheW91dEludGVncmF0aW9uTGluZUl0ZXJhdG9yTW9kZXJuUGF0aC5oCmluZGV4IGI2Yjg1 ZGRiMGFiNzM4ZDliZWI3ODY4ODkyNWJhYjg0N2M4Y2NkM2EuLjMwZTNlZDQ2MzlkNWM0MmNmMDUz MzhkN2RjYWZhMjk1ZmY2ZTVkYWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9p bnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVJdGVyYXRvck1vZGVyblBhdGguaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25MaW5l SXRlcmF0b3JNb2Rlcm5QYXRoLmgKQEAgLTUxLDE4ICs1MSwxOCBAQCBwdWJsaWM6CiAKICAgICBM YXlvdXRVbml0IHRvcCgpIGNvbnN0IHsgcmV0dXJuIExheW91dFVuaXQ6OmZyb21GbG9hdFJvdW5k KGxpbmUoKS5lbmNsb3NpbmdDb250ZW50VG9wKCkpOyB9CiAgICAgTGF5b3V0VW5pdCBib3R0b20o KSBjb25zdCB7IHJldHVybiBMYXlvdXRVbml0Ojpmcm9tRmxvYXRSb3VuZChsaW5lKCkuZW5jbG9z aW5nQ29udGVudEJvdHRvbSgpKTsgfQotICAgIExheW91dFVuaXQgbGluZUJveFRvcCgpIGNvbnN0 IHsgcmV0dXJuIExheW91dFVuaXQ6OmZyb21GbG9hdFJvdW5kKGxpbmUoKS5yZWN0KCkueSgpKTsg fQotICAgIExheW91dFVuaXQgbGluZUJveEJvdHRvbSgpIGNvbnN0IHsgcmV0dXJuIExheW91dFVu aXQ6OmZyb21GbG9hdFJvdW5kKGxpbmUoKS5yZWN0KCkubWF4WSgpKTsgfQorICAgIExheW91dFVu aXQgbGluZUJveFRvcCgpIGNvbnN0IHsgcmV0dXJuIExheW91dFVuaXQ6OmZyb21GbG9hdFJvdW5k KGxpbmUoKS5saW5lQm94VG9wKCkpOyB9CisgICAgTGF5b3V0VW5pdCBsaW5lQm94Qm90dG9tKCkg Y29uc3QgeyByZXR1cm4gTGF5b3V0VW5pdDo6ZnJvbUZsb2F0Um91bmQobGluZSgpLmxpbmVCb3hC b3R0b20oKSk7IH0KIAogICAgIC8vIEZJWE1FOiBXaGF0IHNob3VsZCB0aGVzZSByZWFsbHkgYmU/ CiAgICAgTGF5b3V0VW5pdCBzZWxlY3Rpb25Ub3AoKSBjb25zdCB7IHJldHVybiB0b3AoKTsgfQog ICAgIExheW91dFVuaXQgc2VsZWN0aW9uVG9wRm9ySGl0VGVzdGluZygpIGNvbnN0IHsgcmV0dXJu IHRvcCgpOyB9CiAgICAgTGF5b3V0VW5pdCBzZWxlY3Rpb25Cb3R0b20oKSBjb25zdCB7IHJldHVy biBib3R0b20oKTsgfQogCi0gICAgZmxvYXQgY29udGVudExvZ2ljYWxMZWZ0KCkgY29uc3QgeyBy ZXR1cm4gbGluZSgpLnJlY3QoKS54KCkgKyBsaW5lKCkuY29udGVudExlZnRPZmZzZXQoKTsgfQor ICAgIGZsb2F0IGNvbnRlbnRMb2dpY2FsTGVmdCgpIGNvbnN0IHsgcmV0dXJuIGxpbmUoKS5saW5l Qm94TGVmdCgpICsgbGluZSgpLmNvbnRlbnRMZWZ0T2Zmc2V0KCk7IH0KICAgICBmbG9hdCBjb250 ZW50TG9naWNhbFJpZ2h0KCkgY29uc3QgeyByZXR1cm4gY29udGVudExvZ2ljYWxMZWZ0KCkgKyBs aW5lKCkuY29udGVudFdpZHRoKCk7IH0KICAgICBmbG9hdCB5KCkgY29uc3QgeyByZXR1cm4gbGlu ZUJveFRvcCgpOyB9Ci0gICAgZmxvYXQgbG9naWNhbEhlaWdodCgpIGNvbnN0IHsgcmV0dXJuIGxp bmUoKS5yZWN0KCkuaGVpZ2h0KCk7IH0KKyAgICBmbG9hdCBsb2dpY2FsSGVpZ2h0KCkgY29uc3Qg eyByZXR1cm4gbGluZUJveEJvdHRvbSgpIC0gbGluZUJveFRvcCgpOyB9CiAgICAgYm9vbCBpc0hv cml6b250YWwoKSBjb25zdCB7IHJldHVybiB0cnVlOyB9CiAKICAgICBjb25zdCBSZW5kZXJCbG9j a0Zsb3cmIGNvbnRhaW5pbmdCbG9jaygpIGNvbnN0IHsgcmV0dXJuIG1faW5saW5lQ29udGVudC0+ Y29udGFpbmluZ0Jsb2NrKCk7IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9p bnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlvdXQuY3BwIGIvU291cmNlL1dlYkNv cmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uTGluZUxheW91dC5jcHAKaW5k ZXggZTI5YjUxYTBmY2Q4ZDE3ZWVlMWU2YWI0YWZmZWU4MDMzZmFiYTlkZi4uMmY2YjMwMTdiYzNm YTY3OTJkMDBkOWRiOTY2YTkwYzc3ZDg3YjE0NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv bGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uTGluZUxheW91dC5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uTGluZUxh eW91dC5jcHAKQEAgLTIzMiw3ICsyMzIsNyBAQCBMYXlvdXRVbml0IExpbmVMYXlvdXQ6OmNvbnRl bnRMb2dpY2FsSGVpZ2h0KCkgY29uc3QKICAgICAgICAgcmV0dXJuIHsgfTsKIAogICAgIGF1dG8m IGxpbmVzID0gbV9pbmxpbmVDb250ZW50LT5saW5lczsKLSAgICByZXR1cm4gTGF5b3V0VW5pdCB7 IGxpbmVzLmxhc3QoKS5yZWN0KCkubWF4WSgpIC0gbGluZXMuZmlyc3QoKS5yZWN0KCkueSgpICsg bV9pbmxpbmVDb250ZW50LT5jbGVhckdhcEFmdGVyTGFzdExpbmUgfTsKKyAgICByZXR1cm4gTGF5 b3V0VW5pdCB7IGxpbmVzLmxhc3QoKS5saW5lQm94Qm90dG9tKCkgLSBsaW5lcy5maXJzdCgpLmxp bmVCb3hUb3AoKSArIG1faW5saW5lQ29udGVudC0+Y2xlYXJHYXBBZnRlckxhc3RMaW5lIH07CiB9 CiAKIHNpemVfdCBMaW5lTGF5b3V0OjpsaW5lQ291bnQoKSBjb25zdApAQCAtMjUzLDcgKzI1Myw3 IEBAIExheW91dFVuaXQgTGluZUxheW91dDo6Zmlyc3RMaW5lQmFzZWxpbmUoKSBjb25zdAogICAg IH0KIAogICAgIGF1dG8mIGZpcnN0TGluZSA9IG1faW5saW5lQ29udGVudC0+bGluZXMuZmlyc3Qo KTsKLSAgICByZXR1cm4gTGF5b3V0VW5pdCB7IGZpcnN0TGluZS5yZWN0KCkueSgpICsgZmlyc3RM aW5lLmJhc2VsaW5lKCkgfTsKKyAgICByZXR1cm4gTGF5b3V0VW5pdCB7IGZpcnN0TGluZS5saW5l Qm94VG9wKCkgKyBmaXJzdExpbmUuYmFzZWxpbmUoKSB9OwogfQogCiBMYXlvdXRVbml0IExpbmVM YXlvdXQ6Omxhc3RMaW5lQmFzZWxpbmUoKSBjb25zdApAQCAtMjY0LDcgKzI2NCw3IEBAIExheW91 dFVuaXQgTGluZUxheW91dDo6bGFzdExpbmVCYXNlbGluZSgpIGNvbnN0CiAgICAgfQogCiAgICAg YXV0byYgbGFzdExpbmUgPSBtX2lubGluZUNvbnRlbnQtPmxpbmVzLmxhc3QoKTsKLSAgICByZXR1 cm4gTGF5b3V0VW5pdCB7IGxhc3RMaW5lLnJlY3QoKS55KCkgKyBsYXN0TGluZS5iYXNlbGluZSgp IH07CisgICAgcmV0dXJuIExheW91dFVuaXQgeyBsYXN0TGluZS5saW5lQm94VG9wKCkgKyBsYXN0 TGluZS5iYXNlbGluZSgpIH07CiB9CiAKIHZvaWQgTGluZUxheW91dDo6YWRqdXN0Rm9yUGFnaW5h dGlvbigpCkBAIC0yNzYsNyArMjc2LDcgQEAgdm9pZCBMaW5lTGF5b3V0OjphZGp1c3RGb3JQYWdp bmF0aW9uKCkKICAgICB9CiAKICAgICBhdXRvJiBsaW5lcyA9IHBhZ2luZWRJbmxpbmVDb250ZW50 LT5saW5lczsKLSAgICBtX3BhZ2luYXRlZEhlaWdodCA9IExheW91dFVuaXQgeyBsaW5lcy5sYXN0 KCkucmVjdCgpLm1heFkoKSAtIGxpbmVzLmZpcnN0KCkucmVjdCgpLnkoKSB9OworICAgIG1fcGFn aW5hdGVkSGVpZ2h0ID0gTGF5b3V0VW5pdCB7IGxpbmVzLmxhc3QoKS5saW5lQm94Qm90dG9tKCkg LSBsaW5lcy5maXJzdCgpLmxpbmVCb3hUb3AoKSB9OwogCiAgICAgbV9pbmxpbmVDb250ZW50ID0g V1RGTW92ZShwYWdpbmVkSW5saW5lQ29udGVudCk7CiB9CkBAIC00MTEsMTEgKzQxMSwxMSBAQCB2 b2lkIExpbmVMYXlvdXQ6OnBhaW50KFBhaW50SW5mbyYgcGFpbnRJbmZvLCBjb25zdCBMYXlvdXRQ b2ludCYgcGFpbnRPZmZzZXQpCiAgICAgICAgIH0KIAogICAgICAgICBhdXRvJiBsaW5lID0gaW5s aW5lQ29udGVudC5saW5lRm9yUnVuKHJ1bik7Ci0gICAgICAgIGF1dG8gYmFzZWxpbmUgPSBwYWlu dE9mZnNldC55KCkgKyBsaW5lLnJlY3QoKS55KCkgKyBsaW5lLmJhc2VsaW5lKCk7CisgICAgICAg IGF1dG8gYmFzZWxpbmUgPSBwYWludE9mZnNldC55KCkgKyBsaW5lLmxpbmVCb3hUb3AoKSArIGxp bmUuYmFzZWxpbmUoKTsKICAgICAgICAgYXV0byBleHBhbnNpb24gPSBydW4uZXhwYW5zaW9uKCk7 CiAgICAgICAgIC8vIFRleHRSdW4gZXhwZWN0cyB0aGUgeFBvcyB0byBiZSBhZGp1c3RlZCB3aXRo IHRoZSBhbGlnbWVudCBvZmZzZXQgKGUuZy4gd2hlbiB0aGUgbGluZSBpcyBjZW50ZXIgYWxpZ25l ZAogICAgICAgICAvLyBhbmQgdGhlIHJ1biBzdGFydHMgYXQgMTAwcHgsIGR1ZSB0byB0aGUgaG9y aXpvbnRhbCBhbGlnbWVudCwgdGhlIHhwb3MgaXMgc3VwcG9zZWQgdG8gYmUgYXQgMHB4KS4KLSAg ICAgICAgYXV0byB4UG9zID0gcmVjdC54KCkgLSAobGluZS5yZWN0KCkueCgpICsgbGluZS5jb250 ZW50TGVmdE9mZnNldCgpKTsKKyAgICAgICAgYXV0byB4UG9zID0gcmVjdC54KCkgLSAobGluZS5s aW5lQm94TGVmdCgpICsgbGluZS5jb250ZW50TGVmdE9mZnNldCgpKTsKICAgICAgICAgV2ViQ29y ZTo6VGV4dFJ1biB0ZXh0UnVuIHsgdGV4dENvbnRlbnQucmVuZGVyZWRDb250ZW50KCksIHhQb3Ms IGV4cGFuc2lvbi5ob3Jpem9udGFsRXhwYW5zaW9uLCBleHBhbnNpb24uYmVoYXZpb3IgfTsKICAg ICAgICAgdGV4dFJ1bi5zZXRUYWJTaXplKCFzdHlsZS5jb2xsYXBzZVdoaXRlU3BhY2UoKSwgc3R5 bGUudGFiU2l6ZSgpKTsKICAgICAgICAgRmxvYXRQb2ludCB0ZXh0T3JpZ2luIHsgcmVjdC54KCkg KyBwYWludE9mZnNldC54KCksIHJvdW5kVG9EZXZpY2VQaXhlbChiYXNlbGluZSwgZGV2aWNlU2Nh bGVGYWN0b3IpIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRp b24vTGF5b3V0SW50ZWdyYXRpb25QYWdpbmF0aW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvblBhZ2luYXRpb24uY3BwCmluZGV4IDdlNjc1 YmQ4ZGRjZDc1NmQ2ZTZlNzkzYWMyMzYzODhjYjMyMmQxYTIuLjg0YzViMTJkMTE1Y2MxNDA2NWVi NmM5MDI3MTBmYmZkMTkzOGYxOWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9p bnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvblBhZ2luYXRpb24uY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvblBhZ2luYXRpb24uY3Bw CkBAIC0xMTQsNyArMTE0LDcgQEAgc3RhdGljIHZvaWQgdXBkYXRlTWluaW11bVBhZ2VIZWlnaHQo UmVuZGVyQmxvY2tGbG93JiBmbG93LCBjb25zdCBJbmxpbmVDb250ZW50JgogICAgIGF1dG8gd2lk b3dzID0gc3R5bGUuaGFzQXV0b1dpZG93cygpID8gMSA6IHN0ZDo6bWF4PGludD4oc3R5bGUud2lk b3dzKCksIDEpOwogICAgIGF1dG8gb3JwaGFucyA9IHN0eWxlLmhhc0F1dG9PcnBoYW5zKCkgPyAx IDogc3RkOjptYXg8aW50PihzdHlsZS5vcnBoYW5zKCksIDEpOwogICAgIGF1dG8gbWluaW11bUxp bmVDb3VudCA9IHN0ZDo6bWluPHVuc2lnbmVkPihzdGQ6Om1heCh3aWRvd3MsIG9ycGhhbnMpLCBs aW5lQ291bnQpOwotICAgIGZsb3cudXBkYXRlTWluaW11bVBhZ2VIZWlnaHQoMCwgTGF5b3V0VW5p dChpbmxpbmVDb250ZW50LmxpbmVzW21pbmltdW1MaW5lQ291bnQgLSAxXS5yZWN0KCkubWF4WSgp KSk7CisgICAgZmxvdy51cGRhdGVNaW5pbXVtUGFnZUhlaWdodCgwLCBMYXlvdXRVbml0KGlubGlu ZUNvbnRlbnQubGluZXNbbWluaW11bUxpbmVDb3VudCAtIDFdLmxpbmVCb3hCb3R0b20oKSkpOwog fQogCiBzdGF0aWMgUmVmPElubGluZUNvbnRlbnQ+IG1ha2VBZGp1c3RlZENvbnRlbnQoY29uc3Qg SW5saW5lQ29udGVudCYgaW5saW5lQ29udGVudCwgVmVjdG9yPGZsb2F0PiBhZGp1c3RtZW50cykK QEAgLTEyOSw3ICsxMjksNyBAQCBzdGF0aWMgUmVmPElubGluZUNvbnRlbnQ+IG1ha2VBZGp1c3Rl ZENvbnRlbnQoY29uc3QgSW5saW5lQ29udGVudCYgaW5saW5lQ29udGVudAogICAgICAgICByZXR1 cm4gTGluZSB7CiAgICAgICAgICAgICBsaW5lLmZpcnN0UnVuSW5kZXgoKSwKICAgICAgICAgICAg IGxpbmUucnVuQ291bnQoKSwKLSAgICAgICAgICAgIG1vdmVWZXJ0aWNhbGx5KGxpbmUucmVjdCgp LCBvZmZzZXQpLAorICAgICAgICAgICAgbW92ZVZlcnRpY2FsbHkoeyBGbG9hdFBvaW50IHsgbGlu ZS5saW5lQm94TGVmdCgpLCBsaW5lLmxpbmVCb3hUb3AoKSB9LCBGbG9hdFBvaW50IHsgbGluZS5s aW5lQm94UmlnaHQoKSwgbGluZS5saW5lQm94Qm90dG9tKCkgfSB9LCBvZmZzZXQpLAogICAgICAg ICAgICAgeyBsaW5lLmVuY2xvc2luZ0NvbnRlbnRUb3AoKSArIG9mZnNldCwgbGluZS5lbmNsb3Np bmdDb250ZW50Qm90dG9tKCkgKyBvZmZzZXQgfSwKICAgICAgICAgICAgIG1vdmVWZXJ0aWNhbGx5 KGxpbmUuc2Nyb2xsYWJsZU92ZXJmbG93KCksIG9mZnNldCksCiAgICAgICAgICAgICBtb3ZlVmVy dGljYWxseShsaW5lLmlua092ZXJmbG93KCksIG9mZnNldCksCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25SdW5JdGVyYXRvck1v ZGVyblBhdGguaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRl Z3JhdGlvblJ1bkl0ZXJhdG9yTW9kZXJuUGF0aC5oCmluZGV4IDA3N2IzZTdhOWQ5NzExMGE1OTZk NTE2YjNiZGE3MjZkNTJiODkxZGIuLjRiOTdiZGM5ZGE4N2E0ZWQyZjFhMTNhOTkxY2JlNDQwYTAx YzAyMzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlv dXRJbnRlZ3JhdGlvblJ1bkl0ZXJhdG9yTW9kZXJuUGF0aC5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvblJ1bkl0ZXJhdG9yTW9kZXJuUGF0 aC5oCkBAIC0yMjEsNyArMjIxLDcgQEAgcHJpdmF0ZToKICAgICAgICAgYXV0byYgc3R5bGUgPSBy dW4oKS5zdHlsZSgpOwogICAgICAgICBhdXRvIGV4cGFuc2lvbiA9IHJ1bigpLmV4cGFuc2lvbigp OwogICAgICAgICBhdXRvIHJlY3QgPSB0aGlzLT5yZWN0KCk7Ci0gICAgICAgIGF1dG8geFBvcyA9 IHJlY3QueCgpIC0gKGxpbmUoKS5yZWN0KCkueCgpICsgbGluZSgpLmNvbnRlbnRMZWZ0T2Zmc2V0 KCkpOworICAgICAgICBhdXRvIHhQb3MgPSByZWN0LngoKSAtIChsaW5lKCkubGluZUJveExlZnQo KSArIGxpbmUoKS5jb250ZW50TGVmdE9mZnNldCgpKTsKIAogICAgICAgICBhdXRvIHRleHRGb3JS dW4gPSBbJl0gewogICAgICAgICAgICAgaWYgKGh5cGhlbk1vZGUgPT0gSHlwaGVuTW9kZTo6SWdu b3JlIHx8ICFoYXNIeXBoZW4oKSkK