198878 2019-06-15 00:01:27 -0700 [LFC] Convert both the absolutely and statically positioned out-of-flow block level boxes positions relative to the containing block's padding box 2019-06-15 07:05:52 -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 1544964 0 zalan 2019-06-15 00:01:27 -0700 ssia. 1544965 1 webkit-bug-importer 2019-06-15 00:03:58 -0700 <rdar://problem/51772882> 1544966 2 372178 zalan 2019-06-15 00:07:08 -0700 Created attachment 372178 Patch 1545012 3 372178 commit-queue 2019-06-15 07:05:50 -0700 Comment on attachment 372178 Patch Clearing flags on attachment: 372178 Committed r246458: <https://trac.webkit.org/changeset/246458> 1545013 4 commit-queue 2019-06-15 07:05:52 -0700 All reviewed patches have been landed. Closing bug. 372178 2019-06-15 00:07:08 -0700 2019-06-15 07:05:50 -0700 Patch bug-198878-20190615000705.patch text/plain 12337 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ2NDU2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2IxN2NhMDhlZWE4YTY5 MjEyMDM4M2RlNzlmZDM3NTNhOTc0Mzg3YS4uM2I3Y2MwMmIzNTk5ODkxZmRlZjY3NDk4OTNlN2Mw ODk4N2ZmMWE0ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE5LTA2LTE1ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ10gQ29udmVydCBib3Ro IHRoZSBhYnNvbHV0ZWx5IGFuZCBzdGF0aWNhbGx5IHBvc2l0aW9uZWQgb3V0LW9mLWZsb3cgYmxv Y2sgbGV2ZWwgYm94ZXMgcG9zaXRpb25zIHJlbGF0aXZlIHRvIHRoZSBjb250YWluaW5nIGJsb2Nr J3MgcGFkZGluZyBib3gKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTE5ODg3OAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNTE3NzI4ODI+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBwYXRjaCBlbnN1 cmVzIHRoYXQgd2hpbGUgd2UgY29tcHV0ZSB0aGUgdmVydGljYWwvaG9yaXpvbnRhbCBnZW9tZXRy eSBmb3IgYW4gb3V0LW9mLWZsb3cgYmxvY2sgbGV2ZWwgYm94LAorICAgICAgICB0aGUgc3RhdGlj IGFuZCB0aGUgYWJzb2x1dGUgcG9zaXRpb25lZCB2YWx1ZXMgYXJlIGluIHRoZSBzYW1lIGNvb3Jk aW5hdGUgc3lzdGVtIChyZWxhdGl2ZSB0byB0aGUgY29udGFpbmluZyBibG9jaydzIHBhZGRpbmcg Ym94KS4KKworICAgICAgICAqIGxheW91dC9Gb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6c3RhdGljVmVydGljYWxQb3NpdGlvbkZvck91dE9m Rmxvd1Bvc2l0aW9uZWQpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpzdGF0aWNIb3Jpem9u dGFsUG9zaXRpb25Gb3JPdXRPZkZsb3dQb3NpdGlvbmVkKToKKyAgICAgICAgKFdlYkNvcmU6Okxh eW91dDo6Rm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjpvdXRPZkZsb3dOb25SZXBsYWNlZFZl cnRpY2FsR2VvbWV0cnkpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpGb3JtYXR0aW5nQ29u dGV4dDo6R2VvbWV0cnk6Om91dE9mRmxvd05vblJlcGxhY2VkSG9yaXpvbnRhbEdlb21ldHJ5KToK KyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6Rm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5Ojpv dXRPZkZsb3dSZXBsYWNlZFZlcnRpY2FsR2VvbWV0cnkpOgorICAgICAgICAoV2ViQ29yZTo6TGF5 b3V0OjpGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6Om91dE9mRmxvd1JlcGxhY2VkSG9yaXpv bnRhbEdlb21ldHJ5KToKKwogMjAxOS0wNi0xNCAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUu Y29tPgogCiAgICAgICAgIFtMRkNdW0lGQ10gQWRkIHN1cHBvcnQgZm9yIHZlcnRpY2FsLWFsaWdu OiB0b3AgYW5kIGJvdHRvbQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1h dHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRp bmdDb250ZXh0R2VvbWV0cnkuY3BwCmluZGV4IGI4MTc5NmE0OGVkZTFkNTIzYzFiMDNhNjJhODgx NWJkNWJhZWExOTguLmZmYzUzNTRhNDYzMThiNzg2ZDViYjFlNjgyODA1YTMwNzk2OGM3NWQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5 LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRy eS5jcHAKQEAgLTIwMSwxNSArMjAxLDE3IEBAIHN0YXRpYyBMYXlvdXRVbml0IHN0YXRpY1ZlcnRp Y2FsUG9zaXRpb25Gb3JPdXRPZkZsb3dQb3NpdGlvbmVkKGNvbnN0IExheW91dFN0YXRlCiAgICAg fQogCiAgICAgLy8gUmVzb2x2ZSB0b3AgYWxsIHRoZSB3YXkgdXAgdG8gdGhlIGNvbnRhaW5pbmcg YmxvY2suCi0gICAgYXV0byogY29udGFpbmluZ0Jsb2NrID0gbGF5b3V0Qm94LmNvbnRhaW5pbmdC bG9jaygpOworICAgIGF1dG8mIGNvbnRhaW5pbmdCbG9jayA9ICpsYXlvdXRCb3guY29udGFpbmlu Z0Jsb2NrKCk7CiAgICAgLy8gU3RhcnQgd2l0aCB0aGUgcGFyZW50IHNpbmNlIHdlIHByZXRlbmQg dGhhdCB0aGlzIGJveCBpcyBub3JtYWwgZmxvdy4KLSAgICBmb3IgKGF1dG8qIGNvbnRhaW5lciA9 IGxheW91dEJveC5wYXJlbnQoKTsgY29udGFpbmVyICE9IGNvbnRhaW5pbmdCbG9jazsgY29udGFp bmVyID0gY29udGFpbmVyLT5jb250YWluaW5nQmxvY2soKSkgeworICAgIGZvciAoYXV0byogY29u dGFpbmVyID0gbGF5b3V0Qm94LnBhcmVudCgpOyBjb250YWluZXIgIT0gJmNvbnRhaW5pbmdCbG9j azsgY29udGFpbmVyID0gY29udGFpbmVyLT5jb250YWluaW5nQmxvY2soKSkgewogICAgICAgICBh dXRvJiBkaXNwbGF5Qm94ID0gbGF5b3V0U3RhdGUuZGlzcGxheUJveEZvckxheW91dEJveCgqY29u dGFpbmVyKTsKICAgICAgICAgLy8gRGlzcGxheTo6Qm94Ojp0b3AgaXMgdGhlIGJvcmRlciBib3gg dG9wIHBvc2l0aW9uIGluIGl0cyBjb250YWluaW5nIGJsb2NrJ3MgY29vcmRpbmF0ZSBzeXN0ZW0u CiAgICAgICAgIHRvcCArPSBkaXNwbGF5Qm94LnRvcCgpOwogICAgICAgICBBU1NFUlQoIWNvbnRh aW5lci0+aXNQb3NpdGlvbmVkKCkgfHwgbGF5b3V0Qm94LmlzRml4ZWRQb3NpdGlvbmVkKCkpOwog ICAgIH0KLSAgICByZXR1cm4gdG9wOworICAgIC8vIE1vdmUgdGhlIHN0YXRpYyBwb3NpdGlvbiBy ZWxhdGl2ZSB0byB0aGUgcGFkZGluZyBib3guIFRoaXMgaXMgdmVyeSBzcGVjaWZpYyB0byBhYm9s dXRlbHkgcG9zaXRpb25lZCBib3hlcy4KKyAgICBhdXRvIHBhZGRpbmdCb3hUb3AgPSBsYXlvdXRT dGF0ZS5kaXNwbGF5Qm94Rm9yTGF5b3V0Qm94KGNvbnRhaW5pbmdCbG9jaykucGFkZGluZ0JveFRv cCgpOworICAgIHJldHVybiB0b3AgLSBwYWRkaW5nQm94VG9wOwogfQogCiBzdGF0aWMgTGF5b3V0 VW5pdCBzdGF0aWNIb3Jpem9udGFsUG9zaXRpb25Gb3JPdXRPZkZsb3dQb3NpdGlvbmVkKGNvbnN0 IExheW91dFN0YXRlJiBsYXlvdXRTdGF0ZSwgY29uc3QgQm94JiBsYXlvdXRCb3gpCkBAIC0yMjIs MTUgKzIyNCwxNyBAQCBzdGF0aWMgTGF5b3V0VW5pdCBzdGF0aWNIb3Jpem9udGFsUG9zaXRpb25G b3JPdXRPZkZsb3dQb3NpdGlvbmVkKGNvbnN0IExheW91dFN0YQogICAgIGF1dG8gbGVmdCA9IGxh eW91dFN0YXRlLmRpc3BsYXlCb3hGb3JMYXlvdXRCb3goKmxheW91dEJveC5wYXJlbnQoKSkuY29u dGVudEJveExlZnQoKTsKIAogICAgIC8vIFJlc29sdmUgbGVmdCBhbGwgdGhlIHdheSB1cCB0byB0 aGUgY29udGFpbmluZyBibG9jay4KLSAgICBhdXRvKiBjb250YWluaW5nQmxvY2sgPSBsYXlvdXRC b3guY29udGFpbmluZ0Jsb2NrKCk7CisgICAgYXV0byYgY29udGFpbmluZ0Jsb2NrID0gKmxheW91 dEJveC5jb250YWluaW5nQmxvY2soKTsKICAgICAvLyBTdGFydCB3aXRoIHRoZSBwYXJlbnQgc2lu Y2Ugd2UgcHJldGVuZCB0aGF0IHRoaXMgYm94IGlzIG5vcm1hbCBmbG93LgotICAgIGZvciAoYXV0 byogY29udGFpbmVyID0gbGF5b3V0Qm94LnBhcmVudCgpOyBjb250YWluZXIgIT0gY29udGFpbmlu Z0Jsb2NrOyBjb250YWluZXIgPSBjb250YWluZXItPmNvbnRhaW5pbmdCbG9jaygpKSB7CisgICAg Zm9yIChhdXRvKiBjb250YWluZXIgPSBsYXlvdXRCb3gucGFyZW50KCk7IGNvbnRhaW5lciAhPSAm Y29udGFpbmluZ0Jsb2NrOyBjb250YWluZXIgPSBjb250YWluZXItPmNvbnRhaW5pbmdCbG9jaygp KSB7CiAgICAgICAgIGF1dG8mIGRpc3BsYXlCb3ggPSBsYXlvdXRTdGF0ZS5kaXNwbGF5Qm94Rm9y TGF5b3V0Qm94KCpjb250YWluZXIpOwogICAgICAgICAvLyBEaXNwbGF5OjpCb3g6OmxlZnQgaXMg dGhlIGJvcmRlciBib3ggbGVmdCBwb3NpdGlvbiBpbiBpdHMgY29udGFpbmluZyBibG9jaydzIGNv b3JkaW5hdGUgc3lzdGVtLgogICAgICAgICBsZWZ0ICs9IGRpc3BsYXlCb3gubGVmdCgpOwogICAg ICAgICBBU1NFUlQoIWNvbnRhaW5lci0+aXNQb3NpdGlvbmVkKCkgfHwgbGF5b3V0Qm94LmlzRml4 ZWRQb3NpdGlvbmVkKCkpOwogICAgIH0KLSAgICByZXR1cm4gbGVmdDsKKyAgICAvLyBNb3ZlIHRo ZSBzdGF0aWMgcG9zaXRpb24gcmVsYXRpdmUgdG8gdGhlIHBhZGRpbmcgYm94LiBUaGlzIGlzIHZl cnkgc3BlY2lmaWMgdG8gYWJvbHV0ZWx5IHBvc2l0aW9uZWQgYm94ZXMuCisgICAgYXV0byBwYWRk aW5nQm94TGVmdCA9IGxheW91dFN0YXRlLmRpc3BsYXlCb3hGb3JMYXlvdXRCb3goY29udGFpbmlu Z0Jsb2NrKS5wYWRkaW5nQm94VG9wKCk7CisgICAgcmV0dXJuIGxlZnQgLSBwYWRkaW5nQm94TGVm dDsKIH0KIAogTGF5b3V0VW5pdCBGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OnNocmlua1Rv Rml0V2lkdGgoTGF5b3V0U3RhdGUmIGxheW91dFN0YXRlLCBjb25zdCBCb3gmIGZvcm1hdHRpbmdS b290LCBVc2VkSG9yaXpvbnRhbFZhbHVlcyB1c2VkVmFsdWVzKQpAQCAtMjkyLDcgKzI5Niw2IEBA IFZlcnRpY2FsR2VvbWV0cnkgRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjpvdXRPZkZsb3dO b25SZXBsYWNlZFZlcnRpY2FsR2VvbWV0CiAKICAgICBhdXRvIHRvcCA9IGNvbXB1dGVkVmFsdWVJ Zk5vdEF1dG8oc3R5bGUubG9naWNhbFRvcCgpLCBjb250YWluaW5nQmxvY2tXaWR0aCk7CiAgICAg YXV0byBib3R0b20gPSBjb21wdXRlZFZhbHVlSWZOb3RBdXRvKHN0eWxlLmxvZ2ljYWxCb3R0b20o KSwgY29udGFpbmluZ0Jsb2NrV2lkdGgpOwotICAgIGF1dG8gaXNTdGF0aWNhbGx5UG9zaXRpb25l ZCA9ICF0b3AgJiYgIWJvdHRvbTsKICAgICBhdXRvIGhlaWdodCA9IHVzZWRWYWx1ZXMuaGVpZ2h0 ID8gdXNlZFZhbHVlcy5oZWlnaHQudmFsdWUoKSA6IGNvbXB1dGVkSGVpZ2h0VmFsdWUobGF5b3V0 U3RhdGUsIGxheW91dEJveCwgSGVpZ2h0VHlwZTo6Tm9ybWFsKTsKICAgICBhdXRvIGNvbXB1dGVk VmVydGljYWxNYXJnaW4gPSBHZW9tZXRyeTo6Y29tcHV0ZWRWZXJ0aWNhbE1hcmdpbihsYXlvdXRC b3gsIFVzZWRIb3Jpem9udGFsVmFsdWVzIHsgY29udGFpbmluZ0Jsb2NrV2lkdGggfSk7CiAgICAg VXNlZFZlcnRpY2FsTWFyZ2luOjpOb25Db2xsYXBzZWRWYWx1ZXMgdXNlZFZlcnRpY2FsTWFyZ2lu OyAKQEAgLTM3MCwxMiArMzczLDEwIEBAIFZlcnRpY2FsR2VvbWV0cnkgRm9ybWF0dGluZ0NvbnRl eHQ6Okdlb21ldHJ5OjpvdXRPZkZsb3dOb25SZXBsYWNlZFZlcnRpY2FsR2VvbWV0CiAgICAgQVNT RVJUKGhlaWdodCk7CiAKICAgICAvLyBGb3Igb3V0LW9mLWZsb3cgZWxlbWVudHMgdGhlIGNvbnRh aW5pbmcgYmxvY2sgaXMgZm9ybWVkIGJ5IHRoZSBwYWRkaW5nIGVkZ2Ugb2YgdGhlIGFuY2VzdG9y LgotICAgIC8vIEF0IHRoaXMgcG9pbnQgdGhlIG5vbi1zdGF0aWNhbGx5IHBvc2l0aW9uZWQgdmFs dWUgaXMgaW4gdGhlIGNvb3JkaW5hdGUgc3lzdGVtIG9mIHRoZSBwYWRkaW5nIGJveC4gTGV0J3Mg Y29udmVydCBpdCB0byBib3JkZXIgYm94IGNvb3JkaW5hdGUgc3lzdGVtLgotICAgIGlmICghaXNT dGF0aWNhbGx5UG9zaXRpb25lZCkgewotICAgICAgICBhdXRvIGNvbnRhaW5pbmdCbG9ja1BhZGRp bmdWZXJ0aWNhbEVkZ2UgPSBjb250YWluaW5nQmxvY2tEaXNwbGF5Qm94LnBhZGRpbmdCb3hUb3Ao KTsKLSAgICAgICAgKnRvcCArPSBjb250YWluaW5nQmxvY2tQYWRkaW5nVmVydGljYWxFZGdlOwot ICAgICAgICAqYm90dG9tICs9IGNvbnRhaW5pbmdCbG9ja1BhZGRpbmdWZXJ0aWNhbEVkZ2U7Ci0g ICAgfQorICAgIC8vIEF0IHRoaXMgcG9pbnQgdGhlIHBvc2l0aW9uZWQgdmFsdWUgaXMgaW4gdGhl IGNvb3JkaW5hdGUgc3lzdGVtIG9mIHRoZSBwYWRkaW5nIGJveC4gTGV0J3MgY29udmVydCBpdCB0 byBib3JkZXIgYm94IGNvb3JkaW5hdGUgc3lzdGVtLgorICAgIGF1dG8gY29udGFpbmluZ0Jsb2Nr UGFkZGluZ1ZlcnRpY2FsRWRnZSA9IGNvbnRhaW5pbmdCbG9ja0Rpc3BsYXlCb3gucGFkZGluZ0Jv eFRvcCgpOworICAgICp0b3AgKz0gY29udGFpbmluZ0Jsb2NrUGFkZGluZ1ZlcnRpY2FsRWRnZTsK KyAgICAqYm90dG9tICs9IGNvbnRhaW5pbmdCbG9ja1BhZGRpbmdWZXJ0aWNhbEVkZ2U7CiAKICAg ICBMT0dfV0lUSF9TVFJFQU0oRm9ybWF0dGluZ0NvbnRleHRMYXlvdXQsIHN0cmVhbSA8PCAiW1Bv c2l0aW9uXVtIZWlnaHRdW01hcmdpbl0gLT4gb3V0LW9mLWZsb3cgbm9uLXJlcGxhY2VkIC0+IHRv cCgiIDw8ICp0b3AgPDwgInB4KSBib3R0b20oIiAgPDwgKmJvdHRvbSA8PCAicHgpIGhlaWdodCgi IDw8ICpoZWlnaHQgPDwgInB4KSBtYXJnaW4oIiA8PCB1c2VkVmVydGljYWxNYXJnaW4uYmVmb3Jl IDw8ICJweCwgIiAgPDwgdXNlZFZlcnRpY2FsTWFyZ2luLmFmdGVyIDw8ICJweCkgbGF5b3V0Qm94 KCIgPDwgJmxheW91dEJveCA8PCAiKSIpOwogICAgIHJldHVybiB7ICp0b3AsICpib3R0b20sIHsg Y29udGVudEhlaWdodCgpLCB1c2VkVmVydGljYWxNYXJnaW4gfSB9OwpAQCAtNDIwLDcgKzQyMSw2 IEBAIEhvcml6b250YWxHZW9tZXRyeSBGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6Om91dE9m Rmxvd05vblJlcGxhY2VkSG9yaXpvbnRhbEdlCiAgICAgCiAgICAgYXV0byBsZWZ0ID0gY29tcHV0 ZWRWYWx1ZUlmTm90QXV0byhzdHlsZS5sb2dpY2FsTGVmdCgpLCBjb250YWluaW5nQmxvY2tXaWR0 aCk7CiAgICAgYXV0byByaWdodCA9IGNvbXB1dGVkVmFsdWVJZk5vdEF1dG8oc3R5bGUubG9naWNh bFJpZ2h0KCksIGNvbnRhaW5pbmdCbG9ja1dpZHRoKTsKLSAgICBhdXRvIGlzU3RhdGljYWxseVBv c2l0aW9uZWQgPSAhbGVmdCAmJiAhcmlnaHQ7CiAgICAgYXV0byB3aWR0aCA9IGNvbXB1dGVkVmFs dWVJZk5vdEF1dG8odXNlZFZhbHVlcy53aWR0aCA/IExlbmd0aCB7IHVzZWRWYWx1ZXMud2lkdGgu dmFsdWUoKSwgRml4ZWQgfSA6IHN0eWxlLmxvZ2ljYWxXaWR0aCgpLCBjb250YWluaW5nQmxvY2tX aWR0aCk7CiAgICAgYXV0byBjb21wdXRlZEhvcml6b250YWxNYXJnaW4gPSBHZW9tZXRyeTo6Y29t cHV0ZWRIb3Jpem9udGFsTWFyZ2luKGxheW91dEJveCwgdXNlZFZhbHVlcyk7CiAgICAgVXNlZEhv cml6b250YWxNYXJnaW4gdXNlZEhvcml6b250YWxNYXJnaW47CkBAIC01MjQsMTIgKzUyNCwxMCBA QCBIb3Jpem9udGFsR2VvbWV0cnkgRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjpvdXRPZkZs b3dOb25SZXBsYWNlZEhvcml6b250YWxHZQogICAgIEFTU0VSVCh3aWR0aCk7CiAKICAgICAvLyBG b3Igb3V0LW9mLWZsb3cgZWxlbWVudHMgdGhlIGNvbnRhaW5pbmcgYmxvY2sgaXMgZm9ybWVkIGJ5 IHRoZSBwYWRkaW5nIGVkZ2Ugb2YgdGhlIGFuY2VzdG9yLgotICAgIC8vIEF0IHRoaXMgcG9pbnQg dGhlIG5vbi1zdGF0aWNhbGx5IHBvc2l0aW9uZWQgdmFsdWUgaXMgaW4gdGhlIGNvb3JkaW5hdGUg c3lzdGVtIG9mIHRoZSBwYWRkaW5nIGJveC4gTGV0J3MgY29udmVydCBpdCB0byBib3JkZXIgYm94 IGNvb3JkaW5hdGUgc3lzdGVtLgotICAgIGlmICghaXNTdGF0aWNhbGx5UG9zaXRpb25lZCkgewot ICAgICAgICBhdXRvIGNvbnRhaW5pbmdCbG9ja1BhZGRpbmdWZXJ0aWNhbEVkZ2UgPSBjb250YWlu aW5nQmxvY2tEaXNwbGF5Qm94LnBhZGRpbmdCb3hMZWZ0KCk7Ci0gICAgICAgICpsZWZ0ICs9IGNv bnRhaW5pbmdCbG9ja1BhZGRpbmdWZXJ0aWNhbEVkZ2U7Ci0gICAgICAgICpyaWdodCArPSBjb250 YWluaW5nQmxvY2tQYWRkaW5nVmVydGljYWxFZGdlOwotICAgIH0KKyAgICAvLyBBdCB0aGlzIHBv aW50IHRoZSBwb3NpdGlvbmVkIHZhbHVlIGlzIGluIHRoZSBjb29yZGluYXRlIHN5c3RlbSBvZiB0 aGUgcGFkZGluZyBib3guIExldCdzIGNvbnZlcnQgaXQgdG8gYm9yZGVyIGJveCBjb29yZGluYXRl IHN5c3RlbS4KKyAgICBhdXRvIGNvbnRhaW5pbmdCbG9ja1BhZGRpbmdWZXJ0aWNhbEVkZ2UgPSBj b250YWluaW5nQmxvY2tEaXNwbGF5Qm94LnBhZGRpbmdCb3hMZWZ0KCk7CisgICAgKmxlZnQgKz0g Y29udGFpbmluZ0Jsb2NrUGFkZGluZ1ZlcnRpY2FsRWRnZTsKKyAgICAqcmlnaHQgKz0gY29udGFp bmluZ0Jsb2NrUGFkZGluZ1ZlcnRpY2FsRWRnZTsKIAogICAgIExPR19XSVRIX1NUUkVBTShGb3Jt YXR0aW5nQ29udGV4dExheW91dCwgc3RyZWFtIDw8ICJbUG9zaXRpb25dW1dpZHRoXVtNYXJnaW5d IC0+IG91dC1vZi1mbG93IG5vbi1yZXBsYWNlZCAtPiBsZWZ0KCIgPDwgKmxlZnQgPDwgInB4KSBy aWdodCgiICA8PCAqcmlnaHQgPDwgInB4KSB3aWR0aCgiIDw8ICp3aWR0aCA8PCAicHgpIG1hcmdp bigiIDw8IHVzZWRIb3Jpem9udGFsTWFyZ2luLnN0YXJ0IDw8ICJweCwgIiAgPDwgdXNlZEhvcml6 b250YWxNYXJnaW4uZW5kIDw8ICJweCkgbGF5b3V0Qm94KCIgPDwgJmxheW91dEJveCA8PCAiKSIp OwogICAgIHJldHVybiB7ICpsZWZ0LCAqcmlnaHQsIHsgY29udGVudFdpZHRoKCksIHVzZWRIb3Jp em9udGFsTWFyZ2luLCBjb21wdXRlZEhvcml6b250YWxNYXJnaW4gfSB9OwpAQCAtNTU3LDcgKzU1 NSw2IEBAIFZlcnRpY2FsR2VvbWV0cnkgRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjpvdXRP ZkZsb3dSZXBsYWNlZFZlcnRpY2FsR2VvbWV0cnkoCiAKICAgICBhdXRvIHRvcCA9IGNvbXB1dGVk VmFsdWVJZk5vdEF1dG8oc3R5bGUubG9naWNhbFRvcCgpLCBjb250YWluaW5nQmxvY2tXaWR0aCk7 CiAgICAgYXV0byBib3R0b20gPSBjb21wdXRlZFZhbHVlSWZOb3RBdXRvKHN0eWxlLmxvZ2ljYWxC b3R0b20oKSwgY29udGFpbmluZ0Jsb2NrV2lkdGgpOwotICAgIGF1dG8gaXNTdGF0aWNhbGx5UG9z aXRpb25lZCA9ICF0b3AgJiYgIWJvdHRvbTsKICAgICBhdXRvIGhlaWdodCA9IGlubGluZVJlcGxh Y2VkSGVpZ2h0QW5kTWFyZ2luKGxheW91dFN0YXRlLCBsYXlvdXRCb3gsIHVzZWRWYWx1ZXMpLmhl aWdodDsKICAgICBhdXRvIGNvbXB1dGVkVmVydGljYWxNYXJnaW4gPSBHZW9tZXRyeTo6Y29tcHV0 ZWRWZXJ0aWNhbE1hcmdpbihsYXlvdXRCb3gsIFVzZWRIb3Jpem9udGFsVmFsdWVzIHsgY29udGFp bmluZ0Jsb2NrV2lkdGggfSk7CiAgICAgT3B0aW9uYWw8TGF5b3V0VW5pdD4gdXNlZE1hcmdpbkJl Zm9yZSA9IGNvbXB1dGVkVmVydGljYWxNYXJnaW4uYmVmb3JlOwpAQCAtNjA0LDEyICs2MDEsMTAg QEAgVmVydGljYWxHZW9tZXRyeSBGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6Om91dE9mRmxv d1JlcGxhY2VkVmVydGljYWxHZW9tZXRyeSgKICAgICAgICAgYm90dG9tID0gY29udGFpbmluZ0Js b2NrSGVpZ2h0IC0gKCp0b3AgKyAqdXNlZE1hcmdpbkJlZm9yZSArIGJvcmRlclRvcCArIHBhZGRp bmdUb3AgKyBoZWlnaHQgKyBwYWRkaW5nQm90dG9tICsgYm9yZGVyQm90dG9tICsgKnVzZWRNYXJn aW5BZnRlcik7IAogCiAgICAgLy8gRm9yIG91dC1vZi1mbG93IGVsZW1lbnRzIHRoZSBjb250YWlu aW5nIGJsb2NrIGlzIGZvcm1lZCBieSB0aGUgcGFkZGluZyBlZGdlIG9mIHRoZSBhbmNlc3Rvci4K LSAgICAvLyBBdCB0aGlzIHBvaW50IHRoZSBub24tc3RhdGljYWxseSBwb3NpdGlvbmVkIHZhbHVl IGlzIGluIHRoZSBjb29yZGluYXRlIHN5c3RlbSBvZiB0aGUgcGFkZGluZyBib3guIExldCdzIGNv bnZlcnQgaXQgdG8gYm9yZGVyIGJveCBjb29yZGluYXRlIHN5c3RlbS4KLSAgICBpZiAoIWlzU3Rh dGljYWxseVBvc2l0aW9uZWQpIHsKLSAgICAgICAgYXV0byBjb250YWluaW5nQmxvY2tQYWRkaW5n VmVydGljYWxFZGdlID0gY29udGFpbmluZ0Jsb2NrRGlzcGxheUJveC5wYWRkaW5nQm94VG9wKCk7 Ci0gICAgICAgICp0b3AgKz0gY29udGFpbmluZ0Jsb2NrUGFkZGluZ1ZlcnRpY2FsRWRnZTsKLSAg ICAgICAgKmJvdHRvbSArPSBjb250YWluaW5nQmxvY2tQYWRkaW5nVmVydGljYWxFZGdlOwotICAg IH0KKyAgICAvLyBBdCB0aGlzIHBvaW50IHRoZSBwb3NpdGlvbmVkIHZhbHVlIGlzIGluIHRoZSBj b29yZGluYXRlIHN5c3RlbSBvZiB0aGUgcGFkZGluZyBib3guIExldCdzIGNvbnZlcnQgaXQgdG8g Ym9yZGVyIGJveCBjb29yZGluYXRlIHN5c3RlbS4KKyAgICBhdXRvIGNvbnRhaW5pbmdCbG9ja1Bh ZGRpbmdWZXJ0aWNhbEVkZ2UgPSBjb250YWluaW5nQmxvY2tEaXNwbGF5Qm94LnBhZGRpbmdCb3hU b3AoKTsKKyAgICAqdG9wICs9IGNvbnRhaW5pbmdCbG9ja1BhZGRpbmdWZXJ0aWNhbEVkZ2U7Cisg ICAgKmJvdHRvbSArPSBjb250YWluaW5nQmxvY2tQYWRkaW5nVmVydGljYWxFZGdlOwogCiAgICAg QVNTRVJUKHRvcCk7CiAgICAgQVNTRVJUKGJvdHRvbSk7CkBAIC02NDUsNyArNjQwLDYgQEAgSG9y aXpvbnRhbEdlb21ldHJ5IEZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6b3V0T2ZGbG93UmVw bGFjZWRIb3Jpem9udGFsR2VvbWUKIAogICAgIGF1dG8gbGVmdCA9IGNvbXB1dGVkVmFsdWVJZk5v dEF1dG8oc3R5bGUubG9naWNhbExlZnQoKSwgY29udGFpbmluZ0Jsb2NrV2lkdGgpOwogICAgIGF1 dG8gcmlnaHQgPSBjb21wdXRlZFZhbHVlSWZOb3RBdXRvKHN0eWxlLmxvZ2ljYWxSaWdodCgpLCBj b250YWluaW5nQmxvY2tXaWR0aCk7Ci0gICAgYXV0byBpc1N0YXRpY2FsbHlQb3NpdGlvbmVkID0g IWxlZnQgJiYgIXJpZ2h0OwogICAgIGF1dG8gY29tcHV0ZWRIb3Jpem9udGFsTWFyZ2luID0gR2Vv bWV0cnk6OmNvbXB1dGVkSG9yaXpvbnRhbE1hcmdpbihsYXlvdXRCb3gsIHVzZWRWYWx1ZXMpOwog ICAgIE9wdGlvbmFsPExheW91dFVuaXQ+IHVzZWRNYXJnaW5TdGFydCA9IGNvbXB1dGVkSG9yaXpv bnRhbE1hcmdpbi5zdGFydDsKICAgICBPcHRpb25hbDxMYXlvdXRVbml0PiB1c2VkTWFyZ2luRW5k ID0gY29tcHV0ZWRIb3Jpem9udGFsTWFyZ2luLmVuZDsKQEAgLTcxNSwxMiArNzA5LDEwIEBAIEhv cml6b250YWxHZW9tZXRyeSBGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6Om91dE9mRmxvd1Jl cGxhY2VkSG9yaXpvbnRhbEdlb21lCiAgICAgQVNTRVJUKHVzZWRNYXJnaW5FbmQpOwogCiAgICAg Ly8gRm9yIG91dC1vZi1mbG93IGVsZW1lbnRzIHRoZSBjb250YWluaW5nIGJsb2NrIGlzIGZvcm1l ZCBieSB0aGUgcGFkZGluZyBlZGdlIG9mIHRoZSBhbmNlc3Rvci4KLSAgICAvLyBBdCB0aGlzIHBv aW50IHRoZSBub24tc3RhdGljYWxseSBwb3NpdGlvbmVkIHZhbHVlIGlzIGluIHRoZSBjb29yZGlu YXRlIHN5c3RlbSBvZiB0aGUgcGFkZGluZyBib3guIExldCdzIGNvbnZlcnQgaXQgdG8gYm9yZGVy IGJveCBjb29yZGluYXRlIHN5c3RlbS4KLSAgICBpZiAoIWlzU3RhdGljYWxseVBvc2l0aW9uZWQp IHsKLSAgICAgICAgYXV0byBjb250YWluaW5nQmxvY2tQYWRkaW5nVmVydGljYWxFZGdlID0gbGF5 b3V0U3RhdGUuZGlzcGxheUJveEZvckxheW91dEJveChjb250YWluaW5nQmxvY2spLnBhZGRpbmdC b3hMZWZ0KCk7Ci0gICAgICAgICpsZWZ0ICs9IGNvbnRhaW5pbmdCbG9ja1BhZGRpbmdWZXJ0aWNh bEVkZ2U7Ci0gICAgICAgICpyaWdodCArPSBjb250YWluaW5nQmxvY2tQYWRkaW5nVmVydGljYWxF ZGdlOwotICAgIH0KKyAgICAvLyBBdCB0aGlzIHBvaW50IHRoZSBwb3NpdGlvbmVkIHZhbHVlIGlz IGluIHRoZSBjb29yZGluYXRlIHN5c3RlbSBvZiB0aGUgcGFkZGluZyBib3guIExldCdzIGNvbnZl cnQgaXQgdG8gYm9yZGVyIGJveCBjb29yZGluYXRlIHN5c3RlbS4KKyAgICBhdXRvIGNvbnRhaW5p bmdCbG9ja1BhZGRpbmdWZXJ0aWNhbEVkZ2UgPSBsYXlvdXRTdGF0ZS5kaXNwbGF5Qm94Rm9yTGF5 b3V0Qm94KGNvbnRhaW5pbmdCbG9jaykucGFkZGluZ0JveExlZnQoKTsKKyAgICAqbGVmdCArPSBj b250YWluaW5nQmxvY2tQYWRkaW5nVmVydGljYWxFZGdlOworICAgICpyaWdodCArPSBjb250YWlu aW5nQmxvY2tQYWRkaW5nVmVydGljYWxFZGdlOwogCiAgICAgTE9HX1dJVEhfU1RSRUFNKEZvcm1h dHRpbmdDb250ZXh0TGF5b3V0LCBzdHJlYW0gPDwgIltQb3NpdGlvbl1bV2lkdGhdW01hcmdpbl0g LT4gb3V0LW9mLWZsb3cgcmVwbGFjZWQgLT4gbGVmdCgiIDw8ICpsZWZ0IDw8ICJweCkgcmlnaHQo IiAgPDwgKnJpZ2h0IDw8ICJweCkgd2lkdGgoIiA8PCB3aWR0aCA8PCAicHgpIG1hcmdpbigiIDw8 ICp1c2VkTWFyZ2luU3RhcnQgPDwgInB4LCAiICA8PCAqdXNlZE1hcmdpbkVuZCA8PCAicHgpIGxh eW91dEJveCgiIDw8ICZsYXlvdXRCb3ggPDwgIikiKTsKICAgICByZXR1cm4geyAqbGVmdCwgKnJp Z2h0LCB7IHdpZHRoLCB7ICp1c2VkTWFyZ2luU3RhcnQsICp1c2VkTWFyZ2luRW5kIH0sIGNvbXB1 dGVkSG9yaXpvbnRhbE1hcmdpbiB9IH07Cg==