199057 2019-06-19 21:17:19 -0700 [LFC][IFC] Make the initial strut explicit 2019-06-20 08:18:35 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham commit-queue koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1546413 0 zalan 2019-06-19 21:17:19 -0700 so that we can ignore it in quirks mode 1546414 1 webkit-bug-importer 2019-06-19 21:18:04 -0700 <rdar://problem/51927864> 1546418 2 372529 zalan 2019-06-19 21:31:26 -0700 Created attachment 372529 Patch 1546496 3 372529 koivisto 2019-06-20 05:12:53 -0700 Comment on attachment 372529 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=372529&action=review > Source/WebCore/layout/inlineformatting/InlineFormattingContextLineLayout.cpp:137 > auto initialLineConstraints = Line::InitialConstraints { > lineInput.horizontalConstraint.logicalTopLeft, > lineInput.horizontalConstraint.availableLogicalWidth, > - mimimumLineHeight, > - initialBaselineOffset > + heightConstraints.height, > + heightConstraints.baselineOffset, > + heightConstraints.strut > }; Should InitialConstraints just have HeightConstraints member? 1546504 4 zalan 2019-06-20 07:19:04 -0700 (In reply to Antti Koivisto from comment #3) > Comment on attachment 372529 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=372529&action=review > > > Source/WebCore/layout/inlineformatting/InlineFormattingContextLineLayout.cpp:137 > > auto initialLineConstraints = Line::InitialConstraints { > > lineInput.horizontalConstraint.logicalTopLeft, > > lineInput.horizontalConstraint.availableLogicalWidth, > > - mimimumLineHeight, > > - initialBaselineOffset > > + heightConstraints.height, > > + heightConstraints.baselineOffset, > > + heightConstraints.strut > > }; > > Should InitialConstraints just have HeightConstraints member? good point! 1546515 5 372554 zalan 2019-06-20 07:47:59 -0700 Created attachment 372554 Patch 1546523 6 372554 commit-queue 2019-06-20 08:18:33 -0700 Comment on attachment 372554 Patch Clearing flags on attachment: 372554 Committed r246634: <https://trac.webkit.org/changeset/246634> 1546524 7 commit-queue 2019-06-20 08:18:35 -0700 All reviewed patches have been landed. Closing bug. 372529 2019-06-19 21:31:26 -0700 2019-06-20 07:47:56 -0700 Patch bug-199057-20190619213125.patch text/plain 10067 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ2NjI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2M5NmFjMDU0ZmNlODk3 M2NlZDAwY2I2YWNjMjNiOTg0MDJlNDIzNi4uZmJmN2M5ZWVjOTliZTQwNTVkMzk0ZGQ1YjlmNzMw NjM4ZTg4MGU0OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDE5LTA2LTE5ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBNYWtlIHRo ZSBpbml0aWFsIHN0cnV0IGV4cGxpY2l0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xOTkwNTcKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzUxOTI3ODY0 PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBz dHJ1dCBhbHdheXMgc2V0cyB0aGUgaW5pdGlhbCB2ZXJ0aWNhbCBjb25zdHJhaW50cyBvbiB0aGUg bmV3IGxpbmUgaW4gc3RyaWN0IG1vZGUuIEhvd2V2ZXIgaW4gcXVpcmtzIG1vZGUKKyAgICAgICAg d2UgY2FuIGlnbm9yZSBpdCBhcyBsb25nIGFzIHRoZXJlJ3Mgbm8gYmFzZWxpbmUgdHlwZSBjb250 ZW50IG9uIHRoZSBsaW5lLiAgCisKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9J bmxpbmVGb3JtYXR0aW5nQ29udGV4dC5oOgorICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0 aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0TGluZUxheW91dC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpMYXlvdXQ6OklubGluZUZvcm1hdHRpbmdDb250ZXh0OjpMaW5lTGF5b3V0OjpwbGFjZUlu bGluZUl0ZW1zIGNvbnN0KToKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9Jbmxp bmVGb3JtYXR0aW5nQ29udGV4dFF1aXJrcy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6 OklubGluZUZvcm1hdHRpbmdDb250ZXh0OjpRdWlya3M6OmxpbmVIZWlnaHRDb25zdHJhaW50cyk6 CisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZS5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmU6OmFwcGVuZFRleHRDb250ZW50KToKKyAgICAgICAg KFdlYkNvcmU6OkxheW91dDo6TGluZTo6YXBwZW5kSGFyZExpbmVCcmVhayk6CisgICAgICAgIChX ZWJDb3JlOjpMYXlvdXQ6OkxpbmU6OmFkanVzdEJhc2VsaW5lQW5kTGluZUhlaWdodCk6CisgICAg ICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZS5oOgorCiAyMDE5LTA2LTE5 ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xGQ11bSUZDXSBJ bnRyb2R1Y2UgTGluZTo6SW5pdGlhbENvbnN0cmFpbnRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5oIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0Nv bnRleHQuaAppbmRleCAzYThjZDM5NGEzY2NjYzhiZGE4N2U5MWY5MTJhYjY4NjZmMzkxN2VlLi5k Njc1ZjEwMTAyMjcxYWRmMDM5NGI5ZGU4MzhmMTMyOWNhYWY4NmI1IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4 dC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZv cm1hdHRpbmdDb250ZXh0LmgKQEAgLTk3LDYgKzk3LDEzIEBAIHByaXZhdGU6CiAgICAgY2xhc3Mg UXVpcmtzIHsKICAgICBwdWJsaWM6CiAgICAgICAgIHN0YXRpYyBib29sIGxpbmVEZXNjZW50TmVl ZHNDb2xsYXBzaW5nKGNvbnN0IExheW91dFN0YXRlJiwgY29uc3QgTGluZTo6Q29udGVudCYpOwor CisgICAgICAgIHN0cnVjdCBIZWlnaHRDb25zdHJhaW50cyB7CisgICAgICAgICAgICBMYXlvdXRV bml0IGhlaWdodDsKKyAgICAgICAgICAgIExheW91dFVuaXQgYmFzZWxpbmVPZmZzZXQ7CisgICAg ICAgICAgICBPcHRpb25hbDxMaW5lQm94OjpCYXNlbGluZT4gc3RydXQ7CisgICAgICAgIH07Cisg ICAgICAgIHN0YXRpYyBIZWlnaHRDb25zdHJhaW50cyBsaW5lSGVpZ2h0Q29uc3RyYWludHMoY29u c3QgTGF5b3V0U3RhdGUmLCBjb25zdCBCb3gmIGZvcm1hdHRpbmdSb290KTsKICAgICB9OwogCiAg ICAgY2xhc3MgR2VvbWV0cnkgOiBwdWJsaWMgRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5IHsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGlu ZUZvcm1hdHRpbmdDb250ZXh0TGluZUxheW91dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv aW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dExpbmVMYXlvdXQuY3BwCmlu ZGV4IDkxNGVkMzAxMWY3NjhjNmQwZTI0NjkwNTkwZDBjMmZkNjhhMGVhODguLjA5ZWRkMzg1YzI4 NjIwYWU0YTJmMmZhMjZjMjMzYTIyYzEyMDVlNzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0TGluZUxheW91 dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5l Rm9ybWF0dGluZ0NvbnRleHRMaW5lTGF5b3V0LmNwcApAQCAtMTI3LDEzICsxMjcsMTMgQEAgc3Rh dGljIExheW91dFVuaXQgaW5saW5lSXRlbVdpZHRoKGNvbnN0IExheW91dFN0YXRlJiBsYXlvdXRT dGF0ZSwgY29uc3QgSW5saW5lSXQKIAogSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OkxpbmVMYXlv dXQ6OkxpbmVDb250ZW50IElubGluZUZvcm1hdHRpbmdDb250ZXh0OjpMaW5lTGF5b3V0OjpwbGFj ZUlubGluZUl0ZW1zKGNvbnN0IExpbmVJbnB1dCYgbGluZUlucHV0KSBjb25zdAogewotICAgIGF1 dG8gbWltaW11bUxpbmVIZWlnaHQgPSBtX2Zvcm1hdHRpbmdSb290LnN0eWxlKCkuY29tcHV0ZWRM aW5lSGVpZ2h0KCk7Ci0gICAgYXV0byBpbml0aWFsQmFzZWxpbmVPZmZzZXQgPSBMaW5lOjpoYWxm TGVhZGluZ01ldHJpY3MobV9mb3JtYXR0aW5nUm9vdC5zdHlsZSgpLmZvbnRNZXRyaWNzKCksIG1p bWltdW1MaW5lSGVpZ2h0KS5hc2NlbnQ7CisgICAgYXV0byBoZWlnaHRDb25zdHJhaW50cyA9IFF1 aXJrczo6bGluZUhlaWdodENvbnN0cmFpbnRzKGxheW91dFN0YXRlKCksIG1fZm9ybWF0dGluZ1Jv b3QpOwogICAgIGF1dG8gaW5pdGlhbExpbmVDb25zdHJhaW50cyA9IExpbmU6OkluaXRpYWxDb25z dHJhaW50cyB7CiAgICAgICAgIGxpbmVJbnB1dC5ob3Jpem9udGFsQ29uc3RyYWludC5sb2dpY2Fs VG9wTGVmdCwKICAgICAgICAgbGluZUlucHV0Lmhvcml6b250YWxDb25zdHJhaW50LmF2YWlsYWJs ZUxvZ2ljYWxXaWR0aCwKLSAgICAgICAgbWltaW11bUxpbmVIZWlnaHQsCi0gICAgICAgIGluaXRp YWxCYXNlbGluZU9mZnNldAorICAgICAgICBoZWlnaHRDb25zdHJhaW50cy5oZWlnaHQsCisgICAg ICAgIGhlaWdodENvbnN0cmFpbnRzLmJhc2VsaW5lT2Zmc2V0LAorICAgICAgICBoZWlnaHRDb25z dHJhaW50cy5zdHJ1dAogICAgIH07CiAgICAgYXV0byBsaW5lID0gTGluZSB7IGxheW91dFN0YXRl KCksIGluaXRpYWxMaW5lQ29uc3RyYWludHMsIGxpbmVJbnB1dC5za2lwVmVydGljYWxBbGlnbWVu dCB9OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGlu Zy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dFF1aXJrcy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dFF1aXJrcy5jcHAKaW5k ZXggMTNlYzhlOGJiYTRhMDg3ODU4NGNmODE3YjU1MWIyNGY3NzU3OTkxMy4uZTg5NDEwZWQ4NDE4 NTk4NjczY2Y3Yjk4Yzc5ZjVlMzZiMDRlZDlhNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv bGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRRdWlya3MuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1h dHRpbmdDb250ZXh0UXVpcmtzLmNwcApAQCAtODIsNiArODIsMjYgQEAgYm9vbCBJbmxpbmVGb3Jt YXR0aW5nQ29udGV4dDo6UXVpcmtzOjpsaW5lRGVzY2VudE5lZWRzQ29sbGFwc2luZyhjb25zdCBM YXlvdXRTdGEKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAorSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6 OlF1aXJrczo6SGVpZ2h0Q29uc3RyYWludHMgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OlF1aXJr czo6bGluZUhlaWdodENvbnN0cmFpbnRzKGNvbnN0IExheW91dFN0YXRlJiBsYXlvdXRTdGF0ZSwg Y29uc3QgQm94JiBmb3JtYXR0aW5nUm9vdCkKK3sKKyAgICAvLyBjb21wdXRlZExpbmVIZWlnaHQg dGFrZXMgZm9udC1zaXplIGludG8gYWNjb3VudCB3aGVuIGxpbmUtaGVpZ2h0IGlzIG5vdCBzZXQu CisgICAgLy8gU3RydXQgaXMgdGhlIGltYWdpbmFyeSBib3ggdGhhdCB3ZSBwdXQgb24gZXZlcnkg bGluZS4gSXQgc2V0cyB0aGUgaW5pdGlhbCB2ZXJ0aWNhbCBjb25zdHJhaW50cyBmb3IgZWFjaCBu ZXcgbGluZS4KKyAgICBhdXRvIHN0cnV0SGVpZ2h0ID0gZm9ybWF0dGluZ1Jvb3Quc3R5bGUoKS5j b21wdXRlZExpbmVIZWlnaHQoKTsKKyAgICBhdXRvIHN0cnV0QmFzZWxpbmVPZmZzZXQgPSBMaW5l OjpoYWxmTGVhZGluZ01ldHJpY3MoZm9ybWF0dGluZ1Jvb3Quc3R5bGUoKS5mb250TWV0cmljcygp LCBzdHJ1dEhlaWdodCkuYXNjZW50OworICAgIGlmIChsYXlvdXRTdGF0ZS5pbk5vUXVpcmtzTW9k ZSgpKQorICAgICAgICByZXR1cm4geyBzdHJ1dEhlaWdodCwgc3RydXRCYXNlbGluZU9mZnNldCwg eyB9IH07CisKKyAgICBhdXRvIGxpbmVIZWlnaHQgPSBmb3JtYXR0aW5nUm9vdC5zdHlsZSgpLmxp bmVIZWlnaHQoKTsKKyAgICBpZiAobGluZUhlaWdodC5pc1BlcmNlbnRPckNhbGN1bGF0ZWQoKSkg eworICAgICAgICBhdXRvIGluaXRpYWxCYXNlbGluZU9mZnNldCA9IExpbmU6OmhhbGZMZWFkaW5n TWV0cmljcyhmb3JtYXR0aW5nUm9vdC5zdHlsZSgpLmZvbnRNZXRyaWNzKCksIHsgfSkuYXNjZW50 OworICAgICAgICByZXR1cm4geyBpbml0aWFsQmFzZWxpbmVPZmZzZXQsIGluaXRpYWxCYXNlbGlu ZU9mZnNldCwgTGluZUJveDo6QmFzZWxpbmUgeyBzdHJ1dEJhc2VsaW5lT2Zmc2V0LCBzdHJ1dEhl aWdodCAtIHN0cnV0QmFzZWxpbmVPZmZzZXQgfSB9OworICAgIH0KKyAgICAvLyBGSVhNRTogVGhl IG9ubHkgcmVhc29uIHdoeSB3ZSB1c2UgaW50VmFsdWUoKSBoZXJlIGlzIHRvIG1hdGNoIGN1cnJl bnQgaW5saW5lIHRyZWUgKGludGVncmFsKWJlaGF2aW9yLgorICAgIGF1dG8gaW5pdGlhbExpbmVI ZWlnaHQgPSBMYXlvdXRVbml0IHsgbGluZUhlaWdodC5pbnRWYWx1ZSgpIH07CisgICAgYXV0byBp bml0aWFsQmFzZWxpbmVPZmZzZXQgPSBMaW5lOjpoYWxmTGVhZGluZ01ldHJpY3MoZm9ybWF0dGlu Z1Jvb3Quc3R5bGUoKS5mb250TWV0cmljcygpLCBpbml0aWFsTGluZUhlaWdodCkuYXNjZW50Owor ICAgIHJldHVybiB7IGluaXRpYWxMaW5lSGVpZ2h0LCBpbml0aWFsQmFzZWxpbmVPZmZzZXQsIExp bmVCb3g6OkJhc2VsaW5lIHsgc3RydXRCYXNlbGluZU9mZnNldCwgc3RydXRIZWlnaHQgLSBzdHJ1 dEJhc2VsaW5lT2Zmc2V0IH0gfTsKK30KKwogfQogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lLmNwcCBiL1NvdXJjZS9XZWJD b3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUuY3BwCmluZGV4IDY2ZmNhMmY1 YmE0NzgxNTJiMTMyZDZlMGRkYmI1ZTQ1YWUzZTkzNjEuLmIwMTdiYjA2NWIyMDFmN2I5MWVhY2M5 ZWU2YjMwZjYyNDgyZGE4YTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxp bmVmb3JtYXR0aW5nL0lubGluZUxpbmUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9p bmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUuY3BwCkBAIC00OSw2ICs0OSw3IEBAIExpbmU6Okxp bmUoY29uc3QgTGF5b3V0U3RhdGUmIGxheW91dFN0YXRlLCBjb25zdCBJbml0aWFsQ29uc3RyYWlu dHMmIGluaXRpYWxDb25zCiAgICAgLCBtX2NvbnRlbnQoc3RkOjptYWtlX3VuaXF1ZTxMaW5lOjpD b250ZW50PigpKQogICAgICwgbV9sb2dpY2FsVG9wTGVmdChpbml0aWFsQ29uc3RyYWludHMudG9w TGVmdCkKICAgICAsIG1fYmFzZWxpbmUoeyBpbml0aWFsQ29uc3RyYWludHMuYmFzZWxpbmVPZmZz ZXQsIGluaXRpYWxDb25zdHJhaW50cy5oZWlnaHQgLSBpbml0aWFsQ29uc3RyYWludHMuYmFzZWxp bmVPZmZzZXQgfSkKKyAgICAsIG1faW5pdGlhbFN0cnV0KGluaXRpYWxDb25zdHJhaW50cy5zdHJ1 dCkKICAgICAsIG1fY29udGVudExvZ2ljYWxIZWlnaHQoaW5pdGlhbENvbnN0cmFpbnRzLmhlaWdo dCkKICAgICAsIG1fbGluZUxvZ2ljYWxXaWR0aChpbml0aWFsQ29uc3RyYWludHMuYXZhaWxhYmxl V2lkdGgpCiAgICAgLCBtX3NraXBWZXJ0aWNhbEFsaWdtZW50KHNraXBWZXJ0aWNhbEFsaWdtZW50 ID09IFNraXBWZXJ0aWNhbEFsaWdtZW50OjpZZXMpCkBAIC0yNTQsOCArMjU1LDExIEBAIHZvaWQg TGluZTo6YXBwZW5kVGV4dENvbnRlbnQoY29uc3QgSW5saW5lVGV4dEl0ZW0mIGlubGluZUl0ZW0s IExheW91dFVuaXQgbG9naWNhCiAgICAgYXV0byBsb2dpY2FsUmVjdCA9IERpc3BsYXk6OlJlY3Qg eyB9OwogICAgIGxvZ2ljYWxSZWN0LnNldExlZnQoY29udGVudExvZ2ljYWxSaWdodCgpKTsKICAg ICBsb2dpY2FsUmVjdC5zZXRXaWR0aChsb2dpY2FsV2lkdGgpOwotICAgIGlmICghbV9za2lwVmVy dGljYWxBbGlnbWVudCkKLSAgICAgICAgbG9naWNhbFJlY3Quc2V0SGVpZ2h0KGlubGluZUl0ZW1D b250ZW50SGVpZ2h0KGlubGluZUl0ZW0pKTsKKyAgICBpZiAoIW1fc2tpcFZlcnRpY2FsQWxpZ21l bnQpIHsKKyAgICAgICAgYXV0byBydW5IZWlnaHQgPSBpbmxpbmVJdGVtQ29udGVudEhlaWdodChp bmxpbmVJdGVtKTsKKyAgICAgICAgbG9naWNhbFJlY3Quc2V0SGVpZ2h0KHJ1bkhlaWdodCk7Cisg ICAgICAgIGFkanVzdEJhc2VsaW5lQW5kTGluZUhlaWdodChpbmxpbmVJdGVtLCBydW5IZWlnaHQp OworICAgIH0KIAogICAgIGF1dG8gdGV4dENvbnRleHQgPSBDb250ZW50OjpSdW46OlRleHRDb250 ZXh0IHsgaW5saW5lSXRlbS5zdGFydCgpLCBpbmxpbmVJdGVtLmlzQ29sbGFwc2VkKCkgPyAxIDog aW5saW5lSXRlbS5sZW5ndGgoKSB9OwogICAgIGF1dG8gbGluZUl0ZW0gPSBzdGQ6Om1ha2VfdW5p cXVlPENvbnRlbnQ6OlJ1bj4oaW5saW5lSXRlbSwgbG9naWNhbFJlY3QsIHRleHRDb250ZXh0LCBp c0NvbXBsZXRlbHlDb2xsYXBzZWQsIGNhbkJlRXh0ZW5kZWQpOwpAQCAtMjk1LDE0ICsyOTksMTYg QEAgdm9pZCBMaW5lOjphcHBlbmRIYXJkTGluZUJyZWFrKGNvbnN0IElubGluZUl0ZW0mIGlubGlu ZUl0ZW0pCiAgICAgYXV0byBsb2dpY2FsUmVjdCA9IERpc3BsYXk6OlJlY3QgeyB9OwogICAgIGxv Z2ljYWxSZWN0LnNldExlZnQoY29udGVudExvZ2ljYWxSaWdodCgpKTsKICAgICBsb2dpY2FsUmVj dC5zZXRXaWR0aCh7IH0pOwotICAgIGlmICghbV9za2lwVmVydGljYWxBbGlnbWVudCkKKyAgICBp ZiAoIW1fc2tpcFZlcnRpY2FsQWxpZ21lbnQpIHsKKyAgICAgICAgYWRqdXN0QmFzZWxpbmVBbmRM aW5lSGVpZ2h0KGlubGluZUl0ZW0sIHsgfSk7CiAgICAgICAgIGxvZ2ljYWxSZWN0LnNldEhlaWdo dChsb2dpY2FsSGVpZ2h0KCkpOworICAgIH0KICAgICBtX2NvbnRlbnQtPnJ1bnMoKS5hcHBlbmQo c3RkOjptYWtlX3VuaXF1ZTxDb250ZW50OjpSdW4+KGlubGluZUl0ZW0sIGxvZ2ljYWxSZWN0LCBD b250ZW50OjpSdW46OlRleHRDb250ZXh0IHsgfSwgZmFsc2UsIGZhbHNlKSk7CiB9CiAKIHZvaWQg TGluZTo6YWRqdXN0QmFzZWxpbmVBbmRMaW5lSGVpZ2h0KGNvbnN0IElubGluZUl0ZW0mIGlubGlu ZUl0ZW0sIExheW91dFVuaXQgcnVuSGVpZ2h0KQogewotICAgIEFTU0VSVCghaW5saW5lSXRlbS5p c0NvbnRhaW5lckVuZCgpICYmICFpbmxpbmVJdGVtLmlzVGV4dCgpKTsKKyAgICBBU1NFUlQoIWlu bGluZUl0ZW0uaXNDb250YWluZXJFbmQoKSk7CiAgICAgYXV0byYgbGF5b3V0Qm94ID0gaW5saW5l SXRlbS5sYXlvdXRCb3goKTsKICAgICBhdXRvJiBzdHlsZSA9IGxheW91dEJveC5zdHlsZSgpOwog CkBAIC0zMTYsNiArMzIyLDE2IEBAIHZvaWQgTGluZTo6YWRqdXN0QmFzZWxpbmVBbmRMaW5lSGVp Z2h0KGNvbnN0IElubGluZUl0ZW0mIGlubGluZUl0ZW0sIExheW91dFVuaXQKICAgICAgICAgbV9j b250ZW50TG9naWNhbEhlaWdodCA9IHN0ZDo6bWF4KG1fY29udGVudExvZ2ljYWxIZWlnaHQsIGJh c2VsaW5lQWxpZ25lZENvbnRlbnRIZWlnaHQoKSk7CiAgICAgICAgIHJldHVybjsKICAgICB9Cisg ICAgLy8gQXBwbHkgaW5pdGlhbCBzdHJ1dCBpZiBuZWVkZWQuCisgICAgaWYgKGlubGluZUl0ZW0u aXNUZXh0KCkgfHwgaW5saW5lSXRlbS5pc0hhcmRMaW5lQnJlYWsoKSkgeworICAgICAgICBpZiAo IW1faW5pdGlhbFN0cnV0KQorICAgICAgICAgICAgcmV0dXJuOworICAgICAgICBtX2Jhc2VsaW5l LmFzY2VudCA9IHN0ZDo6bWF4KG1faW5pdGlhbFN0cnV0LT5hc2NlbnQsIG1fYmFzZWxpbmUuYXNj ZW50KTsKKyAgICAgICAgbV9iYXNlbGluZS5kZXNjZW50ID0gc3RkOjptYXgobV9pbml0aWFsU3Ry dXQtPmRlc2NlbnQsIG1fYmFzZWxpbmUuZGVzY2VudCk7CisgICAgICAgIG1fY29udGVudExvZ2lj YWxIZWlnaHQgPSBzdGQ6Om1heChtX2NvbnRlbnRMb2dpY2FsSGVpZ2h0LCBiYXNlbGluZUFsaWdu ZWRDb250ZW50SGVpZ2h0KCkpOworICAgICAgICBtX2luaXRpYWxTdHJ1dCA9IHsgfTsKKyAgICAg ICAgcmV0dXJuOworICAgIH0KICAgICAvLyBSZXBsYWNlZCBhbmQgbm9uLXJlcGxhY2VkIGlubGlu ZSBsZXZlbCBib3guCiAgICAgc3dpdGNoIChpbmxpbmVJdGVtLnN0eWxlKCkudmVydGljYWxBbGln bigpKSB7CiAgICAgY2FzZSBWZXJ0aWNhbEFsaWduOjpCYXNlbGluZToKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUuaCBiL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUuaAppbmRleCBjM2U2 MDFhY2U2MzQzZDNkZmNkYjE1MDc3ODg0N2UzOGQ1Njg5YzBmLi40ZWU4OTNmY2JlNmZjN2ZlYWY3 NzYwZTNmYmJmOWEyOGJkZTdlZThiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv aW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZS5oCkBAIC00Myw2ICs0Myw3IEBAIHB1YmxpYzoK ICAgICAgICAgTGF5b3V0VW5pdCBhdmFpbGFibGVXaWR0aDsKICAgICAgICAgTGF5b3V0VW5pdCBo ZWlnaHQ7CiAgICAgICAgIExheW91dFVuaXQgYmFzZWxpbmVPZmZzZXQ7CisgICAgICAgIE9wdGlv bmFsPExpbmVCb3g6OkJhc2VsaW5lPiBzdHJ1dDsKICAgICB9OwogICAgIGVudW0gY2xhc3MgU2tp cFZlcnRpY2FsQWxpZ21lbnQgeyBObywgWWVzIH07CiAgICAgTGluZShjb25zdCBMYXlvdXRTdGF0 ZSYsIGNvbnN0IEluaXRpYWxDb25zdHJhaW50cyYsIFNraXBWZXJ0aWNhbEFsaWdtZW50KTsKQEAg LTE0MSw2ICsxNDIsNyBAQCBwcml2YXRlOgogICAgIExpbmVCb3g6OkJhc2VsaW5lIG1fYmFzZWxp bmU7CiAgICAgTGF5b3V0VW5pdCBtX2Jhc2VsaW5lVG9wOwogCisgICAgT3B0aW9uYWw8TGluZUJv eDo6QmFzZWxpbmU+IG1faW5pdGlhbFN0cnV0OwogICAgIExheW91dFVuaXQgbV9jb250ZW50TG9n aWNhbEhlaWdodDsKICAgICBMYXlvdXRVbml0IG1fbGluZUxvZ2ljYWxXaWR0aDsKICAgICBib29s IG1fc2tpcFZlcnRpY2FsQWxpZ21lbnQgeyBmYWxzZSB9Owo= 372554 2019-06-20 07:47:59 -0700 2019-06-20 08:18:33 -0700 Patch bug-199057-20190620074757.patch text/plain 10320 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ2NjMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzc5NzI0MzUyYzM1YzZj MjM0NmE1ODZiMWViMmM3M2YxNzVlNDgxYy4uZTYyNDIwY2JkYzkwZWQxYTdmZWQ5YjA5OTk3MGRh OTM5N2IyYTgxYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDE5LTA2LTIwICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBNYWtlIHRo ZSBpbml0aWFsIHN0cnV0IGV4cGxpY2l0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xOTkwNTcKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzUxOTI3ODY0 PgorCisgICAgICAgIFJldmlld2VkIGJ5IEFudHRpIEtvaXZpc3RvLgorCisgICAgICAgIFRoZSBz dHJ1dCBhbHdheXMgc2V0cyB0aGUgaW5pdGlhbCB2ZXJ0aWNhbCBjb25zdHJhaW50cyBvbiB0aGUg bmV3IGxpbmUgaW4gc3RyaWN0IG1vZGUuIEhvd2V2ZXIgaW4gcXVpcmtzIG1vZGUKKyAgICAgICAg d2UgY2FuIGlnbm9yZSBpdCBhcyBsb25nIGFzIHRoZXJlJ3Mgbm8gYmFzZWxpbmUgdHlwZSBjb250 ZW50IG9uIHRoZSBsaW5lLiAgCisKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9J bmxpbmVGb3JtYXR0aW5nQ29udGV4dC5oOgorICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0 aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0TGluZUxheW91dC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpMYXlvdXQ6OklubGluZUZvcm1hdHRpbmdDb250ZXh0OjpMaW5lTGF5b3V0OjpwbGFjZUlu bGluZUl0ZW1zIGNvbnN0KToKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9Jbmxp bmVGb3JtYXR0aW5nQ29udGV4dFF1aXJrcy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6 OklubGluZUZvcm1hdHRpbmdDb250ZXh0OjpRdWlya3M6OmxpbmVIZWlnaHRDb25zdHJhaW50cyk6 CisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZS5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmU6OmFwcGVuZFRleHRDb250ZW50KToKKyAgICAgICAg KFdlYkNvcmU6OkxheW91dDo6TGluZTo6YXBwZW5kSGFyZExpbmVCcmVhayk6CisgICAgICAgIChX ZWJDb3JlOjpMYXlvdXQ6OkxpbmU6OmFkanVzdEJhc2VsaW5lQW5kTGluZUhlaWdodCk6CisgICAg ICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZS5oOgorCiAyMDE5LTA2LTIw ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xGQ11bSUZDXSBJ bnRyb2R1Y2UgTGluZTo6SW5pdGlhbENvbnN0cmFpbnRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5oIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0Nv bnRleHQuaAppbmRleCAzYThjZDM5NGEzY2NjYzhiZGE4N2U5MWY5MTJhYjY4NjZmMzkxN2VlLi4y NDBkMTYyOTUzOTI4MmViZWJjMzI2NjY0YTAyODcxMmRlZDI2YzJiIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4 dC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZv cm1hdHRpbmdDb250ZXh0LmgKQEAgLTk3LDYgKzk3LDcgQEAgcHJpdmF0ZToKICAgICBjbGFzcyBR dWlya3MgewogICAgIHB1YmxpYzoKICAgICAgICAgc3RhdGljIGJvb2wgbGluZURlc2NlbnROZWVk c0NvbGxhcHNpbmcoY29uc3QgTGF5b3V0U3RhdGUmLCBjb25zdCBMaW5lOjpDb250ZW50Jik7Cisg ICAgICAgIHN0YXRpYyBMaW5lOjpJbml0aWFsQ29uc3RyYWludHM6OkhlaWdodEFuZEJhc2VsaW5l IGxpbmVIZWlnaHRDb25zdHJhaW50cyhjb25zdCBMYXlvdXRTdGF0ZSYsIGNvbnN0IEJveCYgZm9y bWF0dGluZ1Jvb3QpOwogICAgIH07CiAKICAgICBjbGFzcyBHZW9tZXRyeSA6IHB1YmxpYyBGb3Jt YXR0aW5nQ29udGV4dDo6R2VvbWV0cnkgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRMaW5lTGF5b3V0LmNw cCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRp bmdDb250ZXh0TGluZUxheW91dC5jcHAKaW5kZXggOTE0ZWQzMDExZjc2OGM2ZDBlMjQ2OTA1OTBk MGMyZmQ2OGEwZWE4OC4uMWRjM2MwNjdhZGY0Mzc2MDlhM2NiNzRlMjZjNjViOTY4MGJlZGQ1YyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5l Rm9ybWF0dGluZ0NvbnRleHRMaW5lTGF5b3V0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dExpbmVMYXlvdXQuY3Bw CkBAIC0xMjcsMTMgKzEyNywxMCBAQCBzdGF0aWMgTGF5b3V0VW5pdCBpbmxpbmVJdGVtV2lkdGgo Y29uc3QgTGF5b3V0U3RhdGUmIGxheW91dFN0YXRlLCBjb25zdCBJbmxpbmVJdAogCiBJbmxpbmVG b3JtYXR0aW5nQ29udGV4dDo6TGluZUxheW91dDo6TGluZUNvbnRlbnQgSW5saW5lRm9ybWF0dGlu Z0NvbnRleHQ6OkxpbmVMYXlvdXQ6OnBsYWNlSW5saW5lSXRlbXMoY29uc3QgTGluZUlucHV0JiBs aW5lSW5wdXQpIGNvbnN0CiB7Ci0gICAgYXV0byBtaW1pbXVtTGluZUhlaWdodCA9IG1fZm9ybWF0 dGluZ1Jvb3Quc3R5bGUoKS5jb21wdXRlZExpbmVIZWlnaHQoKTsKLSAgICBhdXRvIGluaXRpYWxC YXNlbGluZU9mZnNldCA9IExpbmU6OmhhbGZMZWFkaW5nTWV0cmljcyhtX2Zvcm1hdHRpbmdSb290 LnN0eWxlKCkuZm9udE1ldHJpY3MoKSwgbWltaW11bUxpbmVIZWlnaHQpLmFzY2VudDsKICAgICBh dXRvIGluaXRpYWxMaW5lQ29uc3RyYWludHMgPSBMaW5lOjpJbml0aWFsQ29uc3RyYWludHMgewog ICAgICAgICBsaW5lSW5wdXQuaG9yaXpvbnRhbENvbnN0cmFpbnQubG9naWNhbFRvcExlZnQsCiAg ICAgICAgIGxpbmVJbnB1dC5ob3Jpem9udGFsQ29uc3RyYWludC5hdmFpbGFibGVMb2dpY2FsV2lk dGgsCi0gICAgICAgIG1pbWltdW1MaW5lSGVpZ2h0LAotICAgICAgICBpbml0aWFsQmFzZWxpbmVP ZmZzZXQKKyAgICAgICAgUXVpcmtzOjpsaW5lSGVpZ2h0Q29uc3RyYWludHMobGF5b3V0U3RhdGUo KSwgbV9mb3JtYXR0aW5nUm9vdCkKICAgICB9OwogICAgIGF1dG8gbGluZSA9IExpbmUgeyBsYXlv dXRTdGF0ZSgpLCBpbml0aWFsTGluZUNvbnN0cmFpbnRzLCBsaW5lSW5wdXQuc2tpcFZlcnRpY2Fs QWxpZ21lbnQgfTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZv cm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRRdWlya3MuY3BwIGIvU291cmNlL1dlYkNv cmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRRdWlya3Mu Y3BwCmluZGV4IDEzZWM4ZThiYmE0YTA4Nzg1ODRjZjgxN2I1NTFiMjRmNzc1Nzk5MTMuLmMyYTc5 MDM5MTBjNzdjMjkyMWQ4MWYxMWMwMzM2NmU3NmEwMDE4YTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0UXVp cmtzLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9Jbmxp bmVGb3JtYXR0aW5nQ29udGV4dFF1aXJrcy5jcHAKQEAgLTgyLDYgKzgyLDI2IEBAIGJvb2wgSW5s aW5lRm9ybWF0dGluZ0NvbnRleHQ6OlF1aXJrczo6bGluZURlc2NlbnROZWVkc0NvbGxhcHNpbmco Y29uc3QgTGF5b3V0U3RhCiAgICAgcmV0dXJuIHRydWU7CiB9CiAKK0xpbmU6OkluaXRpYWxDb25z dHJhaW50czo6SGVpZ2h0QW5kQmFzZWxpbmUgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OlF1aXJr czo6bGluZUhlaWdodENvbnN0cmFpbnRzKGNvbnN0IExheW91dFN0YXRlJiBsYXlvdXRTdGF0ZSwg Y29uc3QgQm94JiBmb3JtYXR0aW5nUm9vdCkKK3sKKyAgICAvLyBjb21wdXRlZExpbmVIZWlnaHQg dGFrZXMgZm9udC1zaXplIGludG8gYWNjb3VudCB3aGVuIGxpbmUtaGVpZ2h0IGlzIG5vdCBzZXQu CisgICAgLy8gU3RydXQgaXMgdGhlIGltYWdpbmFyeSBib3ggdGhhdCB3ZSBwdXQgb24gZXZlcnkg bGluZS4gSXQgc2V0cyB0aGUgaW5pdGlhbCB2ZXJ0aWNhbCBjb25zdHJhaW50cyBmb3IgZWFjaCBu ZXcgbGluZS4KKyAgICBhdXRvIHN0cnV0SGVpZ2h0ID0gZm9ybWF0dGluZ1Jvb3Quc3R5bGUoKS5j b21wdXRlZExpbmVIZWlnaHQoKTsKKyAgICBhdXRvIHN0cnV0QmFzZWxpbmVPZmZzZXQgPSBMaW5l OjpoYWxmTGVhZGluZ01ldHJpY3MoZm9ybWF0dGluZ1Jvb3Quc3R5bGUoKS5mb250TWV0cmljcygp LCBzdHJ1dEhlaWdodCkuYXNjZW50OworICAgIGlmIChsYXlvdXRTdGF0ZS5pbk5vUXVpcmtzTW9k ZSgpKQorICAgICAgICByZXR1cm4geyBzdHJ1dEhlaWdodCwgc3RydXRCYXNlbGluZU9mZnNldCwg eyB9IH07CisKKyAgICBhdXRvIGxpbmVIZWlnaHQgPSBmb3JtYXR0aW5nUm9vdC5zdHlsZSgpLmxp bmVIZWlnaHQoKTsKKyAgICBpZiAobGluZUhlaWdodC5pc1BlcmNlbnRPckNhbGN1bGF0ZWQoKSkg eworICAgICAgICBhdXRvIGluaXRpYWxCYXNlbGluZU9mZnNldCA9IExpbmU6OmhhbGZMZWFkaW5n TWV0cmljcyhmb3JtYXR0aW5nUm9vdC5zdHlsZSgpLmZvbnRNZXRyaWNzKCksIHsgfSkuYXNjZW50 OworICAgICAgICByZXR1cm4geyBpbml0aWFsQmFzZWxpbmVPZmZzZXQsIGluaXRpYWxCYXNlbGlu ZU9mZnNldCwgTGluZUJveDo6QmFzZWxpbmUgeyBzdHJ1dEJhc2VsaW5lT2Zmc2V0LCBzdHJ1dEhl aWdodCAtIHN0cnV0QmFzZWxpbmVPZmZzZXQgfSB9OworICAgIH0KKyAgICAvLyBGSVhNRTogVGhl IG9ubHkgcmVhc29uIHdoeSB3ZSB1c2UgaW50VmFsdWUoKSBoZXJlIGlzIHRvIG1hdGNoIGN1cnJl bnQgaW5saW5lIHRyZWUgKGludGVncmFsKWJlaGF2aW9yLgorICAgIGF1dG8gaW5pdGlhbExpbmVI ZWlnaHQgPSBMYXlvdXRVbml0IHsgbGluZUhlaWdodC5pbnRWYWx1ZSgpIH07CisgICAgYXV0byBp bml0aWFsQmFzZWxpbmVPZmZzZXQgPSBMaW5lOjpoYWxmTGVhZGluZ01ldHJpY3MoZm9ybWF0dGlu Z1Jvb3Quc3R5bGUoKS5mb250TWV0cmljcygpLCBpbml0aWFsTGluZUhlaWdodCkuYXNjZW50Owor ICAgIHJldHVybiB7IGluaXRpYWxMaW5lSGVpZ2h0LCBpbml0aWFsQmFzZWxpbmVPZmZzZXQsIExp bmVCb3g6OkJhc2VsaW5lIHsgc3RydXRCYXNlbGluZU9mZnNldCwgc3RydXRIZWlnaHQgLSBzdHJ1 dEJhc2VsaW5lT2Zmc2V0IH0gfTsKK30KKwogfQogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lLmNwcCBiL1NvdXJjZS9XZWJD b3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUuY3BwCmluZGV4IDY2ZmNhMmY1 YmE0NzgxNTJiMTMyZDZlMGRkYmI1ZTQ1YWUzZTkzNjEuLmMwY2Q1ZGEwNjAwMzhlNzYwZjRmNmZl YWNjYjFiNThlY2I1ZGRiMTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxp bmVmb3JtYXR0aW5nL0lubGluZUxpbmUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9p bmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUuY3BwCkBAIC00OCw4ICs0OCw5IEBAIExpbmU6Okxp bmUoY29uc3QgTGF5b3V0U3RhdGUmIGxheW91dFN0YXRlLCBjb25zdCBJbml0aWFsQ29uc3RyYWlu dHMmIGluaXRpYWxDb25zCiAgICAgOiBtX2xheW91dFN0YXRlKGxheW91dFN0YXRlKQogICAgICwg bV9jb250ZW50KHN0ZDo6bWFrZV91bmlxdWU8TGluZTo6Q29udGVudD4oKSkKICAgICAsIG1fbG9n aWNhbFRvcExlZnQoaW5pdGlhbENvbnN0cmFpbnRzLnRvcExlZnQpCi0gICAgLCBtX2Jhc2VsaW5l KHsgaW5pdGlhbENvbnN0cmFpbnRzLmJhc2VsaW5lT2Zmc2V0LCBpbml0aWFsQ29uc3RyYWludHMu aGVpZ2h0IC0gaW5pdGlhbENvbnN0cmFpbnRzLmJhc2VsaW5lT2Zmc2V0IH0pCi0gICAgLCBtX2Nv bnRlbnRMb2dpY2FsSGVpZ2h0KGluaXRpYWxDb25zdHJhaW50cy5oZWlnaHQpCisgICAgLCBtX2Jh c2VsaW5lKHsgaW5pdGlhbENvbnN0cmFpbnRzLmhlaWdodEFuZEJhc2VsaW5lLmJhc2VsaW5lT2Zm c2V0LCBpbml0aWFsQ29uc3RyYWludHMuaGVpZ2h0QW5kQmFzZWxpbmUuaGVpZ2h0IC0gaW5pdGlh bENvbnN0cmFpbnRzLmhlaWdodEFuZEJhc2VsaW5lLmJhc2VsaW5lT2Zmc2V0IH0pCisgICAgLCBt X2luaXRpYWxTdHJ1dChpbml0aWFsQ29uc3RyYWludHMuaGVpZ2h0QW5kQmFzZWxpbmUuc3RydXQp CisgICAgLCBtX2NvbnRlbnRMb2dpY2FsSGVpZ2h0KGluaXRpYWxDb25zdHJhaW50cy5oZWlnaHRB bmRCYXNlbGluZS5oZWlnaHQpCiAgICAgLCBtX2xpbmVMb2dpY2FsV2lkdGgoaW5pdGlhbENvbnN0 cmFpbnRzLmF2YWlsYWJsZVdpZHRoKQogICAgICwgbV9za2lwVmVydGljYWxBbGlnbWVudChza2lw VmVydGljYWxBbGlnbWVudCA9PSBTa2lwVmVydGljYWxBbGlnbWVudDo6WWVzKQogewpAQCAtMjU0 LDggKzI1NSwxMSBAQCB2b2lkIExpbmU6OmFwcGVuZFRleHRDb250ZW50KGNvbnN0IElubGluZVRl eHRJdGVtJiBpbmxpbmVJdGVtLCBMYXlvdXRVbml0IGxvZ2ljYQogICAgIGF1dG8gbG9naWNhbFJl Y3QgPSBEaXNwbGF5OjpSZWN0IHsgfTsKICAgICBsb2dpY2FsUmVjdC5zZXRMZWZ0KGNvbnRlbnRM b2dpY2FsUmlnaHQoKSk7CiAgICAgbG9naWNhbFJlY3Quc2V0V2lkdGgobG9naWNhbFdpZHRoKTsK LSAgICBpZiAoIW1fc2tpcFZlcnRpY2FsQWxpZ21lbnQpCi0gICAgICAgIGxvZ2ljYWxSZWN0LnNl dEhlaWdodChpbmxpbmVJdGVtQ29udGVudEhlaWdodChpbmxpbmVJdGVtKSk7CisgICAgaWYgKCFt X3NraXBWZXJ0aWNhbEFsaWdtZW50KSB7CisgICAgICAgIGF1dG8gcnVuSGVpZ2h0ID0gaW5saW5l SXRlbUNvbnRlbnRIZWlnaHQoaW5saW5lSXRlbSk7CisgICAgICAgIGxvZ2ljYWxSZWN0LnNldEhl aWdodChydW5IZWlnaHQpOworICAgICAgICBhZGp1c3RCYXNlbGluZUFuZExpbmVIZWlnaHQoaW5s aW5lSXRlbSwgcnVuSGVpZ2h0KTsKKyAgICB9CiAKICAgICBhdXRvIHRleHRDb250ZXh0ID0gQ29u dGVudDo6UnVuOjpUZXh0Q29udGV4dCB7IGlubGluZUl0ZW0uc3RhcnQoKSwgaW5saW5lSXRlbS5p c0NvbGxhcHNlZCgpID8gMSA6IGlubGluZUl0ZW0ubGVuZ3RoKCkgfTsKICAgICBhdXRvIGxpbmVJ dGVtID0gc3RkOjptYWtlX3VuaXF1ZTxDb250ZW50OjpSdW4+KGlubGluZUl0ZW0sIGxvZ2ljYWxS ZWN0LCB0ZXh0Q29udGV4dCwgaXNDb21wbGV0ZWx5Q29sbGFwc2VkLCBjYW5CZUV4dGVuZGVkKTsK QEAgLTI5NSwxNCArMjk5LDE2IEBAIHZvaWQgTGluZTo6YXBwZW5kSGFyZExpbmVCcmVhayhjb25z dCBJbmxpbmVJdGVtJiBpbmxpbmVJdGVtKQogICAgIGF1dG8gbG9naWNhbFJlY3QgPSBEaXNwbGF5 OjpSZWN0IHsgfTsKICAgICBsb2dpY2FsUmVjdC5zZXRMZWZ0KGNvbnRlbnRMb2dpY2FsUmlnaHQo KSk7CiAgICAgbG9naWNhbFJlY3Quc2V0V2lkdGgoeyB9KTsKLSAgICBpZiAoIW1fc2tpcFZlcnRp Y2FsQWxpZ21lbnQpCisgICAgaWYgKCFtX3NraXBWZXJ0aWNhbEFsaWdtZW50KSB7CisgICAgICAg IGFkanVzdEJhc2VsaW5lQW5kTGluZUhlaWdodChpbmxpbmVJdGVtLCB7IH0pOwogICAgICAgICBs b2dpY2FsUmVjdC5zZXRIZWlnaHQobG9naWNhbEhlaWdodCgpKTsKKyAgICB9CiAgICAgbV9jb250 ZW50LT5ydW5zKCkuYXBwZW5kKHN0ZDo6bWFrZV91bmlxdWU8Q29udGVudDo6UnVuPihpbmxpbmVJ dGVtLCBsb2dpY2FsUmVjdCwgQ29udGVudDo6UnVuOjpUZXh0Q29udGV4dCB7IH0sIGZhbHNlLCBm YWxzZSkpOwogfQogCiB2b2lkIExpbmU6OmFkanVzdEJhc2VsaW5lQW5kTGluZUhlaWdodChjb25z dCBJbmxpbmVJdGVtJiBpbmxpbmVJdGVtLCBMYXlvdXRVbml0IHJ1bkhlaWdodCkKIHsKLSAgICBB U1NFUlQoIWlubGluZUl0ZW0uaXNDb250YWluZXJFbmQoKSAmJiAhaW5saW5lSXRlbS5pc1RleHQo KSk7CisgICAgQVNTRVJUKCFpbmxpbmVJdGVtLmlzQ29udGFpbmVyRW5kKCkpOwogICAgIGF1dG8m IGxheW91dEJveCA9IGlubGluZUl0ZW0ubGF5b3V0Qm94KCk7CiAgICAgYXV0byYgc3R5bGUgPSBs YXlvdXRCb3guc3R5bGUoKTsKIApAQCAtMzE2LDYgKzMyMiwxNiBAQCB2b2lkIExpbmU6OmFkanVz dEJhc2VsaW5lQW5kTGluZUhlaWdodChjb25zdCBJbmxpbmVJdGVtJiBpbmxpbmVJdGVtLCBMYXlv dXRVbml0CiAgICAgICAgIG1fY29udGVudExvZ2ljYWxIZWlnaHQgPSBzdGQ6Om1heChtX2NvbnRl bnRMb2dpY2FsSGVpZ2h0LCBiYXNlbGluZUFsaWduZWRDb250ZW50SGVpZ2h0KCkpOwogICAgICAg ICByZXR1cm47CiAgICAgfQorICAgIC8vIEFwcGx5IGluaXRpYWwgc3RydXQgaWYgbmVlZGVkLgor ICAgIGlmIChpbmxpbmVJdGVtLmlzVGV4dCgpIHx8IGlubGluZUl0ZW0uaXNIYXJkTGluZUJyZWFr KCkpIHsKKyAgICAgICAgaWYgKCFtX2luaXRpYWxTdHJ1dCkKKyAgICAgICAgICAgIHJldHVybjsK KyAgICAgICAgbV9iYXNlbGluZS5hc2NlbnQgPSBzdGQ6Om1heChtX2luaXRpYWxTdHJ1dC0+YXNj ZW50LCBtX2Jhc2VsaW5lLmFzY2VudCk7CisgICAgICAgIG1fYmFzZWxpbmUuZGVzY2VudCA9IHN0 ZDo6bWF4KG1faW5pdGlhbFN0cnV0LT5kZXNjZW50LCBtX2Jhc2VsaW5lLmRlc2NlbnQpOworICAg ICAgICBtX2NvbnRlbnRMb2dpY2FsSGVpZ2h0ID0gc3RkOjptYXgobV9jb250ZW50TG9naWNhbEhl aWdodCwgYmFzZWxpbmVBbGlnbmVkQ29udGVudEhlaWdodCgpKTsKKyAgICAgICAgbV9pbml0aWFs U3RydXQgPSB7IH07CisgICAgICAgIHJldHVybjsKKyAgICB9CiAgICAgLy8gUmVwbGFjZWQgYW5k IG5vbi1yZXBsYWNlZCBpbmxpbmUgbGV2ZWwgYm94LgogICAgIHN3aXRjaCAoaW5saW5lSXRlbS5z dHlsZSgpLnZlcnRpY2FsQWxpZ24oKSkgewogICAgIGNhc2UgVmVydGljYWxBbGlnbjo6QmFzZWxp bmU6CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9J bmxpbmVMaW5lLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9Jbmxp bmVMaW5lLmgKaW5kZXggYzNlNjAxYWNlNjM0M2QzZGZjZGIxNTA3Nzg4NDdlMzhkNTY4OWMwZi4u MDhmOTA4YTIxNDRkYmZlNjAzYWU0OTIwM2RkZjE4NDVhNTcyM2M1OCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZS5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUuaApAQCAtNDEs OCArNDEsMTIgQEAgcHVibGljOgogICAgIHN0cnVjdCBJbml0aWFsQ29uc3RyYWludHMgewogICAg ICAgICBMYXlvdXRQb2ludCB0b3BMZWZ0OwogICAgICAgICBMYXlvdXRVbml0IGF2YWlsYWJsZVdp ZHRoOwotICAgICAgICBMYXlvdXRVbml0IGhlaWdodDsKLSAgICAgICAgTGF5b3V0VW5pdCBiYXNl bGluZU9mZnNldDsKKyAgICAgICAgc3RydWN0IEhlaWdodEFuZEJhc2VsaW5lIHsKKyAgICAgICAg ICAgIExheW91dFVuaXQgaGVpZ2h0OworICAgICAgICAgICAgTGF5b3V0VW5pdCBiYXNlbGluZU9m ZnNldDsKKyAgICAgICAgICAgIE9wdGlvbmFsPExpbmVCb3g6OkJhc2VsaW5lPiBzdHJ1dDsKKyAg ICAgICAgfTsKKyAgICAgICAgSGVpZ2h0QW5kQmFzZWxpbmUgaGVpZ2h0QW5kQmFzZWxpbmU7CiAg ICAgfTsKICAgICBlbnVtIGNsYXNzIFNraXBWZXJ0aWNhbEFsaWdtZW50IHsgTm8sIFllcyB9Owog ICAgIExpbmUoY29uc3QgTGF5b3V0U3RhdGUmLCBjb25zdCBJbml0aWFsQ29uc3RyYWludHMmLCBT a2lwVmVydGljYWxBbGlnbWVudCk7CkBAIC0xNDEsNiArMTQ1LDcgQEAgcHJpdmF0ZToKICAgICBM aW5lQm94OjpCYXNlbGluZSBtX2Jhc2VsaW5lOwogICAgIExheW91dFVuaXQgbV9iYXNlbGluZVRv cDsKIAorICAgIE9wdGlvbmFsPExpbmVCb3g6OkJhc2VsaW5lPiBtX2luaXRpYWxTdHJ1dDsKICAg ICBMYXlvdXRVbml0IG1fY29udGVudExvZ2ljYWxIZWlnaHQ7CiAgICAgTGF5b3V0VW5pdCBtX2xp bmVMb2dpY2FsV2lkdGg7CiAgICAgYm9vbCBtX3NraXBWZXJ0aWNhbEFsaWdtZW50IHsgZmFsc2Ug fTsK