189294 2018-09-04 21:07:59 -0700 [LFC] Make BlockFormattingContext::Geometry a subclass of FormattingContext::Geometry 2018-09-05 07:37:20 -0700 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 1456611 0 zalan 2018-09-04 21:07:59 -0700 to simplify code. 1456612 1 348889 zalan 2018-09-04 21:09:34 -0700 Created attachment 348889 Patch 1456694 2 zalan 2018-09-05 07:36:56 -0700 Committed r235667: <https://trac.webkit.org/changeset/235667> 1456695 3 webkit-bug-importer 2018-09-05 07:37:20 -0700 <rdar://problem/44138430> 348889 2018-09-04 21:09:34 -0700 2018-09-05 07:32:40 -0700 Patch bug-189294-20180904210930.patch text/plain 12489 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjM1NjQzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzFlMmRkMDJmZWJlYzEy NGI1N2ZjYjFjODc1ZDFjZjFjNjcxNDg2Yy4uZWNiM2JiMGQwMWI5YTBlNmM1NDIxMzRlMjY3YjAy MjlhNDM2Mjk0MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE4LTA5LTA0ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ10gTWFrZSBCbG9ja0Zv cm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeSBhIHN1YmNsYXNzIG9mIEZvcm1hdHRpbmdDb250ZXh0 OjpHZW9tZXRyeQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTg5Mjk0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgVGhpcyBzaW1wbGlmaWVzIHNvbWUgb2YgdGhlIGNhbGwgc2l0ZXMuCisKKyAgICAgICAgKiBs YXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6TGF5b3V0OjpCbG9ja0Zvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlV2lkdGhB bmRNYXJnaW4gY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpCbG9ja0Zvcm1hdHRp bmdDb250ZXh0Ojpjb21wdXRlSGVpZ2h0QW5kTWFyZ2luIGNvbnN0KToKKyAgICAgICAgKiBsYXlv dXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuaDoKKyAgICAgICAgKiBs YXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21l dHJ5OjppbkZsb3dOb25SZXBsYWNlZEhlaWdodEFuZE1hcmdpbik6CisgICAgICAgIChXZWJDb3Jl OjpMYXlvdXQ6OkJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjppbkZsb3dOb25SZXBs YWNlZFdpZHRoQW5kTWFyZ2luKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6QmxvY2tGb3Jt YXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OmluRmxvd1JlcGxhY2VkV2lkdGhBbmRNYXJnaW4pOgor ICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRy eTo6aW5GbG93UG9zaXRpb25lZFBvc2l0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6 QmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OmluRmxvd0hlaWdodEFuZE1hcmdpbik6 CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21l dHJ5OjppbnN0cmluc2ljV2lkdGhDb25zdHJhaW50cyk6CisKIDIwMTgtMDktMDQgIFphbGFuIEJ1 anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXSBSZW5hbWUgTGF5b3V0UGFp ciB0byBCb3hQYWlyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3Jt YXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmNwcAppbmRleCAwZjEyMGNk MWQzMjJjMDEwYTA3MzA3ODcxY2E0OTVkNDUzMjM3MTQ1Li4xNzIxNDViMTQ5ZmY4YzlmMDZhODYw OTVjYmIzNjdjNGU4NzQ1MGI5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxv Y2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5jcHAKQEAg LTI0OSw3ICsyNDksNyBAQCB2b2lkIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVXaWR0 aEFuZE1hcmdpbihMYXlvdXRDb250ZXh0JiBsYXlvdXRDb250ZXh0LAogICAgIGlmIChsYXlvdXRC b3guaXNJbkZsb3coKSkKICAgICAgICAgd2lkdGhBbmRNYXJnaW4gPSBHZW9tZXRyeTo6aW5GbG93 V2lkdGhBbmRNYXJnaW4obGF5b3V0Q29udGV4dCwgbGF5b3V0Qm94KTsKICAgICBlbHNlIGlmIChs YXlvdXRCb3guaXNGbG9hdGluZ1Bvc2l0aW9uZWQoKSkKLSAgICAgICAgd2lkdGhBbmRNYXJnaW4g PSBGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OmZsb2F0aW5nV2lkdGhBbmRNYXJnaW4obGF5 b3V0Q29udGV4dCwgKnRoaXMsIGxheW91dEJveCk7CisgICAgICAgIHdpZHRoQW5kTWFyZ2luID0g R2VvbWV0cnk6OmZsb2F0aW5nV2lkdGhBbmRNYXJnaW4obGF5b3V0Q29udGV4dCwgKnRoaXMsIGxh eW91dEJveCk7CiAgICAgZWxzZQogICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKIApAQCAt MjcxLDcgKzI3MSw3IEBAIHZvaWQgQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZUhlaWdo dEFuZE1hcmdpbihMYXlvdXRDb250ZXh0JiBsYXlvdXRDb250ZXh0CiAgICAgICAgIGlmICghZGlz cGxheUJveC5lc3RpbWF0ZWRNYXJnaW5Ub3AoKSkKICAgICAgICAgICAgIG1hcmdpblRvcE9mZnNl dCA9IGhlaWdodEFuZE1hcmdpbi5jb2xsYXBzZWRNYXJnaW4udmFsdWVfb3IoaGVpZ2h0QW5kTWFy Z2luLm1hcmdpbikudG9wOwogICAgIH0gZWxzZSBpZiAobGF5b3V0Qm94LmlzRmxvYXRpbmdQb3Np dGlvbmVkKCkpIHsKLSAgICAgICAgaGVpZ2h0QW5kTWFyZ2luID0gRm9ybWF0dGluZ0NvbnRleHQ6 Okdlb21ldHJ5OjpmbG9hdGluZ0hlaWdodEFuZE1hcmdpbihsYXlvdXRDb250ZXh0LCBsYXlvdXRC b3gpOworICAgICAgICBoZWlnaHRBbmRNYXJnaW4gPSBHZW9tZXRyeTo6ZmxvYXRpbmdIZWlnaHRB bmRNYXJnaW4obGF5b3V0Q29udGV4dCwgbGF5b3V0Qm94KTsKICAgICAgICAgQVNTRVJUKCFoZWln aHRBbmRNYXJnaW4uY29sbGFwc2VkTWFyZ2luKTsKIAogICAgICAgICBtYXJnaW5Ub3BPZmZzZXQg PSBoZWlnaHRBbmRNYXJnaW4ubWFyZ2luLnRvcDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5oIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmgK aW5kZXggOGZjYmI5MWUyOGI1ZjUxYWNhZmJhMzIzZTBjYTU2ZjQ5ZDgxNzRhZi4uMmY0MjA2MDk4 MWZhZGZmOTkyZjRiYmI4ZGJiNTg0MjRkYzk0NjIxZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmgKKysrIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250 ZXh0LmgKQEAgLTY0LDEwICs2NCwxMCBAQCBwcml2YXRlOgogICAgIHZvaWQgY29tcHV0ZUVzdGlt YXRlZE1hcmdpblRvcChMYXlvdXRDb250ZXh0JiwgY29uc3QgQm94JiwgRGlzcGxheTo6Qm94Jikg Y29uc3Q7CiAgICAgdm9pZCBjb21wdXRlRXN0aW1hdGVkTWFyZ2luVG9wRm9yQW5jZXN0b3JzKExh eW91dENvbnRleHQmLCBjb25zdCBCb3gmKSBjb25zdDsKIAotICAgIEZvcm1hdHRpbmdDb250ZXh0 OjpJbnN0cmluc2ljV2lkdGhDb25zdHJhaW50cyBpbnN0cmluc2ljV2lkdGhDb25zdHJhaW50cyhM YXlvdXRDb250ZXh0JiwgY29uc3QgQm94JikgY29uc3Qgb3ZlcnJpZGU7CisgICAgSW5zdHJpbnNp Y1dpZHRoQ29uc3RyYWludHMgaW5zdHJpbnNpY1dpZHRoQ29uc3RyYWludHMoTGF5b3V0Q29udGV4 dCYsIGNvbnN0IEJveCYpIGNvbnN0IG92ZXJyaWRlOwogCiAgICAgLy8gVGhpcyBjbGFzcyBpbXBs ZW1lbnRzIHBvc2l0aW9uaW5nIGFuZCBzaXppbmcgZm9yIGJveGVzIHBhcnRpY2lwYXRpbmcgaW4g YSBibG9jayBmb3JtYXR0aW5nIGNvbnRleHQuCi0gICAgY2xhc3MgR2VvbWV0cnkgeworICAgIGNs YXNzIEdlb21ldHJ5IDogcHVibGljIEZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeSB7CiAgICAg cHVibGljOgogICAgICAgICBzdGF0aWMgSGVpZ2h0QW5kTWFyZ2luIGluRmxvd0hlaWdodEFuZE1h cmdpbihMYXlvdXRDb250ZXh0JiwgY29uc3QgQm94Jik7CiAgICAgICAgIHN0YXRpYyBXaWR0aEFu ZE1hcmdpbiBpbkZsb3dXaWR0aEFuZE1hcmdpbihMYXlvdXRDb250ZXh0JiwgY29uc3QgQm94Jik7 CkBAIC03Niw3ICs3Niw3IEBAIHByaXZhdGU6CiAgICAgICAgIHN0YXRpYyBQb3NpdGlvbiBpbkZs b3dQb3NpdGlvbmVkUG9zaXRpb24oTGF5b3V0Q29udGV4dCYsIGNvbnN0IEJveCYpOwogCiAgICAg ICAgIHN0YXRpYyBib29sIGluc3RyaW5zaWNXaWR0aENvbnN0cmFpbnRzTmVlZENoaWxkcmVuV2lk dGgoY29uc3QgQm94Jik7Ci0gICAgICAgIHN0YXRpYyBGb3JtYXR0aW5nQ29udGV4dDo6SW5zdHJp bnNpY1dpZHRoQ29uc3RyYWludHMgaW5zdHJpbnNpY1dpZHRoQ29uc3RyYWludHMoTGF5b3V0Q29u dGV4dCYsIGNvbnN0IEJveCYpOworICAgICAgICBzdGF0aWMgSW5zdHJpbnNpY1dpZHRoQ29uc3Ry YWludHMgaW5zdHJpbnNpY1dpZHRoQ29uc3RyYWludHMoTGF5b3V0Q29udGV4dCYsIGNvbnN0IEJv eCYpOwogCiAgICAgcHJpdmF0ZToKICAgICAgICAgc3RhdGljIEhlaWdodEFuZE1hcmdpbiBpbkZs b3dOb25SZXBsYWNlZEhlaWdodEFuZE1hcmdpbihMYXlvdXRDb250ZXh0JiwgY29uc3QgQm94Jik7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2Nr Rm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxv Y2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAKaW5kZXggNGI5 Njc4OWUzNGM3NWNiNDY1Mjg1NmYzYmNjZGJlYjc0YjFjZmNjOS4uNDMzNzM0MjQxZjhlNTJmNmY3 MTIxZjYxMjg1OTNlZTg5M2E4NDFmYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29u dGV4dEdlb21ldHJ5LmNwcApAQCAtMTAxLDggKzEwMSw4IEBAIEhlaWdodEFuZE1hcmdpbiBCbG9j a0Zvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6aW5GbG93Tm9uUmVwbGFjZWRIZWlnaHRBbmRN YXJnCiAgICAgICAgIGF1dG8gY29udGFpbmluZ0Jsb2NrV2lkdGggPSBsYXlvdXRDb250ZXh0LmRp c3BsYXlCb3hGb3JMYXlvdXRCb3goKmxheW91dEJveC5jb250YWluaW5nQmxvY2soKSktPmNvbnRl bnRCb3hXaWR0aCgpOwogICAgICAgICBhdXRvJiBkaXNwbGF5Qm94ID0gKmxheW91dENvbnRleHQu ZGlzcGxheUJveEZvckxheW91dEJveChsYXlvdXRCb3gpOwogCi0gICAgICAgIFZlcnRpY2FsRWRn ZXMgbm9uQ29sbGFwc2VkTWFyZ2luID0geyBGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OmNv bXB1dGVkVmFsdWVJZk5vdEF1dG8oc3R5bGUubWFyZ2luVG9wKCksIGNvbnRhaW5pbmdCbG9ja1dp ZHRoKS52YWx1ZV9vcigwKSwKLSAgICAgICAgICAgIEZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRy eTo6Y29tcHV0ZWRWYWx1ZUlmTm90QXV0byhzdHlsZS5tYXJnaW5Cb3R0b20oKSwgY29udGFpbmlu Z0Jsb2NrV2lkdGgpLnZhbHVlX29yKDApIH07IAorICAgICAgICBWZXJ0aWNhbEVkZ2VzIG5vbkNv bGxhcHNlZE1hcmdpbiA9IHsgY29tcHV0ZWRWYWx1ZUlmTm90QXV0byhzdHlsZS5tYXJnaW5Ub3Ao KSwgY29udGFpbmluZ0Jsb2NrV2lkdGgpLnZhbHVlX29yKDApLAorICAgICAgICAgICAgY29tcHV0 ZWRWYWx1ZUlmTm90QXV0byhzdHlsZS5tYXJnaW5Cb3R0b20oKSwgY29udGFpbmluZ0Jsb2NrV2lk dGgpLnZhbHVlX29yKDApIH07IAogICAgICAgICBWZXJ0aWNhbEVkZ2VzIGNvbGxhcHNlZE1hcmdp biA9IHsgTWFyZ2luQ29sbGFwc2U6Om1hcmdpblRvcChsYXlvdXRDb250ZXh0LCBsYXlvdXRCb3gp LCBNYXJnaW5Db2xsYXBzZTo6bWFyZ2luQm90dG9tKGxheW91dENvbnRleHQsIGxheW91dEJveCkg fTsKICAgICAgICAgYXV0byBib3JkZXJBbmRQYWRkaW5nVG9wID0gZGlzcGxheUJveC5ib3JkZXJU b3AoKSArIGRpc3BsYXlCb3gucGFkZGluZ1RvcCgpLnZhbHVlX29yKDApOwogICAgICAgICAKQEAg LTE4Niw5ICsxODYsOSBAQCBXaWR0aEFuZE1hcmdpbiBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpH ZW9tZXRyeTo6aW5GbG93Tm9uUmVwbGFjZWRXaWR0aEFuZE1hcmdpbgogICAgICAgICBhdXRvIGNv bnRhaW5pbmdCbG9ja1dpZHRoID0gbGF5b3V0Q29udGV4dC5kaXNwbGF5Qm94Rm9yTGF5b3V0Qm94 KCpjb250YWluaW5nQmxvY2spLT5jb250ZW50Qm94V2lkdGgoKTsKICAgICAgICAgYXV0byYgZGlz cGxheUJveCA9ICpsYXlvdXRDb250ZXh0LmRpc3BsYXlCb3hGb3JMYXlvdXRCb3gobGF5b3V0Qm94 KTsKIAotICAgICAgICBhdXRvIHdpZHRoID0gRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5Ojpj b21wdXRlZFZhbHVlSWZOb3RBdXRvKHByZWNvbXB1dGVkV2lkdGggPyBMZW5ndGggeyBwcmVjb21w dXRlZFdpZHRoLnZhbHVlKCksIEZpeGVkIH0gOiBzdHlsZS5sb2dpY2FsV2lkdGgoKSwgY29udGFp bmluZ0Jsb2NrV2lkdGgpOwotICAgICAgICBhdXRvIG1hcmdpbkxlZnQgPSBGb3JtYXR0aW5nQ29u dGV4dDo6R2VvbWV0cnk6OmNvbXB1dGVkVmFsdWVJZk5vdEF1dG8oc3R5bGUubWFyZ2luTGVmdCgp LCBjb250YWluaW5nQmxvY2tXaWR0aCk7Ci0gICAgICAgIGF1dG8gbWFyZ2luUmlnaHQgPSBGb3Jt YXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OmNvbXB1dGVkVmFsdWVJZk5vdEF1dG8oc3R5bGUubWFy Z2luUmlnaHQoKSwgY29udGFpbmluZ0Jsb2NrV2lkdGgpOworICAgICAgICBhdXRvIHdpZHRoID0g Y29tcHV0ZWRWYWx1ZUlmTm90QXV0byhwcmVjb21wdXRlZFdpZHRoID8gTGVuZ3RoIHsgcHJlY29t cHV0ZWRXaWR0aC52YWx1ZSgpLCBGaXhlZCB9IDogc3R5bGUubG9naWNhbFdpZHRoKCksIGNvbnRh aW5pbmdCbG9ja1dpZHRoKTsKKyAgICAgICAgYXV0byBtYXJnaW5MZWZ0ID0gY29tcHV0ZWRWYWx1 ZUlmTm90QXV0byhzdHlsZS5tYXJnaW5MZWZ0KCksIGNvbnRhaW5pbmdCbG9ja1dpZHRoKTsKKyAg ICAgICAgYXV0byBtYXJnaW5SaWdodCA9IGNvbXB1dGVkVmFsdWVJZk5vdEF1dG8oc3R5bGUubWFy Z2luUmlnaHQoKSwgY29udGFpbmluZ0Jsb2NrV2lkdGgpOwogICAgICAgICBhdXRvIG5vbkNvbXB1 dGVkTWFyZ2luTGVmdCA9IG1hcmdpbkxlZnQudmFsdWVfb3IoMCk7CiAgICAgICAgIGF1dG8gbm9u Q29tcHV0ZWRNYXJnaW5SaWdodCA9IG1hcmdpblJpZ2h0LnZhbHVlX29yKDApOwogICAgICAgICBh dXRvIGJvcmRlckxlZnQgPSBkaXNwbGF5Qm94LmJvcmRlckxlZnQoKTsKQEAgLTI2NCw3ICsyNjQs NyBAQCBXaWR0aEFuZE1hcmdpbiBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6aW5G bG93UmVwbGFjZWRXaWR0aEFuZE1hcmdpbihMYQogICAgIC8vIDIuIFRoZW4gdGhlIHJ1bGVzIGZv ciBub24tcmVwbGFjZWQgYmxvY2stbGV2ZWwgZWxlbWVudHMgYXJlIGFwcGxpZWQgdG8gZGV0ZXJt aW5lIHRoZSBtYXJnaW5zLgogCiAgICAgLy8gIzEKLSAgICBhdXRvIHdpZHRoID0gRm9ybWF0dGlu Z0NvbnRleHQ6Okdlb21ldHJ5OjppbmxpbmVSZXBsYWNlZFdpZHRoQW5kTWFyZ2luKGxheW91dENv bnRleHQsIGxheW91dEJveCkud2lkdGg7CisgICAgYXV0byB3aWR0aCA9IGlubGluZVJlcGxhY2Vk V2lkdGhBbmRNYXJnaW4obGF5b3V0Q29udGV4dCwgbGF5b3V0Qm94KS53aWR0aDsKICAgICAvLyAj MgogICAgIGF1dG8gbm9uUmVwbGFjZWRXaWR0aEFuZE1hcmdpbiA9IGluRmxvd05vblJlcGxhY2Vk V2lkdGhBbmRNYXJnaW4obGF5b3V0Q29udGV4dCwgbGF5b3V0Qm94LCB3aWR0aCk7CiAKQEAgLTMx MSw4ICszMTEsOCBAQCBQb3NpdGlvbiBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6 aW5GbG93UG9zaXRpb25lZFBvc2l0aW9uKExheW91dENvbnRleAogICAgIGF1dG8mIGNvbnRhaW5p bmdCbG9jayA9ICpsYXlvdXRCb3guY29udGFpbmluZ0Jsb2NrKCk7CiAgICAgYXV0byBjb250YWlu aW5nQmxvY2tXaWR0aCA9IGxheW91dENvbnRleHQuZGlzcGxheUJveEZvckxheW91dEJveChjb250 YWluaW5nQmxvY2spLT5jb250ZW50Qm94V2lkdGgoKTsKIAotICAgIGF1dG8gdG9wID0gRm9ybWF0 dGluZ0NvbnRleHQ6Okdlb21ldHJ5Ojpjb21wdXRlZFZhbHVlSWZOb3RBdXRvKHN0eWxlLmxvZ2lj YWxUb3AoKSwgY29udGFpbmluZ0Jsb2NrV2lkdGgpOwotICAgIGF1dG8gYm90dG9tID0gRm9ybWF0 dGluZ0NvbnRleHQ6Okdlb21ldHJ5Ojpjb21wdXRlZFZhbHVlSWZOb3RBdXRvKHN0eWxlLmxvZ2lj YWxCb3R0b20oKSwgY29udGFpbmluZ0Jsb2NrV2lkdGgpOworICAgIGF1dG8gdG9wID0gY29tcHV0 ZWRWYWx1ZUlmTm90QXV0byhzdHlsZS5sb2dpY2FsVG9wKCksIGNvbnRhaW5pbmdCbG9ja1dpZHRo KTsKKyAgICBhdXRvIGJvdHRvbSA9IGNvbXB1dGVkVmFsdWVJZk5vdEF1dG8oc3R5bGUubG9naWNh bEJvdHRvbSgpLCBjb250YWluaW5nQmxvY2tXaWR0aCk7CiAKICAgICBpZiAoIXRvcCAmJiAhYm90 dG9tKSB7CiAgICAgICAgIC8vICMxCkBAIC0zMzksOCArMzM5LDggQEAgUG9zaXRpb24gQmxvY2tG b3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OmluRmxvd1Bvc2l0aW9uZWRQb3NpdGlvbihMYXlv dXRDb250ZXgKICAgICAvLyAgICBJZiB0aGUgJ2RpcmVjdGlvbicgcHJvcGVydHkgb2YgdGhlIGNv bnRhaW5pbmcgYmxvY2sgaXMgJ2x0cicsIHRoZSB2YWx1ZSBvZiAnbGVmdCcgd2lucyBhbmQgJ3Jp Z2h0JyBiZWNvbWVzIC0nbGVmdCcuCiAgICAgLy8gICAgSWYgJ2RpcmVjdGlvbicgb2YgdGhlIGNv bnRhaW5pbmcgYmxvY2sgaXMgJ3J0bCcsICdyaWdodCcgd2lucyBhbmQgJ2xlZnQnIGlzIGlnbm9y ZWQuCiAKLSAgICBhdXRvIGxlZnQgPSBGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OmNvbXB1 dGVkVmFsdWVJZk5vdEF1dG8oc3R5bGUubG9naWNhbExlZnQoKSwgY29udGFpbmluZ0Jsb2NrV2lk dGgpOwotICAgIGF1dG8gcmlnaHQgPSBGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OmNvbXB1 dGVkVmFsdWVJZk5vdEF1dG8oc3R5bGUubG9naWNhbFJpZ2h0KCksIGNvbnRhaW5pbmdCbG9ja1dp ZHRoKTsKKyAgICBhdXRvIGxlZnQgPSBjb21wdXRlZFZhbHVlSWZOb3RBdXRvKHN0eWxlLmxvZ2lj YWxMZWZ0KCksIGNvbnRhaW5pbmdCbG9ja1dpZHRoKTsKKyAgICBhdXRvIHJpZ2h0ID0gY29tcHV0 ZWRWYWx1ZUlmTm90QXV0byhzdHlsZS5sb2dpY2FsUmlnaHQoKSwgY29udGFpbmluZ0Jsb2NrV2lk dGgpOwogCiAgICAgaWYgKCFsZWZ0ICYmICFyaWdodCkgewogICAgICAgICAvLyAjMQpAQCAtMzc3 LDcgKzM3Nyw3IEBAIEhlaWdodEFuZE1hcmdpbiBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpHZW9t ZXRyeTo6aW5GbG93SGVpZ2h0QW5kTWFyZ2luKExheW91dENvCiAgICAgLy8gMTAuNi4yIElubGlu ZSByZXBsYWNlZCBlbGVtZW50cywgYmxvY2stbGV2ZWwgcmVwbGFjZWQgZWxlbWVudHMgaW4gbm9y bWFsIGZsb3csICdpbmxpbmUtYmxvY2snCiAgICAgLy8gcmVwbGFjZWQgZWxlbWVudHMgaW4gbm9y bWFsIGZsb3cgYW5kIGZsb2F0aW5nIHJlcGxhY2VkIGVsZW1lbnRzCiAgICAgaWYgKGxheW91dEJv eC5yZXBsYWNlZCgpKQotICAgICAgICByZXR1cm4gRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5 OjppbmxpbmVSZXBsYWNlZEhlaWdodEFuZE1hcmdpbihsYXlvdXRDb250ZXh0LCBsYXlvdXRCb3gp OworICAgICAgICByZXR1cm4gaW5saW5lUmVwbGFjZWRIZWlnaHRBbmRNYXJnaW4obGF5b3V0Q29u dGV4dCwgbGF5b3V0Qm94KTsKIAogICAgIEhlaWdodEFuZE1hcmdpbiBoZWlnaHRBbmRNYXJnaW47 CiAgICAgLy8gVE9ETzogRmlndXJlIG91dCB0aGUgY2FzZSBmb3IgdGhlIGRvY3VtZW50IGVsZW1l bnQuIExldCdzIGp1c3QgY29tcGxpY2F0ZWQtY2FzZSBpdCBmb3Igbm93LgpAQCAtMzg2LDcgKzM4 Niw3IEBAIEhlaWdodEFuZE1hcmdpbiBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6 aW5GbG93SGVpZ2h0QW5kTWFyZ2luKExheW91dENvCiAgICAgZWxzZSB7CiAgICAgICAgIC8vIDEw LjYuNiBDb21wbGljYXRlZCBjYXNlcwogICAgICAgICAvLyBCbG9jay1sZXZlbCwgbm9uLXJlcGxh Y2VkIGVsZW1lbnRzIGluIG5vcm1hbCBmbG93IHdoZW4gJ292ZXJmbG93JyBkb2VzIG5vdCBjb21w dXRlIHRvICd2aXNpYmxlJyAoZXhjZXB0IGlmIHRoZSAnb3ZlcmZsb3cnIHByb3BlcnR5J3MgdmFs dWUgaGFzIGJlZW4gcHJvcGFnYXRlZCB0byB0aGUgdmlld3BvcnQpLgotICAgICAgICBoZWlnaHRB bmRNYXJnaW4gPSBGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OmNvbXBsaWNhdGVkQ2FzZXMo bGF5b3V0Q29udGV4dCwgbGF5b3V0Qm94KTsKKyAgICAgICAgaGVpZ2h0QW5kTWFyZ2luID0gY29t cGxpY2F0ZWRDYXNlcyhsYXlvdXRDb250ZXh0LCBsYXlvdXRCb3gpOwogICAgIH0KIAogICAgIGlm ICghaXNTdHJldGNoZWRUb0luaXRpYWxDb250YWluaW5nQmxvY2sobGF5b3V0Q29udGV4dCwgbGF5 b3V0Qm94KSkKQEAgLTQxOCw3ICs0MTgsNyBAQCBib29sIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6 Okdlb21ldHJ5OjppbnN0cmluc2ljV2lkdGhDb25zdHJhaW50c05lZWRDaGlsZHJlbldpZAogRm9y bWF0dGluZ0NvbnRleHQ6Okluc3RyaW5zaWNXaWR0aENvbnN0cmFpbnRzIEJsb2NrRm9ybWF0dGlu Z0NvbnRleHQ6Okdlb21ldHJ5OjppbnN0cmluc2ljV2lkdGhDb25zdHJhaW50cyhMYXlvdXRDb250 ZXh0JiBsYXlvdXRDb250ZXh0LCBjb25zdCBCb3gmIGxheW91dEJveCkKIHsKICAgICBhdXRvJiBz dHlsZSA9IGxheW91dEJveC5zdHlsZSgpOwotICAgIGlmIChhdXRvIHdpZHRoID0gRm9ybWF0dGlu Z0NvbnRleHQ6Okdlb21ldHJ5OjpmaXhlZFZhbHVlKHN0eWxlLmxvZ2ljYWxXaWR0aCgpKSkKKyAg ICBpZiAoYXV0byB3aWR0aCA9IGZpeGVkVmFsdWUoc3R5bGUubG9naWNhbFdpZHRoKCkpKQogICAg ICAgICByZXR1cm4geyAqd2lkdGgsICp3aWR0aCB9OwogCiAgICAgLy8gTWluaW11bS9tYXhpbXVt IHdpZHRoIGNhbid0IGJlIGRlcGVuZGluZyBvbiB0aGUgY29udGFpbmluZyBibG9jaydzIHdpZHRo LgpAQCAtNDQwLDEyICs0NDAsMTIgQEAgRm9ybWF0dGluZ0NvbnRleHQ6Okluc3RyaW5zaWNXaWR0 aENvbnN0cmFpbnRzIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjoKICAgICAgICAg QVNTRVJUKGNoaWxkSW5zdHJpbnNpY1dpZHRoQ29uc3RyYWludHMpOwogICAgICAgICAKICAgICAg ICAgYXV0byYgc3R5bGUgPSBjaGlsZC5zdHlsZSgpOwotICAgICAgICBhdXRvIGhvcml6b250YWxN YXJnaW5Cb3JkZXJBbmRQYWRkaW5nID0gRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjpmaXhl ZFZhbHVlKHN0eWxlLm1hcmdpbkxlZnQoKSkudmFsdWVfb3IoMCkKKyAgICAgICAgYXV0byBob3Jp em9udGFsTWFyZ2luQm9yZGVyQW5kUGFkZGluZyA9IGZpeGVkVmFsdWUoc3R5bGUubWFyZ2luTGVm dCgpKS52YWx1ZV9vcigwKQogICAgICAgICAgICAgKyBMYXlvdXRVbml0IHsgc3R5bGUuYm9yZGVy TGVmdFdpZHRoKCkgfQotICAgICAgICAgICAgKyBGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6 OmZpeGVkVmFsdWUoc3R5bGUucGFkZGluZ0xlZnQoKSkudmFsdWVfb3IoMCkKLSAgICAgICAgICAg ICsgRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjpmaXhlZFZhbHVlKHN0eWxlLnBhZGRpbmdS aWdodCgpKS52YWx1ZV9vcigwKQorICAgICAgICAgICAgKyBmaXhlZFZhbHVlKHN0eWxlLnBhZGRp bmdMZWZ0KCkpLnZhbHVlX29yKDApCisgICAgICAgICAgICArIGZpeGVkVmFsdWUoc3R5bGUucGFk ZGluZ1JpZ2h0KCkpLnZhbHVlX29yKDApCiAgICAgICAgICAgICArIExheW91dFVuaXQgeyBzdHls ZS5ib3JkZXJSaWdodFdpZHRoKCkgfQotICAgICAgICAgICAgKyBGb3JtYXR0aW5nQ29udGV4dDo6 R2VvbWV0cnk6OmZpeGVkVmFsdWUoc3R5bGUubWFyZ2luUmlnaHQoKSkudmFsdWVfb3IoMCk7Cisg ICAgICAgICAgICArIGZpeGVkVmFsdWUoc3R5bGUubWFyZ2luUmlnaHQoKSkudmFsdWVfb3IoMCk7 CiAKICAgICAgICAgbWluaW11bUludHJpbnNpY1dpZHRoID0gc3RkOjptYXgobWluaW11bUludHJp bnNpY1dpZHRoLCBjaGlsZEluc3RyaW5zaWNXaWR0aENvbnN0cmFpbnRzLT5taW5pbXVtICsgaG9y aXpvbnRhbE1hcmdpbkJvcmRlckFuZFBhZGRpbmcpOyAKICAgICAgICAgbWF4aW11bUludHJpbnNp Y1dpZHRoID0gc3RkOjptYXgobWF4aW11bUludHJpbnNpY1dpZHRoLCBjaGlsZEluc3RyaW5zaWNX aWR0aENvbnN0cmFpbnRzLT5tYXhpbXVtICsgaG9yaXpvbnRhbE1hcmdpbkJvcmRlckFuZFBhZGRp bmcpOyAK