201807 2019-09-15 12:13:08 -0700 [LFC][BFC] BlockFormattingContext::Geometry::inFlowNonReplacedHeightAndMargin should not read containing block's width 2019-09-16 09:12:05 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 201795 1 zalan zalan bfulgham commit-queue koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1570959 0 zalan 2019-09-15 12:13:08 -0700 see bug 201795 1570960 1 webkit-bug-importer 2019-09-15 12:13:43 -0700 <rdar://problem/55381342> 1570967 2 378821 zalan 2019-09-15 12:47:53 -0700 Created attachment 378821 Patch 1571115 3 378821 commit-queue 2019-09-16 09:12:04 -0700 Comment on attachment 378821 Patch Clearing flags on attachment: 378821 Committed r249900: <https://trac.webkit.org/changeset/249900> 1571116 4 commit-queue 2019-09-16 09:12:05 -0700 All reviewed patches have been landed. Closing bug. 378821 2019-09-15 12:47:53 -0700 2019-09-16 09:12:04 -0700 Patch bug-201807-20190915124747.patch text/plain 11166 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ5ODg1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2RkZmE0MWYzMzZkYzU3 ZDUwOTdiOWIxZTE5MTA4NDM2Mzc2NmRjZS4uYTM4OWNmZjc4ZWUxMDY0NTQzYTQ0ZGZkOTlhOWE5 YmFlNjg0OGYzNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE5LTA5LTE1ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bQkZDXSBCbG9ja0Zv cm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6aW5GbG93Tm9uUmVwbGFjZWRIZWlnaHRBbmRNYXJn aW4gc2hvdWxkIG5vdCByZWFkIGNvbnRhaW5pbmcgYmxvY2sncyB3aWR0aAorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAxODA3CisgICAgICAgIDxyZGFy Oi8vcHJvYmxlbS81NTM4MTM0Mj4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBUaGlzIGlzIGluIHByZXBhcmF0aW9uIGZvciB1c2luZyBjb25zdHJhaW50 IHZhbHVlcyBpbnN0ZWFkIG9mIHF1ZXJ5aW5nIHRoZSBkaXNwbGF5IHRyZWUgZm9yIGNvbnRhaW5p bmcgYmxvY2sgZ2VvbWV0cnkgaW5mb3JtYXRpb24uCisgICAgICAgIFNlZSB3ZWJraXQub3JnL2Iv MjAxNzk1CisKKyAgICAgICAgKiBsYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGlu Z0NvbnRleHQuaDoKKyAgICAgICAgKiBsYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0 dGluZ0NvbnRleHRHZW9tZXRyeS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkJsb2Nr Rm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjppbkZsb3dOb25SZXBsYWNlZEhlaWdodEFuZE1h cmdpbik6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6 Okdlb21ldHJ5OjppbkZsb3dOb25SZXBsYWNlZFdpZHRoQW5kTWFyZ2luIGNvbnN0KToKKyAgICAg ICAgKFdlYkNvcmU6OkxheW91dDo6QmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6Omlu Rmxvd0hlaWdodEFuZE1hcmdpbik6CisKIDIwMTktMDktMTQgIEp1c3RpbiBGYW4gIDxqdXN0aW5f ZmFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbV2ViR1BVXSBNYWtlIFdlYkdQVVJlbmRlclBpcGVs aW5lIGFuZCBXZWJHUFVDb21wdXRlUGlwZWxpbmUgaW5oZXJpdCBmcm9tIEdQVU9iamVjdEJhc2UK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tG b3JtYXR0aW5nQ29udGV4dC5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGlu Zy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmgKaW5kZXggMmZkNTIwZDZmYmE1YjkzOGZiNjhkM2Rl OWY5NGE5MjEzZTZhMzY5MC4uZmI2NTdiNmE4OGJmNDAwMDdiMGRmMTc0Y2QyNmJmYTkzZDZlYmFj OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9j a0Zvcm1hdHRpbmdDb250ZXh0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9y bWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmgKQEAgLTg3LDcgKzg3LDcgQEAgcHJpdmF0 ZToKICAgICAgICAgSW50cmluc2ljV2lkdGhDb25zdHJhaW50cyBpbnRyaW5zaWNXaWR0aENvbnN0 cmFpbnRzKGNvbnN0IEJveCYpOwogCiAgICAgcHJpdmF0ZToKLSAgICAgICAgSGVpZ2h0QW5kTWFy Z2luIGluRmxvd05vblJlcGxhY2VkSGVpZ2h0QW5kTWFyZ2luKGNvbnN0IEJveCYsIFVzZWRWZXJ0 aWNhbFZhbHVlcyk7CisgICAgICAgIEhlaWdodEFuZE1hcmdpbiBpbkZsb3dOb25SZXBsYWNlZEhl aWdodEFuZE1hcmdpbihjb25zdCBCb3gmLCBVc2VkSG9yaXpvbnRhbFZhbHVlcywgVXNlZFZlcnRp Y2FsVmFsdWVzKTsKICAgICAgICAgV2lkdGhBbmRNYXJnaW4gaW5GbG93Tm9uUmVwbGFjZWRXaWR0 aEFuZE1hcmdpbihjb25zdCBCb3gmLCBVc2VkSG9yaXpvbnRhbFZhbHVlcykgY29uc3Q7CiAgICAg ICAgIFdpZHRoQW5kTWFyZ2luIGluRmxvd1JlcGxhY2VkV2lkdGhBbmRNYXJnaW4oY29uc3QgQm94 JiwgVXNlZEhvcml6b250YWxWYWx1ZXMpIGNvbnN0OwogICAgICAgICBQb2ludCBzdGF0aWNQb3Np dGlvbkZvck91dE9mRmxvd1Bvc2l0aW9uZWQoY29uc3QgQm94JikgY29uc3Q7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0Nv bnRleHRHZW9tZXRyeS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5n L0Jsb2NrRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAKaW5kZXggZDYwODFmNjY0YzFmODUz ZWNmZDVkZjcxOWIwNTY2NzA3OTJmZmYyNi4uYTdkZDI5NmIzYjc1YzU2MzYwMTZiYzMxMTVkMmQx NDJjZDVmY2Q3ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0 dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5 LmNwcApAQCAtMzcsMTAgKzM3LDExIEBACiBuYW1lc3BhY2UgV2ViQ29yZSB7CiBuYW1lc3BhY2Ug TGF5b3V0IHsKIAotSGVpZ2h0QW5kTWFyZ2luIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21l dHJ5OjppbkZsb3dOb25SZXBsYWNlZEhlaWdodEFuZE1hcmdpbihjb25zdCBCb3gmIGxheW91dEJv eCwgVXNlZFZlcnRpY2FsVmFsdWVzIHVzZWRWYWx1ZXMpCitIZWlnaHRBbmRNYXJnaW4gQmxvY2tG b3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OmluRmxvd05vblJlcGxhY2VkSGVpZ2h0QW5kTWFy Z2luKGNvbnN0IEJveCYgbGF5b3V0Qm94LCBVc2VkSG9yaXpvbnRhbFZhbHVlcyB1c2VkSG9yaXpv bnRhbFZhbHVlcywgVXNlZFZlcnRpY2FsVmFsdWVzIHVzZWRWYWx1ZXMpCiB7CiAgICAgQVNTRVJU KGxheW91dEJveC5pc0luRmxvdygpICYmICFsYXlvdXRCb3gucmVwbGFjZWQoKSk7CiAgICAgQVNT RVJUKGxheW91dEJveC5pc092ZXJmbG93VmlzaWJsZSgpKTsKKyAgICBBU1NFUlQodXNlZEhvcml6 b250YWxWYWx1ZXMuY29udGFpbmluZ0Jsb2NrV2lkdGgpOwogCiAgICAgYXV0byBjb21wdXRlID0g WyZdKCkgLT4gSGVpZ2h0QW5kTWFyZ2luIHsKIApAQCAtNTcsMTEgKzU4LDggQEAgSGVpZ2h0QW5k TWFyZ2luIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjppbkZsb3dOb25SZXBsYWNl ZEhlaWdodEFuZE1hcmcKICAgICAgICAgLy8gT25seSBjaGlsZHJlbiBpbiB0aGUgbm9ybWFsIGZs b3cgYXJlIHRha2VuIGludG8gYWNjb3VudCAoaS5lLiwgZmxvYXRpbmcgYm94ZXMgYW5kIGFic29s dXRlbHkgcG9zaXRpb25lZCBib3hlcyBhcmUgaWdub3JlZCwKICAgICAgICAgLy8gYW5kIHJlbGF0 aXZlbHkgcG9zaXRpb25lZCBib3hlcyBhcmUgY29uc2lkZXJlZCB3aXRob3V0IHRoZWlyIG9mZnNl dCkuIE5vdGUgdGhhdCB0aGUgY2hpbGQgYm94IG1heSBiZSBhbiBhbm9ueW1vdXMgYmxvY2sgYm94 LgogCi0gICAgICAgIGF1dG8mIGxheW91dFN0YXRlID0gdGhpcy0+bGF5b3V0U3RhdGUoKTsKLSAg ICAgICAgYXV0byYgZm9ybWF0dGluZ0NvbnRleHQgPSB0aGlzLT5mb3JtYXR0aW5nQ29udGV4dCgp OwotICAgICAgICBhdXRvJiBib3hHZW9tZXRyeSA9IGZvcm1hdHRpbmdDb250ZXh0Lmdlb21ldHJ5 Rm9yQm94KGxheW91dEJveCk7Ci0gICAgICAgIGF1dG8gY29udGFpbmluZ0Jsb2NrV2lkdGggPSBm b3JtYXR0aW5nQ29udGV4dC5nZW9tZXRyeUZvckJveCgqbGF5b3V0Qm94LmNvbnRhaW5pbmdCbG9j aygpKS5jb250ZW50Qm94V2lkdGgoKTsKLSAgICAgICAgYXV0byBjb21wdXRlZFZlcnRpY2FsTWFy Z2luID0gR2VvbWV0cnk6OmNvbXB1dGVkVmVydGljYWxNYXJnaW4obGF5b3V0Qm94LCBVc2VkSG9y aXpvbnRhbFZhbHVlcyB7IGNvbnRhaW5pbmdCbG9ja1dpZHRoIH0pOworICAgICAgICBhdXRvJiBi b3hHZW9tZXRyeSA9IGZvcm1hdHRpbmdDb250ZXh0KCkuZ2VvbWV0cnlGb3JCb3gobGF5b3V0Qm94 KTsKKyAgICAgICAgYXV0byBjb21wdXRlZFZlcnRpY2FsTWFyZ2luID0gR2VvbWV0cnk6OmNvbXB1 dGVkVmVydGljYWxNYXJnaW4obGF5b3V0Qm94LCB1c2VkSG9yaXpvbnRhbFZhbHVlcyk7CiAgICAg ICAgIGF1dG8gbm9uQ29sbGFwc2VkTWFyZ2luID0gVXNlZFZlcnRpY2FsTWFyZ2luOjpOb25Db2xs YXBzZWRWYWx1ZXMgeyBjb21wdXRlZFZlcnRpY2FsTWFyZ2luLmJlZm9yZS52YWx1ZU9yKDApLCBj b21wdXRlZFZlcnRpY2FsTWFyZ2luLmFmdGVyLnZhbHVlT3IoMCkgfTsgCiAgICAgICAgIGF1dG8g Ym9yZGVyQW5kUGFkZGluZ1RvcCA9IGJveEdlb21ldHJ5LmJvcmRlclRvcCgpICsgYm94R2VvbWV0 cnkucGFkZGluZ1RvcCgpLnZhbHVlT3IoMCk7CiAgICAgICAgIGF1dG8gaGVpZ2h0ID0gdXNlZFZh bHVlcy5oZWlnaHQgPyB1c2VkVmFsdWVzLmhlaWdodC52YWx1ZSgpIDogY29tcHV0ZWRIZWlnaHRW YWx1ZShsYXlvdXRCb3gsIEhlaWdodFR5cGU6Ok5vcm1hbCk7CkBAIC03OCw3ICs3Niw3IEBAIEhl aWdodEFuZE1hcmdpbiBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6aW5GbG93Tm9u UmVwbGFjZWRIZWlnaHRBbmRNYXJnCiAgICAgICAgIC8vIDEuIHRoZSBib3R0b20gZWRnZSBvZiB0 aGUgbGFzdCBsaW5lIGJveCwgaWYgdGhlIGJveCBlc3RhYmxpc2hlcyBhIGlubGluZSBmb3JtYXR0 aW5nIGNvbnRleHQgd2l0aCBvbmUgb3IgbW9yZSBsaW5lcwogICAgICAgICBhdXRvJiBsYXlvdXRD b250YWluZXIgPSBkb3duY2FzdDxDb250YWluZXI+KGxheW91dEJveCk7CiAgICAgICAgIGlmIChs YXlvdXRDb250YWluZXIuZXN0YWJsaXNoZXNJbmxpbmVGb3JtYXR0aW5nQ29udGV4dCgpKSB7Ci0g ICAgICAgICAgICBhdXRvJiBsaW5lQm94ZXMgPSBkb3duY2FzdDxJbmxpbmVGb3JtYXR0aW5nU3Rh dGU+KGxheW91dFN0YXRlLmVzdGFibGlzaGVkRm9ybWF0dGluZ1N0YXRlKGxheW91dENvbnRhaW5l cikpLmxpbmVCb3hlcygpOworICAgICAgICAgICAgYXV0byYgbGluZUJveGVzID0gZG93bmNhc3Q8 SW5saW5lRm9ybWF0dGluZ1N0YXRlPihsYXlvdXRTdGF0ZSgpLmVzdGFibGlzaGVkRm9ybWF0dGlu Z1N0YXRlKGxheW91dENvbnRhaW5lcikpLmxpbmVCb3hlcygpOwogICAgICAgICAgICAgLy8gRXZl biBlbXB0eSBjb250YWluZXJzIGdlbmVyYXRlIG9uZSBsaW5lLiAKICAgICAgICAgICAgIEFTU0VS VCghbGluZUJveGVzLmlzRW1wdHkoKSk7CiAgICAgICAgICAgICByZXR1cm4geyBsaW5lQm94ZXMu bGFzdCgpLmxvZ2ljYWxCb3R0b20oKSAtIGJvcmRlckFuZFBhZGRpbmdUb3AsIG5vbkNvbGxhcHNl ZE1hcmdpbiB9OwpAQCAtODcsOSArODUsOSBAQCBIZWlnaHRBbmRNYXJnaW4gQmxvY2tGb3JtYXR0 aW5nQ29udGV4dDo6R2VvbWV0cnk6OmluRmxvd05vblJlcGxhY2VkSGVpZ2h0QW5kTWFyZwogICAg ICAgICAvLyAyLiB0aGUgYm90dG9tIGVkZ2Ugb2YgdGhlIGJvdHRvbSAocG9zc2libHkgY29sbGFw c2VkKSBtYXJnaW4gb2YgaXRzIGxhc3QgaW4tZmxvdyBjaGlsZCwgaWYgdGhlIGNoaWxkJ3MgYm90 dG9tIG1hcmdpbi4uLgogICAgICAgICBhdXRvKiBsYXN0SW5GbG93Q2hpbGQgPSBsYXlvdXRDb250 YWluZXIubGFzdEluRmxvd0NoaWxkKCk7CiAgICAgICAgIEFTU0VSVChsYXN0SW5GbG93Q2hpbGQp OwotICAgICAgICBhdXRvIG1hcmdpbkNvbGxhcHNlID0gTWFyZ2luQ29sbGFwc2UoZm9ybWF0dGlu Z0NvbnRleHQpOworICAgICAgICBhdXRvIG1hcmdpbkNvbGxhcHNlID0gTWFyZ2luQ29sbGFwc2Uo Zm9ybWF0dGluZ0NvbnRleHQoKSk7CiAgICAgICAgIGlmICghbWFyZ2luQ29sbGFwc2UubWFyZ2lu QWZ0ZXJDb2xsYXBzZXNXaXRoUGFyZW50TWFyZ2luQWZ0ZXIoKmxhc3RJbkZsb3dDaGlsZCkpIHsK LSAgICAgICAgICAgIGF1dG8mIGxhc3RJbkZsb3dCb3hHZW9tZXRyeSA9IGZvcm1hdHRpbmdDb250 ZXh0Lmdlb21ldHJ5Rm9yQm94KCpsYXN0SW5GbG93Q2hpbGQpOworICAgICAgICAgICAgYXV0byYg bGFzdEluRmxvd0JveEdlb21ldHJ5ID0gZm9ybWF0dGluZ0NvbnRleHQoKS5nZW9tZXRyeUZvckJv eCgqbGFzdEluRmxvd0NoaWxkKTsKICAgICAgICAgICAgIGF1dG8gYm90dG9tRWRnZU9mQm90dG9t TWFyZ2luID0gbGFzdEluRmxvd0JveEdlb21ldHJ5LmJvdHRvbSgpICsgKGxhc3RJbkZsb3dCb3hH ZW9tZXRyeS5oYXNDb2xsYXBzZWRUaHJvdWdoTWFyZ2luKCkgPyBMYXlvdXRVbml0KCkgOiBsYXN0 SW5GbG93Qm94R2VvbWV0cnkubWFyZ2luQWZ0ZXIoKSk7IAogICAgICAgICAgICAgcmV0dXJuIHsg Ym90dG9tRWRnZU9mQm90dG9tTWFyZ2luIC0gYm9yZGVyQW5kUGFkZGluZ1RvcCwgbm9uQ29sbGFw c2VkTWFyZ2luIH07CiAgICAgICAgIH0KQEAgLTk5LDcgKzk3LDcgQEAgSGVpZ2h0QW5kTWFyZ2lu IEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjppbkZsb3dOb25SZXBsYWNlZEhlaWdo dEFuZE1hcmcKICAgICAgICAgd2hpbGUgKGluRmxvd0NoaWxkICYmIG1hcmdpbkNvbGxhcHNlLm1h cmdpbkJlZm9yZUNvbGxhcHNlc1dpdGhQYXJlbnRNYXJnaW5BZnRlcigqaW5GbG93Q2hpbGQpKQog ICAgICAgICAgICAgaW5GbG93Q2hpbGQgPSBpbkZsb3dDaGlsZC0+cHJldmlvdXNJbkZsb3dTaWJs aW5nKCk7CiAgICAgICAgIGlmIChpbkZsb3dDaGlsZCkgewotICAgICAgICAgICAgYXV0byYgaW5G bG93RGlzcGxheUJveEdlb21ldHJ5ID0gZm9ybWF0dGluZ0NvbnRleHQuZ2VvbWV0cnlGb3JCb3go KmluRmxvd0NoaWxkKTsKKyAgICAgICAgICAgIGF1dG8mIGluRmxvd0Rpc3BsYXlCb3hHZW9tZXRy eSA9IGZvcm1hdHRpbmdDb250ZXh0KCkuZ2VvbWV0cnlGb3JCb3goKmluRmxvd0NoaWxkKTsKICAg ICAgICAgICAgIHJldHVybiB7IGluRmxvd0Rpc3BsYXlCb3hHZW9tZXRyeS50b3AoKSArIGluRmxv d0Rpc3BsYXlCb3hHZW9tZXRyeS5ib3JkZXJCb3goKS5oZWlnaHQoKSAtIGJvcmRlckFuZFBhZGRp bmdUb3AsIG5vbkNvbGxhcHNlZE1hcmdpbiB9OwogICAgICAgICB9CiAKQEAgLTExMiw5ICsxMTAs MTAgQEAgSGVpZ2h0QW5kTWFyZ2luIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5Ojpp bkZsb3dOb25SZXBsYWNlZEhlaWdodEFuZE1hcmcKICAgICByZXR1cm4gaGVpZ2h0QW5kTWFyZ2lu OwogfQogCi1XaWR0aEFuZE1hcmdpbiBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6 aW5GbG93Tm9uUmVwbGFjZWRXaWR0aEFuZE1hcmdpbihjb25zdCBCb3gmIGxheW91dEJveCwgVXNl ZEhvcml6b250YWxWYWx1ZXMgdXNlZFZhbHVlcykgY29uc3QKK1dpZHRoQW5kTWFyZ2luIEJsb2Nr Rm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjppbkZsb3dOb25SZXBsYWNlZFdpZHRoQW5kTWFy Z2luKGNvbnN0IEJveCYgbGF5b3V0Qm94LCBVc2VkSG9yaXpvbnRhbFZhbHVlcyB1c2VkSG9yaXpv bnRhbFZhbHVlcykgY29uc3QKIHsKICAgICBBU1NFUlQobGF5b3V0Qm94LmlzSW5GbG93KCkpOwor ICAgIEFTU0VSVCh1c2VkSG9yaXpvbnRhbFZhbHVlcy5jb250YWluaW5nQmxvY2tXaWR0aCk7CiAK ICAgICBhdXRvIGNvbXB1dGUgPSBbJl0oKSB7CiAKQEAgLTE0MCwxMiArMTM5LDExIEBAIFdpZHRo QW5kTWFyZ2luIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjppbkZsb3dOb25SZXBs YWNlZFdpZHRoQW5kTWFyZ2luCiAgICAgICAgIC8vICAgIGVkZ2VzIG9mIHRoZSBjb250YWluaW5n IGJsb2NrLgogCiAgICAgICAgIGF1dG8mIHN0eWxlID0gbGF5b3V0Qm94LnN0eWxlKCk7Ci0gICAg ICAgIGF1dG8qIGNvbnRhaW5pbmdCbG9jayA9IGxheW91dEJveC5jb250YWluaW5nQmxvY2soKTsK LSAgICAgICAgYXV0byBjb250YWluaW5nQmxvY2tXaWR0aCA9IHVzZWRWYWx1ZXMuY29udGFpbmlu Z0Jsb2NrV2lkdGgudmFsdWVPcigwKTsKKyAgICAgICAgYXV0byBjb250YWluaW5nQmxvY2tXaWR0 aCA9ICp1c2VkSG9yaXpvbnRhbFZhbHVlcy5jb250YWluaW5nQmxvY2tXaWR0aDsKICAgICAgICAg YXV0byYgYm94R2VvbWV0cnkgPSBmb3JtYXR0aW5nQ29udGV4dCgpLmdlb21ldHJ5Rm9yQm94KGxh eW91dEJveCk7CiAKLSAgICAgICAgYXV0byB3aWR0aCA9IGNvbXB1dGVkVmFsdWVJZk5vdEF1dG8o dXNlZFZhbHVlcy53aWR0aCA/IExlbmd0aCB7IHVzZWRWYWx1ZXMud2lkdGgudmFsdWUoKSwgRml4 ZWQgfSA6IHN0eWxlLmxvZ2ljYWxXaWR0aCgpLCBjb250YWluaW5nQmxvY2tXaWR0aCk7Ci0gICAg ICAgIGF1dG8gY29tcHV0ZWRIb3Jpem9udGFsTWFyZ2luID0gR2VvbWV0cnk6OmNvbXB1dGVkSG9y aXpvbnRhbE1hcmdpbihsYXlvdXRCb3gsIHVzZWRWYWx1ZXMpOworICAgICAgICBhdXRvIHdpZHRo ID0gY29tcHV0ZWRWYWx1ZUlmTm90QXV0byh1c2VkSG9yaXpvbnRhbFZhbHVlcy53aWR0aCA/IExl bmd0aCB7IHVzZWRIb3Jpem9udGFsVmFsdWVzLndpZHRoLnZhbHVlKCksIEZpeGVkIH0gOiBzdHls ZS5sb2dpY2FsV2lkdGgoKSwgY29udGFpbmluZ0Jsb2NrV2lkdGgpOworICAgICAgICBhdXRvIGNv bXB1dGVkSG9yaXpvbnRhbE1hcmdpbiA9IEdlb21ldHJ5Ojpjb21wdXRlZEhvcml6b250YWxNYXJn aW4obGF5b3V0Qm94LCB1c2VkSG9yaXpvbnRhbFZhbHVlcyk7CiAgICAgICAgIFVzZWRIb3Jpem9u dGFsTWFyZ2luIHVzZWRIb3Jpem9udGFsTWFyZ2luOwogICAgICAgICBhdXRvIGJvcmRlckxlZnQg PSBib3hHZW9tZXRyeS5ib3JkZXJMZWZ0KCk7CiAgICAgICAgIGF1dG8gYm9yZGVyUmlnaHQgPSBi b3hHZW9tZXRyeS5ib3JkZXJSaWdodCgpOwpAQCAtMTY1LDcgKzE2Myw3IEBAIFdpZHRoQW5kTWFy Z2luIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjppbkZsb3dOb25SZXBsYWNlZFdp ZHRoQW5kTWFyZ2luCiAKICAgICAgICAgLy8gIzIKICAgICAgICAgaWYgKHdpZHRoICYmIGNvbXB1 dGVkSG9yaXpvbnRhbE1hcmdpbi5zdGFydCAmJiBjb21wdXRlZEhvcml6b250YWxNYXJnaW4uZW5k KSB7Ci0gICAgICAgICAgICBpZiAoY29udGFpbmluZ0Jsb2NrLT5zdHlsZSgpLmlzTGVmdFRvUmln aHREaXJlY3Rpb24oKSkgeworICAgICAgICAgICAgaWYgKGxheW91dEJveC5jb250YWluaW5nQmxv Y2soKS0+c3R5bGUoKS5pc0xlZnRUb1JpZ2h0RGlyZWN0aW9uKCkpIHsKICAgICAgICAgICAgICAg ICB1c2VkSG9yaXpvbnRhbE1hcmdpbi5zdGFydCA9ICpjb21wdXRlZEhvcml6b250YWxNYXJnaW4u c3RhcnQ7CiAgICAgICAgICAgICAgICAgdXNlZEhvcml6b250YWxNYXJnaW4uZW5kID0gY29udGFp bmluZ0Jsb2NrV2lkdGggLSAodXNlZEhvcml6b250YWxNYXJnaW4uc3RhcnQgKyBib3JkZXJMZWZ0 ICsgcGFkZGluZ0xlZnQgKyBjb250ZW50V2lkdGgoKSArIHBhZGRpbmdSaWdodCArIGJvcmRlclJp Z2h0KTsKICAgICAgICAgICAgIH0gZWxzZSB7CkBAIC0yNjIsMTYgKzI2MCwxNCBAQCBIZWlnaHRB bmRNYXJnaW4gQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OmluRmxvd0hlaWdodEFu ZE1hcmdpbihjb25zdCBCbwogCiAgICAgSGVpZ2h0QW5kTWFyZ2luIGhlaWdodEFuZE1hcmdpbjsK ICAgICAvLyBGSVhNRTogTGV0J3Mgc3BlY2lhbCBjYXNlIHRoZSB0YWJsZSBoZWlnaHQgY29tcHV0 YXRpb24gZm9yIG5vdyAtPiBmaWd1cmUgb3V0IHdoZXRoZXIgdGFibGVzIGZhbGwgaW50byB0aGUg ImluRmxvd05vblJlcGxhY2VkSGVpZ2h0QW5kTWFyZ2luIiBjYXRlZ29yeS4KLSAgICBpZiAobGF5 b3V0Qm94LmVzdGFibGlzaGVzVGFibGVGb3JtYXR0aW5nQ29udGV4dCgpKSB7Ci0gICAgICAgIGF1 dG8gdXNlZEhvcml6b250YWxWYWx1ZXMgPSBVc2VkSG9yaXpvbnRhbFZhbHVlcyB7IGZvcm1hdHRp bmdDb250ZXh0KCkuZ2VvbWV0cnlGb3JCb3goKmxheW91dEJveC5jb250YWluaW5nQmxvY2soKSku Y29udGVudEJveFdpZHRoKCkgfTsKKyAgICBpZiAobGF5b3V0Qm94LmVzdGFibGlzaGVzVGFibGVG b3JtYXR0aW5nQ29udGV4dCgpKQogICAgICAgICBoZWlnaHRBbmRNYXJnaW4gPSBjb21wbGljYXRl ZENhc2VzKGxheW91dEJveCwgdXNlZEhvcml6b250YWxWYWx1ZXMsIHVzZWRWZXJ0aWNhbFZhbHVl cyk7Ci0gICAgfSBlbHNlIGlmIChsYXlvdXRCb3guaXNPdmVyZmxvd1Zpc2libGUoKSAmJiAhbGF5 b3V0Qm94LmlzRG9jdW1lbnRCb3goKSkgeworICAgIGVsc2UgaWYgKGxheW91dEJveC5pc092ZXJm bG93VmlzaWJsZSgpICYmICFsYXlvdXRCb3guaXNEb2N1bWVudEJveCgpKSB7CiAgICAgICAgIC8v IFRPRE86IEZpZ3VyZSBvdXQgdGhlIGNhc2UgZm9yIHRoZSBkb2N1bWVudCBlbGVtZW50LiBMZXQn cyBqdXN0IGNvbXBsaWNhdGVkLWNhc2UgaXQgZm9yIG5vdy4KLSAgICAgICAgaGVpZ2h0QW5kTWFy Z2luID0gaW5GbG93Tm9uUmVwbGFjZWRIZWlnaHRBbmRNYXJnaW4obGF5b3V0Qm94LCB1c2VkVmVy dGljYWxWYWx1ZXMpOworICAgICAgICBoZWlnaHRBbmRNYXJnaW4gPSBpbkZsb3dOb25SZXBsYWNl ZEhlaWdodEFuZE1hcmdpbihsYXlvdXRCb3gsIHVzZWRIb3Jpem9udGFsVmFsdWVzLCB1c2VkVmVy dGljYWxWYWx1ZXMpOwogICAgIH0gZWxzZSB7CiAgICAgICAgIC8vIDEwLjYuNiBDb21wbGljYXRl ZCBjYXNlcwogICAgICAgICAvLyBCbG9jay1sZXZlbCwgbm9uLXJlcGxhY2VkIGVsZW1lbnRzIGlu IG5vcm1hbCBmbG93IHdoZW4gJ292ZXJmbG93JyBkb2VzIG5vdCBjb21wdXRlIHRvICd2aXNpYmxl JyAoZXhjZXB0IGlmIHRoZSAnb3ZlcmZsb3cnIHByb3BlcnR5J3MgdmFsdWUgaGFzIGJlZW4gcHJv cGFnYXRlZCB0byB0aGUgdmlld3BvcnQpLgotICAgICAgICBhdXRvIHVzZWRIb3Jpem9udGFsVmFs dWVzID0gVXNlZEhvcml6b250YWxWYWx1ZXMgeyBmb3JtYXR0aW5nQ29udGV4dCgpLmdlb21ldHJ5 Rm9yQm94KCpsYXlvdXRCb3guY29udGFpbmluZ0Jsb2NrKCkpLmNvbnRlbnRCb3hXaWR0aCgpIH07 CiAgICAgICAgIGhlaWdodEFuZE1hcmdpbiA9IGNvbXBsaWNhdGVkQ2FzZXMobGF5b3V0Qm94LCB1 c2VkSG9yaXpvbnRhbFZhbHVlcywgdXNlZFZlcnRpY2FsVmFsdWVzKTsKICAgICB9CiAK