187169 2018-06-28 22:10:56 -0700 [LFC] The static position for an out-of-flow box should include the previous sibling's collapsed margin 2018-06-29 00:56:20 -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 1437696 0 zalan 2018-06-28 22:10:56 -0700 ssia 1437700 1 343894 zalan 2018-06-28 22:19:16 -0700 Created attachment 343894 Patch 1437716 2 343894 commit-queue 2018-06-29 00:55:59 -0700 Comment on attachment 343894 Patch Clearing flags on attachment: 343894 Committed r233350: <https://trac.webkit.org/changeset/233350> 1437717 3 commit-queue 2018-06-29 00:56:01 -0700 All reviewed patches have been landed. Closing bug. 1437718 4 webkit-bug-importer 2018-06-29 00:56:20 -0700 <rdar://problem/41623580> 343894 2018-06-28 22:19:16 -0700 2018-06-29 00:55:59 -0700 Patch bug-187169-20180628221915.patch text/plain 12199 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjMzMzQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGNjYTI2NGFmNTIxMzlm ODhjNDlmM2QyOTFkZTdkZDZkMzYxOWRlOS4uNGE4OWM3YzMzODFmY2YzYTA2OWMwZWM1M2QyMzQ4 NDkwOWZiYjMxZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDE4LTA2LTI4ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ10gVGhlIHN0YXRpYyBw b3NpdGlvbiBmb3IgYW4gb3V0LW9mLWZsb3cgYm94IHNob3VsZCBpbmNsdWRlIHRoZSBwcmV2aW91 cyBzaWJsaW5nJ3MgY29sbGFwc2VkIG1hcmdpbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg3MTY5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgV2hlbiBjb21wdXRpbmcgdGhlIHN0YXRpYyBwb3NpdGlvbiBv ZiBhbiBhYnNvbHV0ZWx5IHBvc2l0aW9uZWQgYm94LCB3ZSBuZWVkIHRvIGxvb2sgYXQgdGhlIHBy ZXZpb3VzIHNpYmxpbmcncyBib3R0b20gbWFyZ2luLgorICAgICAgICBJZiB0aGUgcHJldmlvdXMg c2libGluZyBoYXBwZW5zIHRvIGNvbGxhcHNlIGl0cyBib3R0b20gbWFyZ2luIHdpdGggdGhlIHBh cmVudCdzIGJvdHRvbSBtYXJnaW4sIHdlIHN0aWxsIG5lZWQgdG8gYWNjb3VudCBmb3IgaXQKKyAg ICAgICAgYW5kIGNvbXB1dGUgdGhlIHN0YXRpYyB2ZXJ0aWNhbCBwb3NpdGlvbiBhcyBpZiB0aGUg Ym90dG9tIG1hcmdpbiB3YXMgbm90IGNvbGxhcHNlZC4KKworICAgICAgICAqIGxheW91dC9Gb3Jt YXR0aW5nQ29udGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkZvcm1hdHRpbmdD b250ZXh0Ojpjb21wdXRlRmxvYXRpbmdIZWlnaHRBbmRNYXJnaW4gY29uc3QpOgorICAgICAgICAo V2ViQ29yZTo6TGF5b3V0OjpGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZU91dE9mRmxvd1ZlcnRp Y2FsR2VvbWV0cnkgY29uc3QpOgorICAgICAgICAqIGxheW91dC9Gb3JtYXR0aW5nQ29udGV4dEdl b21ldHJ5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6c3RhdGljVmVydGljYWxQb3Np dGlvbkZvck91dE9mRmxvd1Bvc2l0aW9uZWQpOgorICAgICAgICAqIGxheW91dC9MYXlvdXRDb250 ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGF5b3V0Q29udGV4dDo6aW5pdGlh bGl6ZVJvb3QpOgorICAgICAgICAqIGxheW91dC9WZXJpZmljYXRpb24uY3BwOgorICAgICAgICAo V2ViQ29yZTo6TGF5b3V0OjpvdXRwdXRNaXNtYXRjaGluZ0JveEluZm9ybWF0aW9uSWZOZWVkZWQp OgorICAgICAgICAqIGxheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4 dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6 OmNvbXB1dGVJbkZsb3dIZWlnaHRBbmRNYXJnaW4gY29uc3QpOgorICAgICAgICAqIGxheW91dC9k aXNwbGF5dHJlZS9EaXNwbGF5Qm94LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRpc3BsYXk6OkJv eDo6bm9uQ29sbGFwc2VkTWFyZ2luQm94IGNvbnN0KToKKyAgICAgICAgKiBsYXlvdXQvZGlzcGxh eXRyZWUvRGlzcGxheUJveC5oOgorICAgICAgICAoV2ViQ29yZTo6RGlzcGxheTo6Qm94OjpzZXRI YXNWYWxpZFZlcnRpY2FsTm9uQ29sbGFwc2VkTWFyZ2luKToKKyAgICAgICAgKFdlYkNvcmU6OkRp c3BsYXk6OkJveDo6c2V0VmVydGljYWxNYXJnaW4pOgorICAgICAgICAoV2ViQ29yZTo6RGlzcGxh eTo6Qm94OjpzZXRWZXJ0aWNhbE5vbkNvbGxhcHNlZE1hcmdpbik6CisgICAgICAgIChXZWJDb3Jl OjpEaXNwbGF5OjpCb3g6Om5vbkNvbGxhcHNlZE1hcmdpblRvcCBjb25zdCk6CisgICAgICAgIChX ZWJDb3JlOjpEaXNwbGF5OjpCb3g6Om5vbkNvbGxhcHNlZE1hcmdpbkJvdHRvbSBjb25zdCk6CisK IDIwMTgtMDYtMjggIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBb TEZDXSBPdXQtb2YtZmxvdyBwb3NpdGlvbmVkIGhlaWdodCBkb2VzIG5vdCBuZWNlc3NhcmlseSBl cXVhbCB0byAiYm90dG9tIC0gdG9wIi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9Gb3JtYXR0aW5nQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0dGlu Z0NvbnRleHQuY3BwCmluZGV4IGYyODRkMWVjZGI5ODUwMzZhMWFkNzFkNjRkMDdlMjhiM2VlN2Fm NmMuLmM0MjBhODQ0OTlmMTM0NDI0ZTEyMDY3NTEwMWM0MjhmNjllNzAxMjMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dC5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0LmNwcApAQCAtNTgsNiArNTgsNyBAQCB2 b2lkIEZvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlRmxvYXRpbmdIZWlnaHRBbmRNYXJnaW4oTGF5 b3V0Q29udGV4dCYgbGF5b3V0Q29udAogICAgIGRpc3BsYXlCb3gubW92ZVZlcnRpY2FsbHkoaGVp Z2h0QW5kTWFyZ2luLm1hcmdpbi50b3ApOwogICAgIEFTU0VSVCghaGVpZ2h0QW5kTWFyZ2luLmNv bGxhcHNlZE1hcmdpbik7CiAgICAgZGlzcGxheUJveC5zZXRWZXJ0aWNhbE1hcmdpbihoZWlnaHRB bmRNYXJnaW4ubWFyZ2luKTsKKyAgICBkaXNwbGF5Qm94LnNldFZlcnRpY2FsTm9uQ29sbGFwc2Vk TWFyZ2luKGhlaWdodEFuZE1hcmdpbi5tYXJnaW4pOwogfQogCiB2b2lkIEZvcm1hdHRpbmdDb250 ZXh0Ojpjb21wdXRlRmxvYXRpbmdXaWR0aEFuZE1hcmdpbihMYXlvdXRDb250ZXh0JiBsYXlvdXRD b250ZXh0LCBjb25zdCBCb3gmIGxheW91dEJveCwgRGlzcGxheTo6Qm94JiBkaXNwbGF5Qm94KSBj b25zdApAQCAtODMsNiArODQsNyBAQCB2b2lkIEZvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlT3V0 T2ZGbG93VmVydGljYWxHZW9tZXRyeShMYXlvdXRDb250ZXh0JiBsYXlvdXRDbwogICAgIGRpc3Bs YXlCb3guc2V0Q29udGVudEJveEhlaWdodCh2ZXJ0aWNhbEdlb21ldHJ5LmhlaWdodEFuZE1hcmdp bi5oZWlnaHQpOwogICAgIEFTU0VSVCghdmVydGljYWxHZW9tZXRyeS5oZWlnaHRBbmRNYXJnaW4u Y29sbGFwc2VkTWFyZ2luKTsKICAgICBkaXNwbGF5Qm94LnNldFZlcnRpY2FsTWFyZ2luKHZlcnRp Y2FsR2VvbWV0cnkuaGVpZ2h0QW5kTWFyZ2luLm1hcmdpbik7CisgICAgZGlzcGxheUJveC5zZXRW ZXJ0aWNhbE5vbkNvbGxhcHNlZE1hcmdpbih2ZXJ0aWNhbEdlb21ldHJ5LmhlaWdodEFuZE1hcmdp bi5tYXJnaW4pOwogfQogCiB2b2lkIEZvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlQm9yZGVyQW5k UGFkZGluZyhMYXlvdXRDb250ZXh0JiBsYXlvdXRDb250ZXh0LCBjb25zdCBCb3gmIGxheW91dEJv eCwgRGlzcGxheTo6Qm94JiBkaXNwbGF5Qm94KSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwIGIvU291cmNlL1dlYkNv cmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCmluZGV4IGM2MmIyMzM5NTA5 NzY1MzBkMGRjNzkwNjZlMTdkYzJiY2FjZTE2MDcuLjVkZjI2NjQzN2FkYmE4NjE0MzM3ZTRmYTc5 NWVlMjljNzQ2NzQxYjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0 aW5nQ29udGV4dEdlb21ldHJ5LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0 dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAKQEAgLTgwLDYgKzgwLDExIEBAIHN0YXRpYyBMYXlvdXRV bml0IHN0YXRpY1ZlcnRpY2FsUG9zaXRpb25Gb3JPdXRPZkZsb3dQb3NpdGlvbmVkKGNvbnN0IExh eW91dENvbnRlCiAgICAgQVNTRVJUKGxheW91dEJveC5pc091dE9mRmxvd1Bvc2l0aW9uZWQoKSk7 CiAKICAgICBMYXlvdXRVbml0IHRvcDsKKyAgICAvLyBBZGQgc2libGluZyBvZmZzZXQKKyAgICBp ZiAoYXV0byogcHJldmlvdXNJbkZsb3dTaWJsaW5nID0gbGF5b3V0Qm94LnByZXZpb3VzSW5GbG93 U2libGluZygpKSB7CisgICAgICAgIGF1dG8mIHByZXZpb3VzSW5GbG93RGlzcGxheUJveCA9ICps YXlvdXRDb250ZXh0LmRpc3BsYXlCb3hGb3JMYXlvdXRCb3goKnByZXZpb3VzSW5GbG93U2libGlu Zyk7CisgICAgICAgIHRvcCArPSBwcmV2aW91c0luRmxvd0Rpc3BsYXlCb3guYm90dG9tKCkgKyBw cmV2aW91c0luRmxvd0Rpc3BsYXlCb3gubm9uQ29sbGFwc2VkTWFyZ2luQm90dG9tKCk7CisgICAg fQogICAgIC8vIFJlc29sdmUgdG9wIGFsbCB0aGUgd2F5IHVwIHRvIHRoZSBjb250YWluaW5nIGJs b2NrLgogICAgIGF1dG8qIGNvbnRhaW5pbmdCbG9jayA9IGxheW91dEJveC5jb250YWluaW5nQmxv Y2soKTsKICAgICBmb3IgKGF1dG8qIHBhcmVudCA9IGxheW91dEJveC5wYXJlbnQoKTsgcGFyZW50 OyBwYXJlbnQgPSBwYXJlbnQtPnBhcmVudCgpKSB7CkBAIC04OCwxMSArOTMsNiBAQCBzdGF0aWMg TGF5b3V0VW5pdCBzdGF0aWNWZXJ0aWNhbFBvc2l0aW9uRm9yT3V0T2ZGbG93UG9zaXRpb25lZChj b25zdCBMYXlvdXRDb250ZQogICAgICAgICBpZiAocGFyZW50ID09IGNvbnRhaW5pbmdCbG9jaykK ICAgICAgICAgICAgIGJyZWFrOwogICAgIH0KLSAgICAvLyBBZGQgc2libGluZyBvZmZzZXQKLSAg ICBpZiAoYXV0byogcHJldmlvdXNJbkZsb3dTaWJsaW5nID0gbGF5b3V0Qm94LnByZXZpb3VzSW5G bG93U2libGluZygpKSB7Ci0gICAgICAgIGF1dG8mIHByZXZpb3VzSW5GbG93RGlzcGxheUJveCA9 ICpsYXlvdXRDb250ZXh0LmRpc3BsYXlCb3hGb3JMYXlvdXRCb3goKnByZXZpb3VzSW5GbG93U2li bGluZyk7Ci0gICAgICAgIHRvcCArPSBwcmV2aW91c0luRmxvd0Rpc3BsYXlCb3guYm90dG9tKCkg KyBwcmV2aW91c0luRmxvd0Rpc3BsYXlCb3gubWFyZ2luQm90dG9tKCk7Ci0gICAgfQogICAgIC8v IEZJWE1FOiBmbG9hdGluZ3MgbmVlZCB0byBiZSB0YWtlbiBpbnRvIGFjY291bnQuCiAgICAgcmV0 dXJuIHRvcDsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9MYXlvdXRDb250 ZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9MYXlvdXRDb250ZXh0LmNwcAppbmRleCA5 OTk5NjE3ZGEyZDlkMGY3ZmQ2ODg5NjIyMzc0NWVkY2U1NWQzZDAzLi43NTFlYjYyNDFkNjFlY2Zl YzY5ZDQwNjM1OWFlYWE4ZjkxOTlkNjkzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvTGF5b3V0Q29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L0xheW91dENv bnRleHQuY3BwCkBAIC01OSw2ICs1OSw3IEBAIHZvaWQgTGF5b3V0Q29udGV4dDo6aW5pdGlhbGl6 ZVJvb3QoY29uc3QgQ29udGFpbmVyJiByb290LCBjb25zdCBMYXlvdXRTaXplJiBjb250CiAgICAg Ly8gRklYTUU6IG1fcm9vdCBjb3VsZCB2ZXJ5IHdlbGwgYmUgYSBmb3JtYXR0aW5nIGNvbnRleHQg cm9vdCB3aXRoIGFuY2VzdG9ycyBhbmQgcmVzb2x2YWJsZSBib3JkZXIgYW5kIHBhZGRpbmcgKGFz IG9wcG9zZWQgdG8gdGhlIHRvcG1vc3Qgcm9vdCkKICAgICBkaXNwbGF5Qm94LnNldEhvcml6b250 YWxNYXJnaW4oeyB9KTsKICAgICBkaXNwbGF5Qm94LnNldFZlcnRpY2FsTWFyZ2luKHsgfSk7Cisg ICAgZGlzcGxheUJveC5zZXRWZXJ0aWNhbE5vbkNvbGxhcHNlZE1hcmdpbih7IH0pOwogICAgIGRp c3BsYXlCb3guc2V0Qm9yZGVyKHsgfSk7CiAgICAgZGlzcGxheUJveC5zZXRQYWRkaW5nKHsgfSk7 CiAgICAgZGlzcGxheUJveC5zZXRDb250ZW50Qm94SGVpZ2h0KGNvbnRhaW5lclNpemUuaGVpZ2h0 KCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L1ZlcmlmaWNhdGlvbi5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvVmVyaWZpY2F0aW9uLmNwcAppbmRleCA2Njk3ZWE4MmM1 NzQ3ZmJiMzJiNWIxMzczYTU0NzY2OGU3OTQ5ZDE0Li40ODE2NGEwNzI5NTJkMjliODc4YjMzMDNk NTg4MGI0ZTM5MTc1YzRmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvVmVyaWZp Y2F0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvVmVyaWZpY2F0aW9uLmNwcApA QCAtNjcsMTkgKzY3LDEwIEBAIHN0YXRpYyBib29sIG91dHB1dE1pc21hdGNoaW5nQm94SW5mb3Jt YXRpb25JZk5lZWRlZChUZXh0U3RyZWFtJiBzdHJlYW0sIGNvbnN0IExhCiAgICAgICAgIHJldHVy biB0cnVlOwogICAgIH0KIAotI2lmbmRlZiBOREVCVUcKICAgICBpZiAocmVuZGVyZXIubWFyZ2lu Qm94UmVjdCgpICE9IGRpc3BsYXlCb3gtPm5vbkNvbGxhcHNlZE1hcmdpbkJveCgpKSB7CiAgICAg ICAgIG91dHB1dFJlY3QoIm1hcmdpbkJveCIsIHJlbmRlcmVyLm1hcmdpbkJveFJlY3QoKSwgZGlz cGxheUJveC0+bm9uQ29sbGFwc2VkTWFyZ2luQm94KCkpOwogICAgICAgICByZXR1cm4gdHJ1ZTsK ICAgICB9Ci0jZWxzZQotICAgIC8vIEZvciBub3cgaW4gbm9uLWRlYnVnIGJ1aWxkcywgdmVyaWZ5 IHRoZSBob3Jpem9udGFsIG1hcmdpbiBvbmx5Ci0gICAgaWYgKHJlbmRlcmVyLm1hcmdpbkJveFJl Y3QoKS5sZWZ0KCkgIT0gZGlzcGxheUJveC0+bWFyZ2luQm94KCkubGVmdCgpCi0gICAgICAgIHx8 IHJlbmRlcmVyLm1hcmdpbkJveFJlY3QoKS5yaWdodCgpICE9IGRpc3BsYXlCb3gtPm1hcmdpbkJv eCgpLnJpZ2h0KCkgKSB7Ci0gICAgICAgIG91dHB1dFJlY3QoIm1hcmdpbkJveCIsIHJlbmRlcmVy Lm1hcmdpbkJveFJlY3QoKSwgZGlzcGxheUJveC0+bWFyZ2luQm94KCkpOwotICAgICAgICByZXR1 cm4gdHJ1ZTsKLSAgICB9Ci0jZW5kaWYKIAogICAgIGlmIChyZW5kZXJlci5ib3JkZXJCb3hSZWN0 KCkgIT0gZGlzcGxheUJveC0+Ym9yZGVyQm94KCkpIHsKICAgICAgICAgb3V0cHV0UmVjdCgiYm9y ZGVyQm94IiwgcmVuZGVyZXIuYm9yZGVyQm94UmVjdCgpLCBkaXNwbGF5Qm94LT5ib3JkZXJCb3go KSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Js b2NrRm9ybWF0dGluZ0NvbnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9y bWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmNwcAppbmRleCBjOWM4Mjc1NzUxZDRmYTNk ODZmNWFlZGJmNzM5ODA2ZDA4OGEzNDJmLi4yYTA1N2M2ZjljOGMzMjhjZTJiYjE0ZjUyZTllNzAx MmQ4YTc4MTY3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0 aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5jcHAKQEAgLTE5NCw5ICsx OTQsNyBAQCB2b2lkIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVJbkZsb3dIZWlnaHRB bmRNYXJnaW4oTGF5b3V0Q29udGV4dCYgbGF5b3V0QwogICAgIGRpc3BsYXlCb3guc2V0Q29udGVu dEJveEhlaWdodChoZWlnaHRBbmRNYXJnaW4uaGVpZ2h0KTsKICAgICBkaXNwbGF5Qm94Lm1vdmVW ZXJ0aWNhbGx5KGhlaWdodEFuZE1hcmdpbi5jb2xsYXBzZWRNYXJnaW4udmFsdWVfb3IoaGVpZ2h0 QW5kTWFyZ2luLm1hcmdpbikudG9wKTsKICAgICBkaXNwbGF5Qm94LnNldFZlcnRpY2FsTWFyZ2lu KGhlaWdodEFuZE1hcmdpbi5jb2xsYXBzZWRNYXJnaW4udmFsdWVfb3IoaGVpZ2h0QW5kTWFyZ2lu Lm1hcmdpbikpOwotI2lmbmRlZiBOREVCVUcKICAgICBkaXNwbGF5Qm94LnNldFZlcnRpY2FsTm9u Q29sbGFwc2VkTWFyZ2luKGhlaWdodEFuZE1hcmdpbi5tYXJnaW4pOwotI2VuZGlmCiB9CiAKIHZv aWQgQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZUluRmxvd1dpZHRoQW5kTWFyZ2luKExh eW91dENvbnRleHQmIGxheW91dENvbnRleHQsIGNvbnN0IEJveCYgbGF5b3V0Qm94LCBEaXNwbGF5 OjpCb3gmIGRpc3BsYXlCb3gpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvZGlzcGxheXRyZWUvRGlzcGxheUJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZGlz cGxheXRyZWUvRGlzcGxheUJveC5jcHAKaW5kZXggZGMxZjMxYmIwMGQyOWQ0MzhjMTU2NjIxZDli ZDg3NWE0YThmYjE0Zi4uYjAyMGMxZTcyODM0ZjFhZDFlM2NlMWNlMjQyOTlhZGI1YWUyN2FkZCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Rpc3BsYXl0cmVlL0Rpc3BsYXlCb3gu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9kaXNwbGF5dHJlZS9EaXNwbGF5Qm94LmNw cApAQCAtNjIsMTkgKzYyLDE3IEBAIEJveDo6UmVjdCBCb3g6Om1hcmdpbkJveCgpIGNvbnN0CiAg ICAgcmV0dXJuIG1hcmdpbkJveDsKIH0KIAotI2lmbmRlZiBOREVCVUcKIEJveDo6UmVjdCBCb3g6 Om5vbkNvbGxhcHNlZE1hcmdpbkJveCgpIGNvbnN0CiB7CiAgICAgYXV0byBib3JkZXJCb3ggPSB0 aGlzLT5ib3JkZXJCb3goKTsKIAogICAgIFJlY3QgbWFyZ2luQm94OwotICAgIG1hcmdpbkJveC5z ZXRUb3AoYm9yZGVyQm94LnRvcCgpIC0gbV9ub25Db2xsYXBzZWRWZXJ0aXZhbE1hcmdpbi50b3Ap OworICAgIG1hcmdpbkJveC5zZXRUb3AoYm9yZGVyQm94LnRvcCgpIC0gbm9uQ29sbGFwc2VkTWFy Z2luVG9wKCkpOwogICAgIG1hcmdpbkJveC5zZXRMZWZ0KGJvcmRlckJveC5sZWZ0KCkgLSBtYXJn aW5MZWZ0KCkpOwotICAgIG1hcmdpbkJveC5zZXRIZWlnaHQoYm9yZGVyQm94LmhlaWdodCgpICsg bV9ub25Db2xsYXBzZWRWZXJ0aXZhbE1hcmdpbi50b3AgKyBtX25vbkNvbGxhcHNlZFZlcnRpdmFs TWFyZ2luLmJvdHRvbSk7CisgICAgbWFyZ2luQm94LnNldEhlaWdodChib3JkZXJCb3guaGVpZ2h0 KCkgKyBub25Db2xsYXBzZWRNYXJnaW5Ub3AoKSArIG5vbkNvbGxhcHNlZE1hcmdpbkJvdHRvbSgp KTsKICAgICBtYXJnaW5Cb3guc2V0V2lkdGgoYm9yZGVyQm94LndpZHRoKCkgKyBtYXJnaW5MZWZ0 KCkgKyBtYXJnaW5SaWdodCgpKTsKICAgICByZXR1cm4gbWFyZ2luQm94OwogfQotI2VuZGlmCiAK IEJveDo6UmVjdCBCb3g6OmJvcmRlckJveCgpIGNvbnN0CiB7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvZGlzcGxheXRyZWUvRGlzcGxheUJveC5oIGIvU291cmNlL1dlYkNvcmUv bGF5b3V0L2Rpc3BsYXl0cmVlL0Rpc3BsYXlCb3guaAppbmRleCA1MmJkOWFhNDc3OGQ3Y2I4NzQw M2E0YzQyZWVhMDJhODFmODZlZGU3Li43NTgwMjNjZjE4NzgzNTY3MGZlNjhkZTRkMTk0NWE0Zjlj NDYxZDYyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZGlzcGxheXRyZWUvRGlz cGxheUJveC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9kaXNwbGF5dHJlZS9EaXNwbGF5 Qm94LmgKQEAgLTEzMSw2ICsxMzEsOSBAQCBwdWJsaWM6CiAgICAgTGF5b3V0VW5pdCBtYXJnaW5C b3R0b20oKSBjb25zdDsKICAgICBMYXlvdXRVbml0IG1hcmdpblJpZ2h0KCkgY29uc3Q7CiAKKyAg ICBMYXlvdXRVbml0IG5vbkNvbGxhcHNlZE1hcmdpblRvcCgpIGNvbnN0OworICAgIExheW91dFVu aXQgbm9uQ29sbGFwc2VkTWFyZ2luQm90dG9tKCkgY29uc3Q7CisKICAgICBMYXlvdXRVbml0IGJv cmRlclRvcCgpIGNvbnN0OwogICAgIExheW91dFVuaXQgYm9yZGVyTGVmdCgpIGNvbnN0OwogICAg IExheW91dFVuaXQgYm9yZGVyQm90dG9tKCkgY29uc3Q7CkBAIC0xNDcsOSArMTUwLDggQEAgcHVi bGljOgogICAgIExheW91dFVuaXQgY29udGVudEJveFdpZHRoKCkgY29uc3Q7CiAKICAgICBSZWN0 IG1hcmdpbkJveCgpIGNvbnN0OwotI2lmbmRlZiBOREVCVUcKICAgICBSZWN0IG5vbkNvbGxhcHNl ZE1hcmdpbkJveCgpIGNvbnN0OwotI2VuZGlmCisKICAgICBSZWN0IGJvcmRlckJveCgpIGNvbnN0 OwogICAgIFJlY3QgcGFkZGluZ0JveCgpIGNvbnN0OwogICAgIFJlY3QgY29udGVudEJveCgpIGNv bnN0OwpAQCAtMTg5LDkgKzE5MSw4IEBAIHByaXZhdGU6CiAKICAgICB2b2lkIHNldEhvcml6b250 YWxNYXJnaW4oSG9yaXpvbnRhbEVkZ2VzKTsKICAgICB2b2lkIHNldFZlcnRpY2FsTWFyZ2luKFZl cnRpY2FsRWRnZXMpOwotI2lmbmRlZiBOREVCVUcKLSAgICB2b2lkIHNldFZlcnRpY2FsTm9uQ29s bGFwc2VkTWFyZ2luKFZlcnRpY2FsRWRnZXMgbWFyZ2luKSB7ICBtX25vbkNvbGxhcHNlZFZlcnRp dmFsTWFyZ2luID0gbWFyZ2luOyB9Ci0jZW5kaWYKKyAgICB2b2lkIHNldFZlcnRpY2FsTm9uQ29s bGFwc2VkTWFyZ2luKFZlcnRpY2FsRWRnZXMpOworCiAgICAgdm9pZCBzZXRCb3JkZXIoRWRnZXMp OwogICAgIHZvaWQgc2V0UGFkZGluZyhFZGdlcyk7CiAKQEAgLTIwMSw2ICsyMDIsNyBAQCBwcml2 YXRlOgogICAgIHZvaWQgaW52YWxpZGF0ZVBhZGRpbmcoKSB7IG1faGFzVmFsaWRQYWRkaW5nID0g ZmFsc2U7IH0KIAogICAgIHZvaWQgc2V0SGFzVmFsaWRWZXJ0aWNhbE1hcmdpbigpIHsgbV9oYXNW YWxpZFZlcnRpY2FsTWFyZ2luID0gdHJ1ZTsgfQorICAgIHZvaWQgc2V0SGFzVmFsaWRWZXJ0aWNh bE5vbkNvbGxhcHNlZE1hcmdpbigpIHsgbV9oYXNWYWxpZFZlcnRpY2FsTm9uQ29sbGFwc2VkTWFy Z2luID0gdHJ1ZTsgfQogICAgIHZvaWQgc2V0SGFzVmFsaWRIb3Jpem9udGFsTWFyZ2luKCkgeyBt X2hhc1ZhbGlkSG9yaXpvbnRhbE1hcmdpbiA9IHRydWU7IH0KIAogICAgIHZvaWQgc2V0SGFzVmFs aWRCb3JkZXIoKSB7IG1faGFzVmFsaWRCb3JkZXIgPSB0cnVlOyB9CkBAIC0yMTcsMTUgKzIxOSwx NSBAQCBwcml2YXRlOgogICAgIExheW91dFVuaXQgbV9jb250ZW50SGVpZ2h0OwogCiAgICAgRWRn ZXMgbV9tYXJnaW47Ci0jaWZuZGVmIE5ERUJVRwotICAgIFZlcnRpY2FsRWRnZXMgbV9ub25Db2xs YXBzZWRWZXJ0aXZhbE1hcmdpbjsKLSNlbmRpZgorICAgIFZlcnRpY2FsRWRnZXMgbV92ZXJ0aWNh bE5vbkNvbGxhcHNlZE1hcmdpbjsKKwogICAgIEVkZ2VzIG1fYm9yZGVyOwogICAgIEVkZ2VzIG1f cGFkZGluZzsKIAogI2lmICFBU1NFUlRfRElTQUJMRUQKICAgICBib29sIG1faGFzVmFsaWRIb3Jp em9udGFsTWFyZ2luIHsgZmFsc2UgfTsKICAgICBib29sIG1faGFzVmFsaWRWZXJ0aWNhbE1hcmdp biB7IGZhbHNlIH07CisgICAgYm9vbCBtX2hhc1ZhbGlkVmVydGljYWxOb25Db2xsYXBzZWRNYXJn aW4geyBmYWxzZSB9OwogICAgIGJvb2wgbV9oYXNWYWxpZEJvcmRlciB7IGZhbHNlIH07CiAgICAg Ym9vbCBtX2hhc1ZhbGlkUGFkZGluZyB7IGZhbHNlIH07CiAgICAgYm9vbCBtX2hhc1ZhbGlkQ29u dGVudEhlaWdodCB7IGZhbHNlIH07CkBAIC00NjYsNiArNDY4LDE0IEBAIGlubGluZSB2b2lkIEJv eDo6c2V0VmVydGljYWxNYXJnaW4oVmVydGljYWxFZGdlcyBtYXJnaW4pCiAgICAgbV9tYXJnaW4u dmVydGljYWwgPSBtYXJnaW47CiB9CiAKK2lubGluZSB2b2lkIEJveDo6c2V0VmVydGljYWxOb25D b2xsYXBzZWRNYXJnaW4oVmVydGljYWxFZGdlcyBtYXJnaW4pCit7CisjaWYgIUFTU0VSVF9ESVNB QkxFRAorICAgIHNldEhhc1ZhbGlkVmVydGljYWxOb25Db2xsYXBzZWRNYXJnaW4oKTsKKyNlbmRp ZgorICAgIG1fdmVydGljYWxOb25Db2xsYXBzZWRNYXJnaW4gPSBtYXJnaW47Cit9CisKIGlubGlu ZSB2b2lkIEJveDo6c2V0Qm9yZGVyKEVkZ2VzIGJvcmRlcikKIHsKICNpZiAhQVNTRVJUX0RJU0FC TEVECkBAIC01MDYsNiArNTE2LDE4IEBAIGlubGluZSBMYXlvdXRVbml0IEJveDo6bWFyZ2luUmln aHQoKSBjb25zdAogICAgIHJldHVybiBtX21hcmdpbi5ob3Jpem9udGFsLnJpZ2h0OwogfQogCitp bmxpbmUgTGF5b3V0VW5pdCBCb3g6Om5vbkNvbGxhcHNlZE1hcmdpblRvcCgpIGNvbnN0Cit7Cisg ICAgQVNTRVJUKG1faGFzVmFsaWRWZXJ0aWNhbE5vbkNvbGxhcHNlZE1hcmdpbik7CisgICAgcmV0 dXJuIG1fdmVydGljYWxOb25Db2xsYXBzZWRNYXJnaW4udG9wOworfQorCitpbmxpbmUgTGF5b3V0 VW5pdCBCb3g6Om5vbkNvbGxhcHNlZE1hcmdpbkJvdHRvbSgpIGNvbnN0Cit7CisgICAgQVNTRVJU KG1faGFzVmFsaWRWZXJ0aWNhbE5vbkNvbGxhcHNlZE1hcmdpbik7CisgICAgcmV0dXJuIG1fdmVy dGljYWxOb25Db2xsYXBzZWRNYXJnaW4uYm90dG9tOworfQorCiBpbmxpbmUgTGF5b3V0VW5pdCBC b3g6OnBhZGRpbmdUb3AoKSBjb25zdAogewogICAgIEFTU0VSVChtX2hhc1ZhbGlkUGFkZGluZyk7 Cg==