207447 2020-02-09 17:04:35 -0800 [LFC][BFC] Move updateMarginAfterForPreviousSiblings to BlockFormattingContext 2022-04-06 16:14:24 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified NEW InRadar P2 Normal --- 215087 1 zalan zalan bfulgham koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1616719 0 zalan 2020-02-09 17:04:35 -0800 It just makes more sense to have it on BFC. 1616720 1 webkit-bug-importer 2020-02-09 17:05:42 -0800 <rdar://problem/59298490> 1616722 2 390218 zalan 2020-02-09 17:11:03 -0800 Created attachment 390218 Patch 390218 2020-02-09 17:11:03 -0800 2022-04-06 16:14:24 -0700 Patch bug-207447-20200209171103.patch text/plain 11488 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjU2MTAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjhlMmFjOGUyN2RhZWQw ZWJjMDkyNDRjZWM3NjY1MGYwMmVjZThmYy4uZmVkNjg0NjQ4ZjQwMjQ3MTNlNThlYTgzZDE5YTE5 NzEzMzcyOThkMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIwLTAyLTA5ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bQkZDXSBNb3ZlIHVw ZGF0ZU1hcmdpbkFmdGVyRm9yUHJldmlvdXNTaWJsaW5ncyB0byBCbG9ja0Zvcm1hdHRpbmdDb250 ZXh0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDc0 NDcKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzU5Mjk4NDkwPgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9C bG9ja0Zvcm1hdHRpbmdDb250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6Qmxv Y2tGb3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0SW5GbG93Q29udGVudCk6CisgICAgICAgIChXZWJD b3JlOjpMYXlvdXQ6OkJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVIZWlnaHRBbmRNYXJn aW4pOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpCbG9ja0Zvcm1hdHRpbmdDb250ZXh0Ojp1 cGRhdGVNYXJnaW5BZnRlckZvclByZXZpb3VzU2libGluZ3MpOgorICAgICAgICAqIGxheW91dC9i bG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5oOgorICAgICAgICAqIGxheW91 dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tNYXJnaW5Db2xsYXBzZS5jcHA6CisgICAgICAgIChXZWJD b3JlOjpMYXlvdXQ6OkJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6Ok1hcmdpbkNvbGxhcHNlOjpjb21w dXRlZFBvc2l0aXZlQW5kTmVnYXRpdmVNYXJnaW4gY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6 TGF5b3V0Ojpjb21wdXRlZFBvc2l0aXZlQW5kTmVnYXRpdmVNYXJnaW4pOiBEZWxldGVkLgorICAg ICAgICAoV2ViQ29yZTo6TGF5b3V0OjpCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpNYXJnaW5Db2xs YXBzZTo6dXBkYXRlTWFyZ2luQWZ0ZXJGb3JQcmV2aW91c1NpYmxpbmcpOiBEZWxldGVkLgorCiAy MDIwLTAyLTA5ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xG Q11bQkZDXSBNb3ZlIHVwZGF0ZVBvc2l0aXZlTmVnYXRpdmVNYXJnaW5WYWx1ZXMgb3V0IG9mIE1h cmdpbkNvbGxhcHNlIGNsYXNzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxv Y2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUv bGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmNwcAppbmRleCA0 Y2JhMDA0N2EwOTA3OTMzNDNkYTg0YWZlOTk2Y2ZjOTA2YmZhNGEwLi5kZDc2N2VkNTgyYWYzNGM2 ZDlmN2NhMjU2NmJlYWE3YjRiNzMxYTlhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5j cHAKQEAgLTE0Nyw2ICsxNDcsOCBAQCB2b2lkIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6OmxheW91 dEluRmxvd0NvbnRlbnQoSW52YWxpZGF0aW9uU3RhdGUmIGludmFsaWRhdGlvbgogCiAgICAgICAg ICAgICAvLyBBbGwgaW5mbG93IGRlc2NlbmRhbnRzIChpZiB0aGVyZSBhcmUgYW55KSBhcmUgbGFp ZCBvdXQgYnkgbm93LiBMZXQncyBjb21wdXRlIHRoZSBib3gncyBoZWlnaHQuCiAgICAgICAgICAg ICBjb21wdXRlSGVpZ2h0QW5kTWFyZ2luKGxheW91dEJveCwgaG9yaXpvbnRhbENvbnN0cmFpbnRz LCB2ZXJ0aWNhbENvbnN0cmFpbnRzKTsKKyAgICAgICAgICAgIC8vIEFkanVzdCB0aGUgcHJldmlv dXMgc2libGluZ3MgbWFyZ2luIGJvdHRvbSBub3cgdGhhdCB0aGlzIGJveCdzIHZlcnRpY2FsIG1h cmdpbiBpcyBjb21wdXRlZC4KKyAgICAgICAgICAgIHVwZGF0ZU1hcmdpbkFmdGVyRm9yUHJldmlv dXNTaWJsaW5ncyhsYXlvdXRCb3gpOwogCiAgICAgICAgICAgICBpZiAobGF5b3V0Qm94LmVzdGFi bGlzaGVzRm9ybWF0dGluZ0NvbnRleHQoKSkgewogICAgICAgICAgICAgICAgIC8vIE5vdyB0aGF0 IHdlIGNvbXB1dGVkIHRoZSByb290J3MgaGVpZ2h0LCB3ZSBjYW4gbGF5b3V0IHRoZSBvdXQtb2Yt ZmxvdyBkZXNjZW5kYW50cy4KQEAgLTQyOSwxMCArNDMxLDcgQEAgdm9pZCBCbG9ja0Zvcm1hdHRp bmdDb250ZXh0Ojpjb21wdXRlSGVpZ2h0QW5kTWFyZ2luKGNvbnN0IEJveCYgbGF5b3V0Qm94LCBj b25zdAogICAgIGRpc3BsYXlCb3guc2V0Q29udGVudEJveEhlaWdodChjb250ZW50SGVpZ2h0QW5k TWFyZ2luLmNvbnRlbnRIZWlnaHQpOwogICAgIGRpc3BsYXlCb3guc2V0VmVydGljYWxNYXJnaW4o dmVydGljYWxNYXJnaW4pOwogCi0gICAgYXV0byBtYXJnaW5Db2xsYXBzZSA9IHRoaXMtPm1hcmdp bkNvbGxhcHNlKCk7Ci0gICAgZm9ybWF0dGluZ1N0YXRlKCkuc2V0UG9zaXRpdmVBbmROZWdhdGl2 ZVZlcnRpY2FsTWFyZ2luKGxheW91dEJveCwgbWFyZ2luQ29sbGFwc2UucmVzb2x2ZWRQb3NpdGl2 ZU5lZ2F0aXZlTWFyZ2luVmFsdWVzKGxheW91dEJveCwgY29udGVudEhlaWdodEFuZE1hcmdpbi5u b25Db2xsYXBzZWRNYXJnaW4pKTsKLSAgICAvLyBBZGp1c3QgdGhlIHByZXZpb3VzIHNpYmxpbmcn cyBtYXJnaW4gYm90dG9tIG5vdyB0aGF0IHRoaXMgYm94J3MgdmVydGljYWwgbWFyZ2luIGlzIGNv bXB1dGVkLgotICAgIE1hcmdpbkNvbGxhcHNlOjp1cGRhdGVNYXJnaW5BZnRlckZvclByZXZpb3Vz U2libGluZygqdGhpcywgbWFyZ2luQ29sbGFwc2UsIGxheW91dEJveCk7CisgICAgZm9ybWF0dGlu Z1N0YXRlKCkuc2V0UG9zaXRpdmVBbmROZWdhdGl2ZVZlcnRpY2FsTWFyZ2luKGxheW91dEJveCwg bWFyZ2luQ29sbGFwc2UoKS5yZXNvbHZlZFBvc2l0aXZlTmVnYXRpdmVNYXJnaW5WYWx1ZXMobGF5 b3V0Qm94LCBjb250ZW50SGVpZ2h0QW5kTWFyZ2luLm5vbkNvbGxhcHNlZE1hcmdpbikpOwogfQog CiBGb3JtYXR0aW5nQ29udGV4dDo6SW50cmluc2ljV2lkdGhDb25zdHJhaW50cyBCbG9ja0Zvcm1h dHRpbmdDb250ZXh0Ojpjb21wdXRlZEludHJpbnNpY1dpZHRoQ29uc3RyYWludHMoKQpAQCAtNTU0 LDYgKzU1Myw0NyBAQCBib29sIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6Omhhc1ByZWNvbXB1dGVk TWFyZ2luQmVmb3JlKGNvbnN0IEJveCYgbGF5b3V0Qm94KSBjbwogICAgIHJldHVybiBtX3ByZWNv bXB1dGVkTWFyZ2luQmVmb3JlTGlzdC5jb250YWlucygmbGF5b3V0Qm94KTsKIH0KIAordm9pZCBC bG9ja0Zvcm1hdHRpbmdDb250ZXh0Ojp1cGRhdGVNYXJnaW5BZnRlckZvclByZXZpb3VzU2libGlu Z3MoY29uc3QgQm94JiBsYXlvdXRCb3gpCit7CisgICAgLy8gMS4gR2V0IHRoZSBtYXJnaW4gYmVm b3JlIHZhbHVlIGZyb20gdGhlIG5leHQgaW4tZmxvdyBzaWJsaW5nLiBUaGlzIGlzIHRoZSBzYW1l IGFzIHRoaXMgYm94J3MgbWFyZ2luIGFmdGVyIHZhbHVlIG5vdyBzaW5jZSB0aGV5IGFyZSBjb2xs YXBzZWQuCisgICAgLy8gMi4gVXBkYXRlIHRoZSBjb2xsYXBzZWQgbWFyZ2luIGFmdGVyIHZhbHVl IGFzIHdlbGwgYXMgdGhlIHBvc2l0aXZlL25lZ2F0aXZlIGNhY2hlLgorICAgIC8vIDMuIENoZWNr IGlmIHRoZSBib3gncyBtYXJnaW5zIGNvbGxhcHNlIHRocm91Z2guCisgICAgLy8gNC4gSWYgc28s IHVwZGF0ZSB0aGUgcG9zaXRpdmUvbmVnYXRpdmUgY2FjaGUuCisgICAgLy8gNS4gSW4gY2FzZSBv ZiBjb2xsYXBzZWQgdGhyb3VnaCBtYXJnaW5zIGNoZWNrIGlmIHRoZSBiZWZvcmUgbWFyZ2luIGNv bGxhcGVzIHdpdGggdGhlIHByZXZpb3VzIGluZmxvdyBzaWJsaW5nJ3MgYWZ0ZXIgbWFyZ2luLgor ICAgIC8vIDYuIElmIHNvLCBqdW1wIHRvICMyLgorICAgIC8vIDcuIE5vIG5lZWQgdG8gcHJvcGFn YXRlIHRvIHBhcmVudCBiZWNhdXNlIGl0cyBtYXJnaW4gaXMgbm90IGNvbXB1dGVkIHlldCAocHJl LWNvbXB1dGVkIGF0IG1vc3QpLgorICAgIGF1dG8qIGN1cnJlbnRCb3ggPSAmbGF5b3V0Qm94Owor ICAgIGF1dG8mIGZvcm1hdHRpbmdTdGF0ZSA9IHRoaXMtPmZvcm1hdHRpbmdTdGF0ZSgpOworICAg IGF1dG8gbWFyZ2luQ29sbGFwc2UgPSB0aGlzLT5tYXJnaW5Db2xsYXBzZSgpOworICAgIHdoaWxl IChtYXJnaW5Db2xsYXBzZS5tYXJnaW5CZWZvcmVDb2xsYXBzZXNXaXRoUHJldmlvdXNTaWJsaW5n TWFyZ2luQWZ0ZXIoKmN1cnJlbnRCb3gpKSB7CisgICAgICAgIGF1dG8mIHByZXZpb3VzU2libGlu ZyA9ICpjdXJyZW50Qm94LT5wcmV2aW91c0luRmxvd1NpYmxpbmcoKTsKKworICAgICAgICBhdXRv IGNvbGxhcHNlZFZlcnRpY2FsTWFyZ2luQmVmb3JlID0gZ2VvbWV0cnlGb3JCb3gocHJldmlvdXNT aWJsaW5nKS52ZXJ0aWNhbE1hcmdpbigpLmNvbGxhcHNlZFZhbHVlcygpLmJlZm9yZTsKKyAgICAg ICAgLy8gR3JhYiB0aGUgbmV4dCBzaWJsaW5nIChjdXJyZW50Qm94KSBtYXJnaW4gYmVmb3JlIHNp bmNlIGl0J3MgY29sbGFwc2VkIHdpdGggdGhlIHByZXZpb3VzIGJveCdzIG1hcmdpbiBhZnRlci4K KyAgICAgICAgYXV0byBjb2xsYXBzZWRWZXJ0aWNhbE1hcmdpbkFmdGVyID0gZ2VvbWV0cnlGb3JC b3goKmN1cnJlbnRCb3gpLnZlcnRpY2FsTWFyZ2luKCkuYmVmb3JlKCk7CisKKyAgICAgICAgYXV0 byBtYXJnaW5zQ29sbGFwc2VUaHJvdWdoID0gbWFyZ2luQ29sbGFwc2UubWFyZ2luc0NvbGxhcHNl VGhyb3VnaChwcmV2aW91c1NpYmxpbmcpOworICAgICAgICBpZiAobWFyZ2luc0NvbGxhcHNlVGhy b3VnaCkKKyAgICAgICAgICAgIGNvbGxhcHNlZFZlcnRpY2FsTWFyZ2luQmVmb3JlID0gY29sbGFw c2VkVmVydGljYWxNYXJnaW5BZnRlcjsKKworICAgICAgICAvLyBVcGRhdGUgcG9zaXRpdmUvbmVn YXRpdmUgY2FjaGUuCisgICAgICAgIGF1dG8gcHJldmlvdXNTaWJsaW5nUG9zaXRpdmVOZWdhdGl2 ZU1hcmdpbiA9IGZvcm1hdHRpbmdTdGF0ZS5wb3NpdGl2ZUFuZE5lZ2F0aXZlVmVydGljYWxNYXJn aW4ocHJldmlvdXNTaWJsaW5nKTsKKyAgICAgICAgYXV0byBwb3NpdGl2ZU5lZ2F0aXZlTWFyZ2lu QmVmb3JlID0gZm9ybWF0dGluZ1N0YXRlLnBvc2l0aXZlQW5kTmVnYXRpdmVWZXJ0aWNhbE1hcmdp bigqY3VycmVudEJveCkuYmVmb3JlOworCisgICAgICAgIHByZXZpb3VzU2libGluZ1Bvc2l0aXZl TmVnYXRpdmVNYXJnaW4uYWZ0ZXIgPSBtYXJnaW5Db2xsYXBzZS5jb21wdXRlZFBvc2l0aXZlQW5k TmVnYXRpdmVNYXJnaW4ocG9zaXRpdmVOZWdhdGl2ZU1hcmdpbkJlZm9yZSwgcHJldmlvdXNTaWJs aW5nUG9zaXRpdmVOZWdhdGl2ZU1hcmdpbi5hZnRlcik7CisgICAgICAgIGlmIChtYXJnaW5zQ29s bGFwc2VUaHJvdWdoKSB7CisgICAgICAgICAgICBwcmV2aW91c1NpYmxpbmdQb3NpdGl2ZU5lZ2F0 aXZlTWFyZ2luLmJlZm9yZSA9IG1hcmdpbkNvbGxhcHNlLmNvbXB1dGVkUG9zaXRpdmVBbmROZWdh dGl2ZU1hcmdpbihwcmV2aW91c1NpYmxpbmdQb3NpdGl2ZU5lZ2F0aXZlTWFyZ2luLmJlZm9yZSwg cHJldmlvdXNTaWJsaW5nUG9zaXRpdmVOZWdhdGl2ZU1hcmdpbi5hZnRlcik7CisgICAgICAgICAg ICBwcmV2aW91c1NpYmxpbmdQb3NpdGl2ZU5lZ2F0aXZlTWFyZ2luLmFmdGVyID0gcHJldmlvdXNT aWJsaW5nUG9zaXRpdmVOZWdhdGl2ZU1hcmdpbi5iZWZvcmU7CisgICAgICAgIH0KKyAgICAgICAg Zm9ybWF0dGluZ1N0YXRlLnNldFBvc2l0aXZlQW5kTmVnYXRpdmVWZXJ0aWNhbE1hcmdpbihwcmV2 aW91c1NpYmxpbmcsIHByZXZpb3VzU2libGluZ1Bvc2l0aXZlTmVnYXRpdmVNYXJnaW4pOworCisg ICAgICAgIGlmICghbWFyZ2luc0NvbGxhcHNlVGhyb3VnaCkKKyAgICAgICAgICAgIGJyZWFrOwor CisgICAgICAgIGN1cnJlbnRCb3ggPSAmcHJldmlvdXNTaWJsaW5nOworICAgIH0KK30KKwogfQog fQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Js b2NrRm9ybWF0dGluZ0NvbnRleHQuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1h dHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5oCmluZGV4IDc5ZDY4NjdjYTIyM2NlNjYxODUy MmUyM2EwZGIxMjRkZGM5Zjc0NGEuLmQzNGU1NDMzNjk0NWVjOWIwYzc2NDkyMjI4MWVlMjQwZmQx ZGIxNjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcv QmxvY2tGb3JtYXR0aW5nQ29udGV4dC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9j a2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5oCkBAIC0xMjEsNiArMTIxLDcgQEAg cHJpdmF0ZToKICAgICAgICAgYm9vbCBtYXJnaW5BZnRlckNvbGxhcHNlc1dpdGhTaWJsaW5nTWFy Z2luQmVmb3JlV2l0aENsZWFyYW5jZShjb25zdCBCb3gmKSBjb25zdDsKIAogICAgICAgICBib29s IG1hcmdpbnNDb2xsYXBzZVRocm91Z2goY29uc3QgQm94JikgY29uc3Q7CisgICAgICAgIFBvc2l0 aXZlQW5kTmVnYXRpdmVWZXJ0aWNhbE1hcmdpbjo6VmFsdWVzIGNvbXB1dGVkUG9zaXRpdmVBbmRO ZWdhdGl2ZU1hcmdpbihQb3NpdGl2ZUFuZE5lZ2F0aXZlVmVydGljYWxNYXJnaW46OlZhbHVlcywg UG9zaXRpdmVBbmROZWdhdGl2ZVZlcnRpY2FsTWFyZ2luOjpWYWx1ZXMpIGNvbnN0OwogCiAgICAg cHJpdmF0ZToKICAgICAgICAgZnJpZW5kIGNsYXNzIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ7CkBA IC0xNTgsNiArMTU5LDcgQEAgcHJpdmF0ZToKICAgICB9OwogICAgIEJsb2NrRm9ybWF0dGluZ0Nv bnRleHQ6OlF1aXJrcyBxdWlya3MoKSBjb25zdCB7IHJldHVybiBRdWlya3MoKnRoaXMpOyB9CiAK KyAgICB2b2lkIHVwZGF0ZU1hcmdpbkFmdGVyRm9yUHJldmlvdXNTaWJsaW5ncyhjb25zdCBCb3gm KTsKICAgICB2b2lkIHNldFByZWNvbXB1dGVkTWFyZ2luQmVmb3JlKGNvbnN0IEJveCYsIGNvbnN0 IFByZWNvbXB1dGVkTWFyZ2luQmVmb3JlJik7CiAgICAgdm9pZCByZW1vdmVQcmVjb21wdXRlZE1h cmdpbkJlZm9yZShjb25zdCBCb3gmIGxheW91dEJveCkgeyBtX3ByZWNvbXB1dGVkTWFyZ2luQmVm b3JlTGlzdC5yZW1vdmUoJmxheW91dEJveCk7IH0KICAgICBib29sIGhhc1ByZWNvbXB1dGVkTWFy Z2luQmVmb3JlKGNvbnN0IEJveCYpIGNvbnN0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv bGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja01hcmdpbkNvbGxhcHNlLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tNYXJnaW5Db2xsYXBzZS5jcHAKaW5k ZXggZWVmMzg4ODMzM2YzMTk4MjgyOTRiYmI4ZTc2ODA5MzE2NDY4YjE0OC4uMmE3M2Y2NzFjYThm MTBmYTM3YTQ0YzdkYzJmNTY0MmEyZjUyNzRlYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv bGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja01hcmdpbkNvbGxhcHNlLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrTWFyZ2luQ29sbGFwc2UuY3Bw CkBAIC00MjcsNyArNDI3LDcgQEAgYm9vbCBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpNYXJnaW5D b2xsYXBzZTo6bWFyZ2luc0NvbGxhcHNlVGhyb3VnaChjb25zdCBCb3gmIGwKICAgICByZXR1cm4g dHJ1ZTsKIH0KIAotc3RhdGljIFBvc2l0aXZlQW5kTmVnYXRpdmVWZXJ0aWNhbE1hcmdpbjo6VmFs dWVzIGNvbXB1dGVkUG9zaXRpdmVBbmROZWdhdGl2ZU1hcmdpbihQb3NpdGl2ZUFuZE5lZ2F0aXZl VmVydGljYWxNYXJnaW46OlZhbHVlcyBhLCBQb3NpdGl2ZUFuZE5lZ2F0aXZlVmVydGljYWxNYXJn aW46OlZhbHVlcyBiKQorUG9zaXRpdmVBbmROZWdhdGl2ZVZlcnRpY2FsTWFyZ2luOjpWYWx1ZXMg QmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6TWFyZ2luQ29sbGFwc2U6OmNvbXB1dGVkUG9zaXRpdmVB bmROZWdhdGl2ZU1hcmdpbihQb3NpdGl2ZUFuZE5lZ2F0aXZlVmVydGljYWxNYXJnaW46OlZhbHVl cyBhLCBQb3NpdGl2ZUFuZE5lZ2F0aXZlVmVydGljYWxNYXJnaW46OlZhbHVlcyBiKSBjb25zdAog ewogICAgIFBvc2l0aXZlQW5kTmVnYXRpdmVWZXJ0aWNhbE1hcmdpbjo6VmFsdWVzIGNvbXB1dGVk VmFsdWVzOwogICAgIGlmIChhLnBvc2l0aXZlICYmIGIucG9zaXRpdmUpCkBAIC00NjQsNDcgKzQ2 NCw2IEBAIHN0YXRpYyBPcHRpb25hbDxMYXlvdXRVbml0PiBtYXJnaW5WYWx1ZShQb3NpdGl2ZUFu ZE5lZ2F0aXZlVmVydGljYWxNYXJnaW46OlZhbHVlCiAgICAgcmV0dXJuICptYXJnaW5WYWx1ZXMu cG9zaXRpdmUgKyAqbWFyZ2luVmFsdWVzLm5lZ2F0aXZlOwogfQogCi12b2lkIEJsb2NrRm9ybWF0 dGluZ0NvbnRleHQ6Ok1hcmdpbkNvbGxhcHNlOjp1cGRhdGVNYXJnaW5BZnRlckZvclByZXZpb3Vz U2libGluZyhCbG9ja0Zvcm1hdHRpbmdDb250ZXh0JiBibG9ja0Zvcm1hdHRpbmdDb250ZXh0LCBj b25zdCBNYXJnaW5Db2xsYXBzZSYgbWFyZ2luQ29sbGFwc2UsIGNvbnN0IEJveCYgbGF5b3V0Qm94 KQotewotICAgIC8vIDEuIEdldCB0aGUgbWFyZ2luIGJlZm9yZSB2YWx1ZSBmcm9tIHRoZSBuZXh0 IGluLWZsb3cgc2libGluZy4gVGhpcyBpcyB0aGUgc2FtZSBhcyB0aGlzIGJveCdzIG1hcmdpbiBh ZnRlciB2YWx1ZSBub3cgc2luY2UgdGhleSBhcmUgY29sbGFwc2VkLgotICAgIC8vIDIuIFVwZGF0 ZSB0aGUgY29sbGFwc2VkIG1hcmdpbiBhZnRlciB2YWx1ZSBhcyB3ZWxsIGFzIHRoZSBwb3NpdGl2 ZS9uZWdhdGl2ZSBjYWNoZS4KLSAgICAvLyAzLiBDaGVjayBpZiB0aGUgYm94J3MgbWFyZ2lucyBj b2xsYXBzZSB0aHJvdWdoLgotICAgIC8vIDQuIElmIHNvLCB1cGRhdGUgdGhlIHBvc2l0aXZlL25l Z2F0aXZlIGNhY2hlLgotICAgIC8vIDUuIEluIGNhc2Ugb2YgY29sbGFwc2VkIHRocm91Z2ggbWFy Z2lucyBjaGVjayBpZiB0aGUgYmVmb3JlIG1hcmdpbiBjb2xsYXBlcyB3aXRoIHRoZSBwcmV2aW91 cyBpbmZsb3cgc2libGluZydzIGFmdGVyIG1hcmdpbi4KLSAgICAvLyA2LiBJZiBzbywganVtcCB0 byAjMi4KLSAgICAvLyA3LiBObyBuZWVkIHRvIHByb3BhZ2F0ZSB0byBwYXJlbnQgYmVjYXVzZSBp dHMgbWFyZ2luIGlzIG5vdCBjb21wdXRlZCB5ZXQgKHByZS1jb21wdXRlZCBhdCBtb3N0KS4KLSAg ICBhdXRvKiBjdXJyZW50Qm94ID0gJmxheW91dEJveDsKLSAgICBhdXRvJiBibG9ja0Zvcm1hdHRp bmdTdGF0ZSA9IGJsb2NrRm9ybWF0dGluZ0NvbnRleHQuZm9ybWF0dGluZ1N0YXRlKCk7Ci0gICAg d2hpbGUgKG1hcmdpbkNvbGxhcHNlLm1hcmdpbkJlZm9yZUNvbGxhcHNlc1dpdGhQcmV2aW91c1Np YmxpbmdNYXJnaW5BZnRlcigqY3VycmVudEJveCkpIHsKLSAgICAgICAgYXV0byYgcHJldmlvdXNT aWJsaW5nID0gKmN1cnJlbnRCb3gtPnByZXZpb3VzSW5GbG93U2libGluZygpOwotICAgICAgICBh dXRvJiBwcmV2aW91c1NpYmxpbmdEaXNwbGF5Qm94ID0gYmxvY2tGb3JtYXR0aW5nU3RhdGUuZGlz cGxheUJveChwcmV2aW91c1NpYmxpbmcpOwotICAgICAgICBhdXRvIHByZXZpb3VzU2libGluZ1Zl cnRpY2FsTWFyZ2luID0gcHJldmlvdXNTaWJsaW5nRGlzcGxheUJveC52ZXJ0aWNhbE1hcmdpbigp OwotCi0gICAgICAgIGF1dG8gY29sbGFwc2VkVmVydGljYWxNYXJnaW5CZWZvcmUgPSBwcmV2aW91 c1NpYmxpbmdWZXJ0aWNhbE1hcmdpbi5jb2xsYXBzZWRWYWx1ZXMoKS5iZWZvcmU7Ci0gICAgICAg IGF1dG8gY29sbGFwc2VkVmVydGljYWxNYXJnaW5BZnRlciA9IGJsb2NrRm9ybWF0dGluZ0NvbnRl eHQuZ2VvbWV0cnlGb3JCb3goKmN1cnJlbnRCb3gpLnZlcnRpY2FsTWFyZ2luKCkuYmVmb3JlKCk7 Ci0KLSAgICAgICAgYXV0byBtYXJnaW5zQ29sbGFwc2VUaHJvdWdoID0gbWFyZ2luQ29sbGFwc2Uu bWFyZ2luc0NvbGxhcHNlVGhyb3VnaChwcmV2aW91c1NpYmxpbmcpOwotICAgICAgICBpZiAobWFy Z2luc0NvbGxhcHNlVGhyb3VnaCkKLSAgICAgICAgICAgIGNvbGxhcHNlZFZlcnRpY2FsTWFyZ2lu QmVmb3JlID0gY29sbGFwc2VkVmVydGljYWxNYXJnaW5BZnRlcjsKLQotICAgICAgICAvLyBVcGRh dGUgcG9zaXRpdmUvbmVnYXRpdmUgY2FjaGUuCi0gICAgICAgIGF1dG8gcHJldmlvdXNTaWJsaW5n UG9zaXRpdmVOZWdhdGl2ZU1hcmdpbiA9IGJsb2NrRm9ybWF0dGluZ1N0YXRlLnBvc2l0aXZlQW5k TmVnYXRpdmVWZXJ0aWNhbE1hcmdpbihwcmV2aW91c1NpYmxpbmcpOwotICAgICAgICBhdXRvIHBv c2l0aXZlTmVnYXRpdmVNYXJnaW5CZWZvcmUgPSBibG9ja0Zvcm1hdHRpbmdTdGF0ZS5wb3NpdGl2 ZUFuZE5lZ2F0aXZlVmVydGljYWxNYXJnaW4oKmN1cnJlbnRCb3gpLmJlZm9yZTsKLQotICAgICAg ICBwcmV2aW91c1NpYmxpbmdQb3NpdGl2ZU5lZ2F0aXZlTWFyZ2luLmFmdGVyID0gY29tcHV0ZWRQ b3NpdGl2ZUFuZE5lZ2F0aXZlTWFyZ2luKHBvc2l0aXZlTmVnYXRpdmVNYXJnaW5CZWZvcmUsIHBy ZXZpb3VzU2libGluZ1Bvc2l0aXZlTmVnYXRpdmVNYXJnaW4uYWZ0ZXIpOwotICAgICAgICBpZiAo bWFyZ2luc0NvbGxhcHNlVGhyb3VnaCkgewotICAgICAgICAgICAgcHJldmlvdXNTaWJsaW5nUG9z aXRpdmVOZWdhdGl2ZU1hcmdpbi5iZWZvcmUgPSBjb21wdXRlZFBvc2l0aXZlQW5kTmVnYXRpdmVN YXJnaW4ocHJldmlvdXNTaWJsaW5nUG9zaXRpdmVOZWdhdGl2ZU1hcmdpbi5iZWZvcmUsIHByZXZp b3VzU2libGluZ1Bvc2l0aXZlTmVnYXRpdmVNYXJnaW4uYWZ0ZXIpOwotICAgICAgICAgICAgcHJl dmlvdXNTaWJsaW5nUG9zaXRpdmVOZWdhdGl2ZU1hcmdpbi5hZnRlciA9IHByZXZpb3VzU2libGlu Z1Bvc2l0aXZlTmVnYXRpdmVNYXJnaW4uYmVmb3JlOwotICAgICAgICB9Ci0gICAgICAgIGJsb2Nr Rm9ybWF0dGluZ1N0YXRlLnNldFBvc2l0aXZlQW5kTmVnYXRpdmVWZXJ0aWNhbE1hcmdpbihwcmV2 aW91c1NpYmxpbmcsIHByZXZpb3VzU2libGluZ1Bvc2l0aXZlTmVnYXRpdmVNYXJnaW4pOwotCi0g ICAgICAgIGlmICghbWFyZ2luc0NvbGxhcHNlVGhyb3VnaCkKLSAgICAgICAgICAgIGJyZWFrOwot Ci0gICAgICAgIGN1cnJlbnRCb3ggPSAmcHJldmlvdXNTaWJsaW5nOwotICAgIH0KLX0KLQogUG9z aXRpdmVBbmROZWdhdGl2ZVZlcnRpY2FsTWFyZ2luOjpWYWx1ZXMgQmxvY2tGb3JtYXR0aW5nQ29u dGV4dDo6TWFyZ2luQ29sbGFwc2U6OnBvc2l0aXZlTmVnYXRpdmVWYWx1ZXMoY29uc3QgQm94JiBs YXlvdXRCb3gsIE1hcmdpblR5cGUgbWFyZ2luVHlwZSkgY29uc3QKIHsKICAgICBhdXRvJiBsYXlv dXRTdGF0ZSA9IHRoaXMtPmxheW91dFN0YXRlKCk7Cg==