188630 2018-08-15 21:11:18 -0700 [LFC][BFC] Display::Box interface should reflect that padding is optional. 2018-08-16 12:44:29 -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 1450576 0 zalan 2018-08-15 21:11:18 -0700 ssia 1450584 1 347241 zalan 2018-08-15 21:38:31 -0700 Created attachment 347241 Patch 1450672 2 zalan 2018-08-16 07:40:39 -0700 Committed r234925: <https://trac.webkit.org/changeset/234925> 1450674 3 webkit-bug-importer 2018-08-16 07:42:38 -0700 <rdar://problem/43380732> 1450810 4 347241 simon.fraser 2018-08-16 12:40:07 -0700 Comment on attachment 347241 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=347241&action=review > Source/WebCore/ChangeLog:8 > + Certain type of boxes can't have paddings (see Layout::Box::isPaddingApplicable). s/paddings/padding/ What's the utility of knowing that there is no padding vs. padding is zero? std::optional<> bloats class layout. 1450813 5 zalan 2018-08-16 12:44:29 -0700 (In reply to Simon Fraser (smfr) from comment #4) > Comment on attachment 347241 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=347241&action=review > > > Source/WebCore/ChangeLog:8 > > + Certain type of boxes can't have paddings (see Layout::Box::isPaddingApplicable). > > s/paddings/padding/ > > What's the utility of knowing that there is no padding vs. padding is zero? > std::optional<> bloats class layout. From geometry point of view, there's no difference. This is about correctness. If we find std::optional excessive, it's fine to make it debug only and preserve the correctness part of it. 347241 2018-08-15 21:38:31 -0700 2018-08-16 07:23:54 -0700 Patch bug-188630-20180815213829.patch text/plain 14365 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjM0OTAzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDVmMzlmZmE3Y2I1Mjky N2U2MzA5ZTkzMTE5MDk1Njk0Njc1MGRkMy4uNTE3YWRmMjljYWM2ZjBlNmEyOWQ3NTFhOWE4M2Q2 YjU3MzdmNzJmZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDE4LTA4LTE1ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bQkZDXSBEaXNwbGF5 OjpCb3ggaW50ZXJmYWNlIHNob3VsZCByZWZsZWN0IHRoYXQgcGFkZGluZyBpcyBvcHRpb25hbC4K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4ODYzMAor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENlcnRhaW4g dHlwZSBvZiBib3hlcyBjYW4ndCBoYXZlIHBhZGRpbmdzIChzZWUgTGF5b3V0OjpCb3g6OmlzUGFk ZGluZ0FwcGxpY2FibGUpLgorCisgICAgICAgICogbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6Rm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVC b3JkZXJBbmRQYWRkaW5nIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6Rm9ybWF0 dGluZ0NvbnRleHQ6OnZhbGlkYXRlR2VvbWV0cnlDb25zdHJhaW50c0FmdGVyTGF5b3V0IGNvbnN0 KToKKyAgICAgICAgKiBsYXlvdXQvRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpMYXlvdXQ6OkZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6b3V0T2ZG bG93Tm9uUmVwbGFjZWRWZXJ0aWNhbEdlb21ldHJ5KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91 dDo6Rm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjpvdXRPZkZsb3dOb25SZXBsYWNlZEhvcml6 b250YWxHZW9tZXRyeSk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkZvcm1hdHRpbmdDb250 ZXh0OjpHZW9tZXRyeTo6b3V0T2ZGbG93UmVwbGFjZWRWZXJ0aWNhbEdlb21ldHJ5KToKKyAgICAg ICAgKFdlYkNvcmU6OkxheW91dDo6Rm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjpvdXRPZkZs b3dSZXBsYWNlZEhvcml6b250YWxHZW9tZXRyeSk6CisgICAgICAgICogbGF5b3V0L2Jsb2NrZm9y bWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6TGF5b3V0OjpCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6aW5GbG93Tm9u UmVwbGFjZWRIZWlnaHRBbmRNYXJnaW4pOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpCbG9j a0Zvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6aW5GbG93Tm9uUmVwbGFjZWRXaWR0aEFuZE1h cmdpbik6CisgICAgICAgICogbGF5b3V0L2Rpc3BsYXl0cmVlL0Rpc3BsYXlCb3guaDoKKyAgICAg ICAgKFdlYkNvcmU6OkRpc3BsYXk6OkJveDo6d2lkdGggY29uc3QpOgorICAgICAgICAoV2ViQ29y ZTo6RGlzcGxheTo6Qm94OjpoZWlnaHQgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6RGlzcGxh eTo6Qm94Ojpjb250ZW50Qm94VG9wIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkRpc3BsYXk6 OkJveDo6Y29udGVudEJveExlZnQgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6RGlzcGxheTo6 Qm94OjpzZXRQYWRkaW5nKToKKyAgICAgICAgKFdlYkNvcmU6OkRpc3BsYXk6OkJveDo6cGFkZGlu Z1RvcCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpEaXNwbGF5OjpCb3g6OnBhZGRpbmdMZWZ0 IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkRpc3BsYXk6OkJveDo6cGFkZGluZ0JvdHRvbSBj b25zdCk6CisgICAgICAgIChXZWJDb3JlOjpEaXNwbGF5OjpCb3g6OnBhZGRpbmdSaWdodCBjb25z dCk6CisKIDIwMTgtMDgtMTUgIENocmlzdG9waGVyIFJlaWQgIDxjaHJpcy5yZWlkQHNvbnkuY29t PgogCiAgICAgICAgIFtDdXJsXSBJbXBsZW1lbnQgZGVmYXVsdCBjb29raWUgcGF0aCBoYW5kbGlu ZyBjb3JyZWN0bHkgYXMgb3V0bGluZWQgaW4gUkZDNjI2NS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvRm9ybWF0dGluZ0NvbnRleHQuY3BwCmluZGV4IDQxNjNlNzYxOTNmYjFiMmQ5YjViNzRkOWM0 OWRhZTVhZGJiODQ4NWIuLmRlNDgwMDk0MDIyNmEwMmUxMDJmNzI1YTRkZmFiNDllZjJlNjY5OWUg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dC5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0LmNwcApAQCAtOTAs OCArOTAsNyBAQCB2b2lkIEZvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlT3V0T2ZGbG93VmVydGlj YWxHZW9tZXRyeShMYXlvdXRDb250ZXh0JiBsYXlvdXRDbwogdm9pZCBGb3JtYXR0aW5nQ29udGV4 dDo6Y29tcHV0ZUJvcmRlckFuZFBhZGRpbmcoTGF5b3V0Q29udGV4dCYgbGF5b3V0Q29udGV4dCwg Y29uc3QgQm94JiBsYXlvdXRCb3gsIERpc3BsYXk6OkJveCYgZGlzcGxheUJveCkgY29uc3QKIHsK ICAgICBkaXNwbGF5Qm94LnNldEJvcmRlcihHZW9tZXRyeTo6Y29tcHV0ZWRCb3JkZXIobGF5b3V0 Q29udGV4dCwgbGF5b3V0Qm94KSk7Ci0gICAgaWYgKGF1dG8gcGFkZGluZyA9IEdlb21ldHJ5Ojpj b21wdXRlZFBhZGRpbmcobGF5b3V0Q29udGV4dCwgbGF5b3V0Qm94KSkKLSAgICAgICAgZGlzcGxh eUJveC5zZXRQYWRkaW5nKCpwYWRkaW5nKTsKKyAgICBkaXNwbGF5Qm94LnNldFBhZGRpbmcoR2Vv bWV0cnk6OmNvbXB1dGVkUGFkZGluZyhsYXlvdXRDb250ZXh0LCBsYXlvdXRCb3gpKTsKIH0KIAog dm9pZCBGb3JtYXR0aW5nQ29udGV4dDo6cGxhY2VJbkZsb3dQb3NpdGlvbmVkQ2hpbGRyZW4oTGF5 b3V0Q29udGV4dCYgbGF5b3V0Q29udGV4dCwgY29uc3QgQ29udGFpbmVyJiBjb250YWluZXIpIGNv bnN0CkBAIC0yMDQsMTYgKzIwMywxNiBAQCB2b2lkIEZvcm1hdHRpbmdDb250ZXh0Ojp2YWxpZGF0 ZUdlb21ldHJ5Q29uc3RyYWludHNBZnRlckxheW91dChjb25zdCBMYXlvdXRDb250ZQogICAgICAg ICBpZiAoKGxheW91dEJveC5pc0Jsb2NrTGV2ZWxCb3goKSB8fCBsYXlvdXRCb3guaXNPdXRPZkZs b3dQb3NpdGlvbmVkKCkpICYmICFsYXlvdXRCb3gucmVwbGFjZWQoKSkgewogICAgICAgICAgICAg Ly8gbWFyZ2luLWxlZnQgKyBib3JkZXItbGVmdC13aWR0aCArIHBhZGRpbmctbGVmdCArIHdpZHRo ICsgcGFkZGluZy1yaWdodCArIGJvcmRlci1yaWdodC13aWR0aCArIG1hcmdpbi1yaWdodCA9IHdp ZHRoIG9mIGNvbnRhaW5pbmcgYmxvY2sKICAgICAgICAgICAgIGF1dG8gY29udGFpbmluZ0Jsb2Nr V2lkdGggPSBjb250YWluaW5nQmxvY2tEaXNwbGF5Qm94LmNvbnRlbnRCb3hXaWR0aCgpOwotICAg ICAgICAgICAgQVNTRVJUKGRpc3BsYXlCb3gtPm1hcmdpbkxlZnQoKSArIGRpc3BsYXlCb3gtPmJv cmRlckxlZnQoKSArIGRpc3BsYXlCb3gtPnBhZGRpbmdMZWZ0KCkgKyBkaXNwbGF5Qm94LT5jb250 ZW50Qm94V2lkdGgoKQotICAgICAgICAgICAgICAgICsgZGlzcGxheUJveC0+cGFkZGluZ1JpZ2h0 KCkgKyBkaXNwbGF5Qm94LT5ib3JkZXJSaWdodCgpICsgZGlzcGxheUJveC0+bWFyZ2luUmlnaHQo KSA9PSBjb250YWluaW5nQmxvY2tXaWR0aCk7CisgICAgICAgICAgICBBU1NFUlQoZGlzcGxheUJv eC0+bWFyZ2luTGVmdCgpICsgZGlzcGxheUJveC0+Ym9yZGVyTGVmdCgpICsgZGlzcGxheUJveC0+ cGFkZGluZ0xlZnQoKS52YWx1ZV9vcigwKSArIGRpc3BsYXlCb3gtPmNvbnRlbnRCb3hXaWR0aCgp CisgICAgICAgICAgICAgICAgKyBkaXNwbGF5Qm94LT5wYWRkaW5nUmlnaHQoKS52YWx1ZV9vcigw KSArIGRpc3BsYXlCb3gtPmJvcmRlclJpZ2h0KCkgKyBkaXNwbGF5Qm94LT5tYXJnaW5SaWdodCgp ID09IGNvbnRhaW5pbmdCbG9ja1dpZHRoKTsKICAgICAgICAgfQogCiAgICAgICAgIC8vIDEwLjYu NCBBYnNvbHV0ZWx5IHBvc2l0aW9uZWQsIG5vbi1yZXBsYWNlZCBlbGVtZW50cwogICAgICAgICBp ZiAobGF5b3V0Qm94LmlzT3V0T2ZGbG93UG9zaXRpb25lZCgpICYmICFsYXlvdXRCb3gucmVwbGFj ZWQoKSkgewogICAgICAgICAgICAgLy8gdG9wICsgbWFyZ2luLXRvcCArIGJvcmRlci10b3Atd2lk dGggKyBwYWRkaW5nLXRvcCArIGhlaWdodCArIHBhZGRpbmctYm90dG9tICsgYm9yZGVyLWJvdHRv bS13aWR0aCArIG1hcmdpbi1ib3R0b20gKyBib3R0b20gPSBoZWlnaHQgb2YgY29udGFpbmluZyBi bG9jawogICAgICAgICAgICAgYXV0byBjb250YWluaW5nQmxvY2tIZWlnaHQgPSBjb250YWluaW5n QmxvY2tEaXNwbGF5Qm94LmNvbnRlbnRCb3hIZWlnaHQoKTsKLSAgICAgICAgICAgIEFTU0VSVChk aXNwbGF5Qm94LT50b3AoKSArIGRpc3BsYXlCb3gtPm1hcmdpblRvcCgpICsgZGlzcGxheUJveC0+ Ym9yZGVyVG9wKCkgKyBkaXNwbGF5Qm94LT5wYWRkaW5nVG9wKCkgKyBkaXNwbGF5Qm94LT5jb250 ZW50Qm94SGVpZ2h0KCkKLSAgICAgICAgICAgICAgICArIGRpc3BsYXlCb3gtPnBhZGRpbmdCb3R0 b20oKSArIGRpc3BsYXlCb3gtPmJvcmRlckJvdHRvbSgpICsgZGlzcGxheUJveC0+bWFyZ2luQm90 dG9tKCkgPT0gY29udGFpbmluZ0Jsb2NrSGVpZ2h0KTsKKyAgICAgICAgICAgIEFTU0VSVChkaXNw bGF5Qm94LT50b3AoKSArIGRpc3BsYXlCb3gtPm1hcmdpblRvcCgpICsgZGlzcGxheUJveC0+Ym9y ZGVyVG9wKCkgKyBkaXNwbGF5Qm94LT5wYWRkaW5nVG9wKCkudmFsdWVfb3IoMCkgKyBkaXNwbGF5 Qm94LT5jb250ZW50Qm94SGVpZ2h0KCkKKyAgICAgICAgICAgICAgICArIGRpc3BsYXlCb3gtPnBh ZGRpbmdCb3R0b20oKS52YWx1ZV9vcigwKSArIGRpc3BsYXlCb3gtPmJvcmRlckJvdHRvbSgpICsg ZGlzcGxheUJveC0+bWFyZ2luQm90dG9tKCkgPT0gY29udGFpbmluZ0Jsb2NrSGVpZ2h0KTsKICAg ICAgICAgfQogICAgIH0KIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3Jt YXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0 aW5nQ29udGV4dEdlb21ldHJ5LmNwcAppbmRleCBkOTBiZTIxNTU1M2QxZTI3YTY0MjdjY2NiZTA1 ZjM1YTcyOTY5ZjYzLi5jODMzYjE4MTNkMjc0NTZhZTEyMDcxZGQwMzU5YzYyYmViYjY1YmY0IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRy eS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0R2VvbWV0 cnkuY3BwCkBAIC0xOTYsOCArMTk2LDggQEAgVmVydGljYWxHZW9tZXRyeSBGb3JtYXR0aW5nQ29u dGV4dDo6R2VvbWV0cnk6Om91dE9mRmxvd05vblJlcGxhY2VkVmVydGljYWxHZW9tZXQKICAgICBh dXRvIGhlaWdodCA9IGNvbXB1dGVkVmFsdWVJZk5vdEF1dG8oc3R5bGUubG9naWNhbEhlaWdodCgp LCBjb250YWluaW5nQmxvY2tIZWlnaHQpOwogICAgIGF1dG8gbWFyZ2luVG9wID0gY29tcHV0ZWRW YWx1ZUlmTm90QXV0byhzdHlsZS5tYXJnaW5Ub3AoKSwgY29udGFpbmluZ0Jsb2NrV2lkdGgpOwog ICAgIGF1dG8gbWFyZ2luQm90dG9tID0gY29tcHV0ZWRWYWx1ZUlmTm90QXV0byhzdHlsZS5tYXJn aW5Cb3R0b20oKSwgY29udGFpbmluZ0Jsb2NrV2lkdGgpOwotICAgIGF1dG8gcGFkZGluZ1RvcCA9 IGRpc3BsYXlCb3gucGFkZGluZ1RvcCgpOwotICAgIGF1dG8gcGFkZGluZ0JvdHRvbSA9IGRpc3Bs YXlCb3gucGFkZGluZ0JvdHRvbSgpOworICAgIGF1dG8gcGFkZGluZ1RvcCA9IGRpc3BsYXlCb3gu cGFkZGluZ1RvcCgpLnZhbHVlX29yKDApOworICAgIGF1dG8gcGFkZGluZ0JvdHRvbSA9IGRpc3Bs YXlCb3gucGFkZGluZ0JvdHRvbSgpLnZhbHVlX29yKDApOwogICAgIGF1dG8gYm9yZGVyVG9wID0g ZGlzcGxheUJveC5ib3JkZXJUb3AoKTsKICAgICBhdXRvIGJvcmRlckJvdHRvbSA9IGRpc3BsYXlC b3guYm9yZGVyQm90dG9tKCk7CiAKQEAgLTMxNCw4ICszMTQsOCBAQCBIb3Jpem9udGFsR2VvbWV0 cnkgRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjpvdXRPZkZsb3dOb25SZXBsYWNlZEhvcml6 b250YWxHZQogICAgIGF1dG8gd2lkdGggPSBjb21wdXRlZFZhbHVlSWZOb3RBdXRvKHN0eWxlLmxv Z2ljYWxXaWR0aCgpLCBjb250YWluaW5nQmxvY2tXaWR0aCk7CiAgICAgYXV0byBtYXJnaW5MZWZ0 ID0gY29tcHV0ZWRWYWx1ZUlmTm90QXV0byhzdHlsZS5tYXJnaW5MZWZ0KCksIGNvbnRhaW5pbmdC bG9ja1dpZHRoKTsKICAgICBhdXRvIG1hcmdpblJpZ2h0ID0gY29tcHV0ZWRWYWx1ZUlmTm90QXV0 byhzdHlsZS5tYXJnaW5SaWdodCgpLCBjb250YWluaW5nQmxvY2tXaWR0aCk7Ci0gICAgYXV0byBw YWRkaW5nTGVmdCA9IGRpc3BsYXlCb3gucGFkZGluZ0xlZnQoKTsKLSAgICBhdXRvIHBhZGRpbmdS aWdodCA9IGRpc3BsYXlCb3gucGFkZGluZ1JpZ2h0KCk7CisgICAgYXV0byBwYWRkaW5nTGVmdCA9 IGRpc3BsYXlCb3gucGFkZGluZ0xlZnQoKS52YWx1ZV9vcigwKTsKKyAgICBhdXRvIHBhZGRpbmdS aWdodCA9IGRpc3BsYXlCb3gucGFkZGluZ1JpZ2h0KCkudmFsdWVfb3IoMCk7CiAgICAgYXV0byBi b3JkZXJMZWZ0ID0gZGlzcGxheUJveC5ib3JkZXJMZWZ0KCk7CiAgICAgYXV0byBib3JkZXJSaWdo dCA9IGRpc3BsYXlCb3guYm9yZGVyUmlnaHQoKTsKIApAQCAtNDQyLDggKzQ0Miw4IEBAIFZlcnRp Y2FsR2VvbWV0cnkgRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjpvdXRPZkZsb3dSZXBsYWNl ZFZlcnRpY2FsR2VvbWV0cnkoCiAgICAgYXV0byBoZWlnaHQgPSBpbmxpbmVSZXBsYWNlZEhlaWdo dEFuZE1hcmdpbihsYXlvdXRDb250ZXh0LCBsYXlvdXRCb3gpLmhlaWdodDsKICAgICBhdXRvIG1h cmdpblRvcCA9IGNvbXB1dGVkVmFsdWVJZk5vdEF1dG8oc3R5bGUubWFyZ2luVG9wKCksIGNvbnRh aW5pbmdCbG9ja1dpZHRoKTsKICAgICBhdXRvIG1hcmdpbkJvdHRvbSA9IGNvbXB1dGVkVmFsdWVJ Zk5vdEF1dG8oc3R5bGUubWFyZ2luQm90dG9tKCksIGNvbnRhaW5pbmdCbG9ja1dpZHRoKTsKLSAg ICBhdXRvIHBhZGRpbmdUb3AgPSBkaXNwbGF5Qm94LnBhZGRpbmdUb3AoKTsKLSAgICBhdXRvIHBh ZGRpbmdCb3R0b20gPSBkaXNwbGF5Qm94LnBhZGRpbmdCb3R0b20oKTsKKyAgICBhdXRvIHBhZGRp bmdUb3AgPSBkaXNwbGF5Qm94LnBhZGRpbmdUb3AoKS52YWx1ZV9vcigwKTsKKyAgICBhdXRvIHBh ZGRpbmdCb3R0b20gPSBkaXNwbGF5Qm94LnBhZGRpbmdCb3R0b20oKS52YWx1ZV9vcigwKTsKICAg ICBhdXRvIGJvcmRlclRvcCA9IGRpc3BsYXlCb3guYm9yZGVyVG9wKCk7CiAgICAgYXV0byBib3Jk ZXJCb3R0b20gPSBkaXNwbGF5Qm94LmJvcmRlckJvdHRvbSgpOwogCkBAIC01MTUsOCArNTE1LDgg QEAgSG9yaXpvbnRhbEdlb21ldHJ5IEZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6b3V0T2ZG bG93UmVwbGFjZWRIb3Jpem9udGFsR2VvbWUKICAgICBhdXRvIG1hcmdpbkxlZnQgPSBjb21wdXRl ZFZhbHVlSWZOb3RBdXRvKHN0eWxlLm1hcmdpbkxlZnQoKSwgY29udGFpbmluZ0Jsb2NrV2lkdGgp OwogICAgIGF1dG8gbWFyZ2luUmlnaHQgPSBjb21wdXRlZFZhbHVlSWZOb3RBdXRvKHN0eWxlLm1h cmdpblJpZ2h0KCksIGNvbnRhaW5pbmdCbG9ja1dpZHRoKTsKICAgICBhdXRvIHdpZHRoID0gaW5s aW5lUmVwbGFjZWRXaWR0aEFuZE1hcmdpbihsYXlvdXRDb250ZXh0LCBsYXlvdXRCb3gpLndpZHRo OwotICAgIGF1dG8gcGFkZGluZ0xlZnQgPSBkaXNwbGF5Qm94LnBhZGRpbmdMZWZ0KCk7Ci0gICAg YXV0byBwYWRkaW5nUmlnaHQgPSBkaXNwbGF5Qm94LnBhZGRpbmdSaWdodCgpOworICAgIGF1dG8g cGFkZGluZ0xlZnQgPSBkaXNwbGF5Qm94LnBhZGRpbmdMZWZ0KCkudmFsdWVfb3IoMCk7CisgICAg YXV0byBwYWRkaW5nUmlnaHQgPSBkaXNwbGF5Qm94LnBhZGRpbmdSaWdodCgpLnZhbHVlX29yKDAp OwogICAgIGF1dG8gYm9yZGVyTGVmdCA9IGRpc3BsYXlCb3guYm9yZGVyTGVmdCgpOwogICAgIGF1 dG8gYm9yZGVyUmlnaHQgPSBkaXNwbGF5Qm94LmJvcmRlclJpZ2h0KCk7CiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29u dGV4dEdlb21ldHJ5LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcv QmxvY2tGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcAppbmRleCA2ZGZmYzBiYTlkOWJhMmNk MmVkMGRlMjM3YTE0YzcyMjk5OTQ3OTA3Li5iODE0MmQ4ZDhjZDNhZTY5NjFlN2M2NzdjYTRmMzYz MDU3Yjk0MWQ1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0 aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnku Y3BwCkBAIC0xMDQsNyArMTA0LDcgQEAgSGVpZ2h0QW5kTWFyZ2luIEJsb2NrRm9ybWF0dGluZ0Nv bnRleHQ6Okdlb21ldHJ5OjppbkZsb3dOb25SZXBsYWNlZEhlaWdodEFuZE1hcmcKICAgICAgICAg VmVydGljYWxFZGdlcyBub25Db2xsYXBzZWRNYXJnaW4gPSB7IEZvcm1hdHRpbmdDb250ZXh0OjpH ZW9tZXRyeTo6Y29tcHV0ZWRWYWx1ZUlmTm90QXV0byhzdHlsZS5tYXJnaW5Ub3AoKSwgY29udGFp bmluZ0Jsb2NrV2lkdGgpLnZhbHVlX29yKDApLAogICAgICAgICAgICAgRm9ybWF0dGluZ0NvbnRl eHQ6Okdlb21ldHJ5Ojpjb21wdXRlZFZhbHVlSWZOb3RBdXRvKHN0eWxlLm1hcmdpbkJvdHRvbSgp LCBjb250YWluaW5nQmxvY2tXaWR0aCkudmFsdWVfb3IoMCkgfTsgCiAgICAgICAgIFZlcnRpY2Fs RWRnZXMgY29sbGFwc2VkTWFyZ2luID0geyBNYXJnaW5Db2xsYXBzZTo6bWFyZ2luVG9wKGxheW91 dENvbnRleHQsIGxheW91dEJveCksIE1hcmdpbkNvbGxhcHNlOjptYXJnaW5Cb3R0b20obGF5b3V0 Q29udGV4dCwgbGF5b3V0Qm94KSB9OwotICAgICAgICBhdXRvIGJvcmRlckFuZFBhZGRpbmdUb3Ag PSBkaXNwbGF5Qm94LmJvcmRlclRvcCgpICsgZGlzcGxheUJveC5wYWRkaW5nVG9wKCk7CisgICAg ICAgIGF1dG8gYm9yZGVyQW5kUGFkZGluZ1RvcCA9IGRpc3BsYXlCb3guYm9yZGVyVG9wKCkgKyBk aXNwbGF5Qm94LnBhZGRpbmdUb3AoKS52YWx1ZV9vcigwKTsKICAgICAgICAgCiAgICAgICAgIGF1 dG8gaGVpZ2h0ID0gc3R5bGUubG9naWNhbEhlaWdodCgpOwogICAgICAgICBpZiAoIWhlaWdodC5p c0F1dG8oKSkgewpAQCAtMTkxLDggKzE5MSw4IEBAIFdpZHRoQW5kTWFyZ2luIEJsb2NrRm9ybWF0 dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjppbkZsb3dOb25SZXBsYWNlZFdpZHRoQW5kTWFyZ2luCiAg ICAgICAgIGF1dG8gbWFyZ2luUmlnaHQgPSBGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OmNv bXB1dGVkVmFsdWVJZk5vdEF1dG8oc3R5bGUubWFyZ2luUmlnaHQoKSwgY29udGFpbmluZ0Jsb2Nr V2lkdGgpOwogICAgICAgICBhdXRvIGJvcmRlckxlZnQgPSBkaXNwbGF5Qm94LmJvcmRlckxlZnQo KTsKICAgICAgICAgYXV0byBib3JkZXJSaWdodCA9IGRpc3BsYXlCb3guYm9yZGVyUmlnaHQoKTsK LSAgICAgICAgYXV0byBwYWRkaW5nTGVmdCA9IGRpc3BsYXlCb3gucGFkZGluZ0xlZnQoKTsKLSAg ICAgICAgYXV0byBwYWRkaW5nUmlnaHQgPSBkaXNwbGF5Qm94LnBhZGRpbmdSaWdodCgpOworICAg ICAgICBhdXRvIHBhZGRpbmdMZWZ0ID0gZGlzcGxheUJveC5wYWRkaW5nTGVmdCgpLnZhbHVlX29y KDApOworICAgICAgICBhdXRvIHBhZGRpbmdSaWdodCA9IGRpc3BsYXlCb3gucGFkZGluZ1JpZ2h0 KCkudmFsdWVfb3IoMCk7CiAKICAgICAgICAgLy8gIzEKICAgICAgICAgaWYgKHdpZHRoKSB7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZGlzcGxheXRyZWUvRGlzcGxheUJveC5o IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Rpc3BsYXl0cmVlL0Rpc3BsYXlCb3guaAppbmRleCBm ZDA5NmQzZjMzMjE0ZGYxNjMyNjcwZGQyMDVmZmYwOTQzNzhhMTRlLi4zZTYyNGYwOTUyOTczMGVk MTE5NjUxMzU0YWJjYWFmMmJmOTFkOGJmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvZGlzcGxheXRyZWUvRGlzcGxheUJveC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9k aXNwbGF5dHJlZS9EaXNwbGF5Qm94LmgKQEAgLTEyNiw4ICsxMjYsOCBAQCBwdWJsaWM6CiAgICAg TGF5b3V0UG9pbnQgYm90dG9tUmlnaHQoKSBjb25zdCB7IHJldHVybiB7IHJpZ2h0KCksIGJvdHRv bSgpIH07IH0KIAogICAgIExheW91dFNpemUgc2l6ZSgpIGNvbnN0IHsgcmV0dXJuIHsgd2lkdGgo KSwgaGVpZ2h0KCkgfTsgfQotICAgIExheW91dFVuaXQgd2lkdGgoKSBjb25zdCB7IHJldHVybiBi b3JkZXJMZWZ0KCkgKyBwYWRkaW5nTGVmdCgpICsgY29udGVudEJveFdpZHRoKCkgKyBwYWRkaW5n UmlnaHQoKSArIGJvcmRlclJpZ2h0KCk7IH0KLSAgICBMYXlvdXRVbml0IGhlaWdodCgpIGNvbnN0 IHsgcmV0dXJuIGJvcmRlclRvcCgpICsgcGFkZGluZ1RvcCgpICsgY29udGVudEJveEhlaWdodCgp ICsgcGFkZGluZ0JvdHRvbSgpICsgYm9yZGVyQm90dG9tKCk7IH0KKyAgICBMYXlvdXRVbml0IHdp ZHRoKCkgY29uc3QgeyByZXR1cm4gYm9yZGVyTGVmdCgpICsgcGFkZGluZ0xlZnQoKS52YWx1ZV9v cigwKSArIGNvbnRlbnRCb3hXaWR0aCgpICsgcGFkZGluZ1JpZ2h0KCkudmFsdWVfb3IoMCkgKyBi b3JkZXJSaWdodCgpOyB9CisgICAgTGF5b3V0VW5pdCBoZWlnaHQoKSBjb25zdCB7IHJldHVybiBi b3JkZXJUb3AoKSArIHBhZGRpbmdUb3AoKS52YWx1ZV9vcigwKSArIGNvbnRlbnRCb3hIZWlnaHQo KSArIHBhZGRpbmdCb3R0b20oKS52YWx1ZV9vcigwKSArIGJvcmRlckJvdHRvbSgpOyB9CiAgICAg UmVjdCByZWN0KCkgY29uc3QgeyByZXR1cm4geyB0b3AoKSwgbGVmdCgpLCB3aWR0aCgpLCBoZWln aHQoKSB9OyB9CiAgICAgUmVjdCByZWN0V2l0aE1hcmdpbigpIGNvbnN0IHsgcmV0dXJuIHsgdG9w KCkgLSBtYXJnaW5Ub3AoKSwgbGVmdCgpIC0gbWFyZ2luTGVmdCgpLCBtYXJnaW5MZWZ0KCkgKyB3 aWR0aCgpICsgbWFyZ2luUmlnaHQoKSwgbWFyZ2luVG9wKCkgKyBoZWlnaHQoKSArIG1hcmdpbkJv dHRvbSgpIH07IH0KIApAQCAtMTQ0LDEzICsxNDQsMTMgQEAgcHVibGljOgogICAgIExheW91dFVu aXQgYm9yZGVyQm90dG9tKCkgY29uc3Q7CiAgICAgTGF5b3V0VW5pdCBib3JkZXJSaWdodCgpIGNv bnN0OwogCi0gICAgTGF5b3V0VW5pdCBwYWRkaW5nVG9wKCkgY29uc3Q7Ci0gICAgTGF5b3V0VW5p dCBwYWRkaW5nTGVmdCgpIGNvbnN0OwotICAgIExheW91dFVuaXQgcGFkZGluZ0JvdHRvbSgpIGNv bnN0OwotICAgIExheW91dFVuaXQgcGFkZGluZ1JpZ2h0KCkgY29uc3Q7CisgICAgc3RkOjpvcHRp b25hbDxMYXlvdXRVbml0PiBwYWRkaW5nVG9wKCkgY29uc3Q7CisgICAgc3RkOjpvcHRpb25hbDxM YXlvdXRVbml0PiBwYWRkaW5nTGVmdCgpIGNvbnN0OworICAgIHN0ZDo6b3B0aW9uYWw8TGF5b3V0 VW5pdD4gcGFkZGluZ0JvdHRvbSgpIGNvbnN0OworICAgIHN0ZDo6b3B0aW9uYWw8TGF5b3V0VW5p dD4gcGFkZGluZ1JpZ2h0KCkgY29uc3Q7CiAKLSAgICBMYXlvdXRVbml0IGNvbnRlbnRCb3hUb3Ao KSBjb25zdCB7IHJldHVybiBib3JkZXJUb3AoKSArIHBhZGRpbmdUb3AoKTsgfQotICAgIExheW91 dFVuaXQgY29udGVudEJveExlZnQoKSBjb25zdCB7IHJldHVybiBib3JkZXJMZWZ0KCkgKyBwYWRk aW5nTGVmdCgpOyB9CisgICAgTGF5b3V0VW5pdCBjb250ZW50Qm94VG9wKCkgY29uc3QgeyByZXR1 cm4gYm9yZGVyVG9wKCkgKyBwYWRkaW5nVG9wKCkudmFsdWVfb3IoMCk7IH0KKyAgICBMYXlvdXRV bml0IGNvbnRlbnRCb3hMZWZ0KCkgY29uc3QgeyByZXR1cm4gYm9yZGVyTGVmdCgpICsgcGFkZGlu Z0xlZnQoKS52YWx1ZV9vcigwKTsgfQogICAgIExheW91dFVuaXQgY29udGVudEJveEJvdHRvbSgp IGNvbnN0IHsgcmV0dXJuIGNvbnRlbnRCb3hUb3AoKSArIGNvbnRlbnRCb3hIZWlnaHQoKTsgfQog ICAgIExheW91dFVuaXQgY29udGVudEJveFJpZ2h0KCkgY29uc3QgeyByZXR1cm4gY29udGVudEJv eExlZnQoKSArIGNvbnRlbnRCb3hXaWR0aCgpOyB9CiAgICAgTGF5b3V0VW5pdCBjb250ZW50Qm94 SGVpZ2h0KCkgY29uc3Q7CkBAIC0xODYsNyArMTg2LDcgQEAgcHJpdmF0ZToKICAgICB2b2lkIHNl dFZlcnRpY2FsTm9uQ29sbGFwc2VkTWFyZ2luKExheW91dDo6VmVydGljYWxFZGdlcyk7CiAKICAg ICB2b2lkIHNldEJvcmRlcihMYXlvdXQ6OkVkZ2VzKTsKLSAgICB2b2lkIHNldFBhZGRpbmcoTGF5 b3V0OjpFZGdlcyk7CisgICAgdm9pZCBzZXRQYWRkaW5nKHN0ZDo6b3B0aW9uYWw8TGF5b3V0OjpF ZGdlcz4pOwogCiAjaWYgIUFTU0VSVF9ESVNBQkxFRAogICAgIHZvaWQgaW52YWxpZGF0ZU1hcmdp bigpOwpAQCAtMjE0LDcgKzIxNCw3IEBAIHByaXZhdGU6CiAgICAgTGF5b3V0OjpWZXJ0aWNhbEVk Z2VzIG1fdmVydGljYWxOb25Db2xsYXBzZWRNYXJnaW47CiAKICAgICBMYXlvdXQ6OkVkZ2VzIG1f Ym9yZGVyOwotICAgIExheW91dDo6RWRnZXMgbV9wYWRkaW5nOworICAgIHN0ZDo6b3B0aW9uYWw8 TGF5b3V0OjpFZGdlcz4gbV9wYWRkaW5nOwogCiAjaWYgIUFTU0VSVF9ESVNBQkxFRAogICAgIGJv b2wgbV9oYXNWYWxpZEhvcml6b250YWxNYXJnaW4geyBmYWxzZSB9OwpAQCAtNDc2LDcgKzQ3Niw3 IEBAIGlubGluZSB2b2lkIEJveDo6c2V0Qm9yZGVyKExheW91dDo6RWRnZXMgYm9yZGVyKQogICAg IG1fYm9yZGVyID0gYm9yZGVyOwogfQogCi1pbmxpbmUgdm9pZCBCb3g6OnNldFBhZGRpbmcoTGF5 b3V0OjpFZGdlcyBwYWRkaW5nKQoraW5saW5lIHZvaWQgQm94OjpzZXRQYWRkaW5nKHN0ZDo6b3B0 aW9uYWw8TGF5b3V0OjpFZGdlcz4gcGFkZGluZykKIHsKICNpZiAhQVNTRVJUX0RJU0FCTEVECiAg ICAgc2V0SGFzVmFsaWRQYWRkaW5nKCk7CkBAIC01MjAsMjggKzUyMCwzNiBAQCBpbmxpbmUgTGF5 b3V0VW5pdCBCb3g6Om5vbkNvbGxhcHNlZE1hcmdpbkJvdHRvbSgpIGNvbnN0CiAgICAgcmV0dXJu IG1fdmVydGljYWxOb25Db2xsYXBzZWRNYXJnaW4uYm90dG9tOwogfQogCi1pbmxpbmUgTGF5b3V0 VW5pdCBCb3g6OnBhZGRpbmdUb3AoKSBjb25zdAoraW5saW5lIHN0ZDo6b3B0aW9uYWw8TGF5b3V0 VW5pdD4gQm94OjpwYWRkaW5nVG9wKCkgY29uc3QKIHsKICAgICBBU1NFUlQobV9oYXNWYWxpZFBh ZGRpbmcpOwotICAgIHJldHVybiBtX3BhZGRpbmcudmVydGljYWwudG9wOworICAgIGlmICghbV9w YWRkaW5nKQorICAgICAgICByZXR1cm4geyB9OworICAgIHJldHVybiBtX3BhZGRpbmctPnZlcnRp Y2FsLnRvcDsKIH0KIAotaW5saW5lIExheW91dFVuaXQgQm94OjpwYWRkaW5nTGVmdCgpIGNvbnN0 CitpbmxpbmUgc3RkOjpvcHRpb25hbDxMYXlvdXRVbml0PiBCb3g6OnBhZGRpbmdMZWZ0KCkgY29u c3QKIHsKICAgICBBU1NFUlQobV9oYXNWYWxpZFBhZGRpbmcpOwotICAgIHJldHVybiBtX3BhZGRp bmcuaG9yaXpvbnRhbC5sZWZ0OworICAgIGlmICghbV9wYWRkaW5nKQorICAgICAgICByZXR1cm4g eyB9OworICAgIHJldHVybiBtX3BhZGRpbmctPmhvcml6b250YWwubGVmdDsKIH0KIAotaW5saW5l IExheW91dFVuaXQgQm94OjpwYWRkaW5nQm90dG9tKCkgY29uc3QKK2lubGluZSBzdGQ6Om9wdGlv bmFsPExheW91dFVuaXQ+IEJveDo6cGFkZGluZ0JvdHRvbSgpIGNvbnN0CiB7CiAgICAgQVNTRVJU KG1faGFzVmFsaWRQYWRkaW5nKTsKLSAgICByZXR1cm4gbV9wYWRkaW5nLnZlcnRpY2FsLmJvdHRv bTsKKyAgICBpZiAoIW1fcGFkZGluZykKKyAgICAgICAgcmV0dXJuIHsgfTsKKyAgICByZXR1cm4g bV9wYWRkaW5nLT52ZXJ0aWNhbC5ib3R0b207CiB9CiAKLWlubGluZSBMYXlvdXRVbml0IEJveDo6 cGFkZGluZ1JpZ2h0KCkgY29uc3QKK2lubGluZSBzdGQ6Om9wdGlvbmFsPExheW91dFVuaXQ+IEJv eDo6cGFkZGluZ1JpZ2h0KCkgY29uc3QKIHsKICAgICBBU1NFUlQobV9oYXNWYWxpZFBhZGRpbmcp OwotICAgIHJldHVybiBtX3BhZGRpbmcuaG9yaXpvbnRhbC5yaWdodDsKKyAgICBpZiAoIW1fcGFk ZGluZykKKyAgICAgICAgcmV0dXJuIHsgfTsKKyAgICByZXR1cm4gbV9wYWRkaW5nLT5ob3Jpem9u dGFsLnJpZ2h0OwogfQogCiBpbmxpbmUgTGF5b3V0VW5pdCBCb3g6OmJvcmRlclRvcCgpIGNvbnN0 Cg==