193807 2019-01-24 19:08:56 -0800 [LFC][BFC][MarginCollapsing] Refactor MarginCollapse::updateCollapsedMarginAfter 2019-01-24 20:15:29 -0800 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 1498094 0 zalan 2019-01-24 19:08:56 -0800 just a small reshuffle. 1498097 1 360069 zalan 2019-01-24 19:18:12 -0800 Created attachment 360069 Patch 1498098 2 360069 simon.fraser 2019-01-24 19:20:12 -0800 Comment on attachment 360069 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=360069&action=review > Source/WebCore/layout/blockformatting/BlockMarginCollapse.cpp:492 > + // 7. No need to propagate to parent because its margin is not computed yet (estimated at most) Period at end 1498123 3 zalan 2019-01-24 20:14:39 -0800 Committed r240467: <https://trac.webkit.org/changeset/240467> 1498124 4 webkit-bug-importer 2019-01-24 20:15:29 -0800 <rdar://problem/47538539> 360069 2019-01-24 19:18:12 -0800 2019-01-24 19:20:12 -0800 Patch bug-193807-20190124191804.patch text/plain 9650 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjQwNDM2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjc0ZmE3MmRkNzdkY2Nl NzljMGE4ZjQyODI1NzRlMmM0MDQwNjEwYy4uMmMwMzFkMWRhNjEwM2FlNmI0NDU0OGZmZmM4YTA3 YjFjYTYxNDdlNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE5LTAxLTI0ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bQkZDXVtNYXJnaW5D b2xsYXBzaW5nXSBSZWZhY3RvciBNYXJnaW5Db2xsYXBzZTo6dXBkYXRlQ29sbGFwc2VkTWFyZ2lu QWZ0ZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5 MzgwNworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJl bmFtZSB1cGRhdGVDb2xsYXBzZWRNYXJnaW5BZnRlciB0byB1cGRhdGVNYXJnaW5BZnRlckZvclBy ZXZpb3VzU2libGluZyBhbmQgbWFrZSB0aGUgbWFyZ2luIHVwZGF0aW5nIGxvZ2ljIG1vcmUgZXhw bGljaXQuIAorCisgICAgICAgICogbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRp bmdDb250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6QmxvY2tGb3JtYXR0aW5n Q29udGV4dDo6Y29tcHV0ZUhlaWdodEFuZE1hcmdpbiBjb25zdCk6CisgICAgICAgICogbGF5b3V0 L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0Lmg6CisgICAgICAgICogbGF5 b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja01hcmdpbkNvbGxhcHNlLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkxheW91dDo6QmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6TWFyZ2luQ29sbGFwc2U6OnVw ZGF0ZU1hcmdpbkFmdGVyRm9yUHJldmlvdXNTaWJsaW5nKToKKyAgICAgICAgKFdlYkNvcmU6Okxh eW91dDo6QmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6TWFyZ2luQ29sbGFwc2U6OnVwZGF0ZUNvbGxh cHNlZE1hcmdpbkFmdGVyKTogRGVsZXRlZC4KKwogMjAxOS0wMS0yNCAgWmFsYW4gQnVqdGFzICA8 emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW0JGQ11bTWFyZ2luQ29sbGFwc2luZ10g TWFyZ2luQ29sbGFwc2U6OmNvbGxhcHNlZFZlcnRpY2FsVmFsdWVzIHNob3VsZCBub3QgcmV0dXJu IGNvbXB1dGVkIG5vbi1jb2xsYXBzZWQgdmFsdWVzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4 dC5jcHAKaW5kZXggYjdmYWU3MjEzZThiODE4MDk3MTZlZTc4NTQwZjgwN2MzM2Q1NTY2Ny4uMzQx ZjA1MDlkNTliNjVlNjY0NzBiNzIxMjYwMzMwZTQzNGU5YWY4ZSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0 dGluZ0NvbnRleHQuY3BwCkBAIC00MjksMTIgKzQyOSwxMCBAQCB2b2lkIEJsb2NrRm9ybWF0dGlu Z0NvbnRleHQ6OmNvbXB1dGVIZWlnaHRBbmRNYXJnaW4oY29uc3QgQm94JiBsYXlvdXRCb3gpIGNv bnN0CiAgICAgQVNTRVJUKCFoYXNFc3RpbWF0ZWRNYXJnaW5CZWZvcmUobGF5b3V0Qm94KSB8fCBl c3RpbWF0ZWRNYXJnaW5CZWZvcmUobGF5b3V0Qm94KS51c2VkVmFsdWUoKSA9PSB2ZXJ0aWNhbE1h cmdpbi5iZWZvcmUoKSk7CiAgICAgcmVtb3ZlRXN0aW1hdGVkTWFyZ2luQmVmb3JlKGxheW91dEJv eCk7CiAgICAgZGlzcGxheUJveC5zZXRUb3AoYWRqdXN0ZWRWZXJ0aWNhbFBvc2l0aW9uQWZ0ZXJN YXJnaW5Db2xsYXBzaW5nKGxheW91dEJveCwgdmVydGljYWxNYXJnaW4pKTsKLSAgICAvLyBBZGp1 c3QgdGhlIHByZXZpb3VzIHNpYmxpbmcncyBtYXJnaW4gYm90dG9tIG5vdyB0aGF0IHRoaXMgYm94 J3MgdmVydGljYWwgbWFyZ2luIGlzIGNvbXB1dGVkLgotICAgIGlmIChNYXJnaW5Db2xsYXBzZTo6 bWFyZ2luQmVmb3JlQ29sbGFwc2VzV2l0aFByZXZpb3VzU2libGluZ01hcmdpbkFmdGVyKGxheW91 dFN0YXRlLCBsYXlvdXRCb3gpKQotICAgICAgICBNYXJnaW5Db2xsYXBzZTo6dXBkYXRlQ29sbGFw c2VkTWFyZ2luQWZ0ZXIobGF5b3V0U3RhdGUsICpsYXlvdXRCb3gucHJldmlvdXNJbkZsb3dTaWJs aW5nKCksIHZlcnRpY2FsTWFyZ2luKTsKLQogICAgIGRpc3BsYXlCb3guc2V0Q29udGVudEJveEhl aWdodChoZWlnaHRBbmRNYXJnaW4uaGVpZ2h0KTsKICAgICBkaXNwbGF5Qm94LnNldFZlcnRpY2Fs TWFyZ2luKHZlcnRpY2FsTWFyZ2luKTsKKyAgICAvLyBBZGp1c3QgdGhlIHByZXZpb3VzIHNpYmxp bmcncyBtYXJnaW4gYm90dG9tIG5vdyB0aGF0IHRoaXMgYm94J3MgdmVydGljYWwgbWFyZ2luIGlz IGNvbXB1dGVkLgorICAgIE1hcmdpbkNvbGxhcHNlOjp1cGRhdGVNYXJnaW5BZnRlckZvclByZXZp b3VzU2libGluZyhsYXlvdXRTdGF0ZSwgbGF5b3V0Qm94KTsKIH0KIAogRm9ybWF0dGluZ0NvbnRl eHQ6Okluc3RyaW5zaWNXaWR0aENvbnN0cmFpbnRzIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6Omlu c3RyaW5zaWNXaWR0aENvbnN0cmFpbnRzKCkgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5oIGIvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0 LmgKaW5kZXggYzNlNThmMzJhOTM2NTk1MWNjNzI0MDFlZWZjOWMzMDA5YzM2ZGM3ZC4uZTA1NDNk MTQ4OTFlOGRiNGI3YzY3ODQ5ZTAxZDcwYWYyYzI4ODBjOCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmgKKysr IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdD b250ZXh0LmgKQEAgLTk2LDcgKzk2LDcgQEAgcHJpdmF0ZToKIAogICAgICAgICBzdGF0aWMgRXN0 aW1hdGVkTWFyZ2luQmVmb3JlIGVzdGltYXRlZE1hcmdpbkJlZm9yZShjb25zdCBMYXlvdXRTdGF0 ZSYsIGNvbnN0IEJveCYpOwogICAgICAgICBzdGF0aWMgTGF5b3V0VW5pdCBtYXJnaW5CZWZvcmVJ Z25vcmluZ0NvbGxhcHNpbmdUaHJvdWdoKGNvbnN0IExheW91dFN0YXRlJiwgY29uc3QgQm94Jiwg Y29uc3QgVXNlZFZlcnRpY2FsTWFyZ2luOjpOb25Db2xsYXBzZWRWYWx1ZXMmKTsKLSAgICAgICAg c3RhdGljIHZvaWQgdXBkYXRlQ29sbGFwc2VkTWFyZ2luQWZ0ZXIoY29uc3QgTGF5b3V0U3RhdGUm LCBjb25zdCBCb3gmLCBjb25zdCBVc2VkVmVydGljYWxNYXJnaW4mIG5leHRTaWJsaW5nVmVydGlj YWxNYXJnaW4pOworICAgICAgICBzdGF0aWMgdm9pZCB1cGRhdGVNYXJnaW5BZnRlckZvclByZXZp b3VzU2libGluZyhjb25zdCBMYXlvdXRTdGF0ZSYsIGNvbnN0IEJveCYpOwogCiAgICAgICAgIHN0 YXRpYyBib29sIG1hcmdpbkJlZm9yZUNvbGxhcHNlc1dpdGhQYXJlbnRNYXJnaW5CZWZvcmUoY29u c3QgTGF5b3V0U3RhdGUmLCBjb25zdCBCb3gmKTsKICAgICAgICAgc3RhdGljIGJvb2wgbWFyZ2lu QmVmb3JlQ29sbGFwc2VzV2l0aEZpcnN0SW5GbG93Q2hpbGRNYXJnaW5CZWZvcmUoY29uc3QgTGF5 b3V0U3RhdGUmLCBjb25zdCBCb3gmKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tNYXJnaW5Db2xsYXBzZS5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrTWFyZ2luQ29sbGFwc2UuY3BwCmluZGV4IGFl YjEyMzQyOTYwYmM1ODMzZjE5YmNmMGQwOGY2NDhjOGE1NWVhN2QuLjAzNWE3NjQyNmU1NTc5OTc0 MzhhNmI0ZjQzNzk5MTU0NWI4NmU5NDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tNYXJnaW5Db2xsYXBzZS5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja01hcmdpbkNvbGxhcHNlLmNwcApAQCAt NDgxLDcgKzQ4MSw3IEBAIHN0YXRpYyBPcHRpb25hbDxMYXlvdXRVbml0PiBtYXJnaW5WYWx1ZShQ b3NpdGl2ZUFuZE5lZ2F0aXZlVmVydGljYWxNYXJnaW46OlZhbHVlCiAgICAgcmV0dXJuICptYXJn aW5WYWx1ZXMucG9zaXRpdmUgKyAqbWFyZ2luVmFsdWVzLm5lZ2F0aXZlOwogfQogCi12b2lkIEJs b2NrRm9ybWF0dGluZ0NvbnRleHQ6Ok1hcmdpbkNvbGxhcHNlOjp1cGRhdGVDb2xsYXBzZWRNYXJn aW5BZnRlcihjb25zdCBMYXlvdXRTdGF0ZSYgbGF5b3V0U3RhdGUsIGNvbnN0IEJveCYgbGF5b3V0 Qm94LCBjb25zdCBVc2VkVmVydGljYWxNYXJnaW4mIG5leHRTaWJsaW5nVmVydGljYWxNYXJnaW4p Cit2b2lkIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6Ok1hcmdpbkNvbGxhcHNlOjp1cGRhdGVNYXJn aW5BZnRlckZvclByZXZpb3VzU2libGluZyhjb25zdCBMYXlvdXRTdGF0ZSYgbGF5b3V0U3RhdGUs IGNvbnN0IEJveCYgbGF5b3V0Qm94KQogewogICAgIC8vIDEuIEdldCB0aGUgbWFyZ2luIGJlZm9y ZSB2YWx1ZSBmcm9tIHRoZSBuZXh0IGluLWZsb3cgc2libGluZy4gVGhpcyBpcyB0aGUgc2FtZSBh cyB0aGlzIGJveCdzIG1hcmdpbiBhZnRlciB2YWx1ZSBub3cgc2luY2UgdGhleSBhcmUgY29sbGFw c2VkLgogICAgIC8vIDIuIFVwZGF0ZSB0aGUgY29sbGFwc2VkIG1hcmdpbiBhZnRlciB2YWx1ZSBh cyB3ZWxsIGFzIHRoZSBwb3NpdGl2ZS9uZWdhdGl2ZSBjYWNoZS4KQEAgLTQ4OSw0MCArNDg5LDQx IEBAIHZvaWQgQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6TWFyZ2luQ29sbGFwc2U6OnVwZGF0ZUNv bGxhcHNlZE1hcmdpbkFmdGVyKGNvbnN0IExhCiAgICAgLy8gNC4gSWYgc28sIHVwZGF0ZSB0aGUg Y29sbGFwc2VkIG1hcmdpbiBiZWZvcmUgdmFsdWUgYXMgd2VsbCBhcyB0aGUgcG9zaXRpdmUvbmVn YXRpdmUgY2FjaGUuCiAgICAgLy8gNS4gSW4gY2FzZSBvZiBjb2xsYXBzZWQgdGhyb3VnaCBtYXJn aW5zIGNoZWNrIGlmIHRoZSBiZWZvcmUgbWFyZ2luIGNvbGxhcGVzIHdpdGggdGhlIHByZXZpb3Vz IGluZmxvdyBzaWJsaW5nJ3MgYWZ0ZXIgbWFyZ2luLgogICAgIC8vIDYuIElmIHNvLCBqdW1wIHRv ICMyLgotICAgIGlmICghbWFyZ2luQWZ0ZXJDb2xsYXBzZXNXaXRoTmV4dFNpYmxpbmdNYXJnaW5C ZWZvcmUobGF5b3V0U3RhdGUsIGxheW91dEJveCkpCisgICAgLy8gNy4gTm8gbmVlZCB0byBwcm9w YWdhdGUgdG8gcGFyZW50IGJlY2F1c2UgaXRzIG1hcmdpbiBpcyBub3QgY29tcHV0ZWQgeWV0IChl c3RpbWF0ZWQgYXQgbW9zdCkgCisgICAgaWYgKCFtYXJnaW5CZWZvcmVDb2xsYXBzZXNXaXRoUHJl dmlvdXNTaWJsaW5nTWFyZ2luQWZ0ZXIobGF5b3V0U3RhdGUsIGxheW91dEJveCkpCiAgICAgICAg IHJldHVybjsKIAotICAgIGF1dG8mIGRpc3BsYXlCb3ggPSBsYXlvdXRTdGF0ZS5kaXNwbGF5Qm94 Rm9yTGF5b3V0Qm94KGxheW91dEJveCk7Ci0gICAgYXV0byB2ZXJ0aWNhbE1hcmdpbiA9IGRpc3Bs YXlCb3gudmVydGljYWxNYXJnaW4oKTsKLSAgICBhdXRvIHZlcnRpY2FsTWFyZ2luQWZ0ZXIgPSBu ZXh0U2libGluZ1ZlcnRpY2FsTWFyZ2luLmJlZm9yZSgpOwotICAgIE9wdGlvbmFsPExheW91dFVu aXQ+IHZlcnRpY2FsTWFyZ2luQmVmb3JlOworICAgIGF1dG8mIHByZXZpb3VzU2libGluZyA9ICps YXlvdXRCb3gucHJldmlvdXNJbkZsb3dTaWJsaW5nKCk7CisgICAgYXV0byYgcHJldmlvdXNTaWJs aW5nRGlzcGxheUJveCA9IGxheW91dFN0YXRlLmRpc3BsYXlCb3hGb3JMYXlvdXRCb3gocHJldmlv dXNTaWJsaW5nKTsKKyAgICBhdXRvIHByZXZpb3VzU2libGluZ1ZlcnRpY2FsTWFyZ2luID0gcHJl dmlvdXNTaWJsaW5nRGlzcGxheUJveC52ZXJ0aWNhbE1hcmdpbigpOworICAgIAorICAgIGF1dG8g Y29sbGFwc2VkVmVydGljYWxNYXJnaW5CZWZvcmUgPSBwcmV2aW91c1NpYmxpbmdWZXJ0aWNhbE1h cmdpbi5jb2xsYXBzZWRWYWx1ZXMoKS5iZWZvcmU7CisgICAgYXV0byBjb2xsYXBzZWRWZXJ0aWNh bE1hcmdpbkFmdGVyID0gbGF5b3V0U3RhdGUuZGlzcGxheUJveEZvckxheW91dEJveChsYXlvdXRC b3gpLnZlcnRpY2FsTWFyZ2luKCkuYmVmb3JlKCk7CiAKLSAgICBhdXRvIG1hcmdpbnNDb2xsYXBz ZVRocm91Z2ggPSBNYXJnaW5Db2xsYXBzZTo6bWFyZ2luc0NvbGxhcHNlVGhyb3VnaChsYXlvdXRT dGF0ZSwgbGF5b3V0Qm94KTsKKyAgICBhdXRvIG1hcmdpbnNDb2xsYXBzZVRocm91Z2ggPSBNYXJn aW5Db2xsYXBzZTo6bWFyZ2luc0NvbGxhcHNlVGhyb3VnaChsYXlvdXRTdGF0ZSwgcHJldmlvdXNT aWJsaW5nKTsKICAgICBpZiAobWFyZ2luc0NvbGxhcHNlVGhyb3VnaCkKLSAgICAgICAgdmVydGlj YWxNYXJnaW5CZWZvcmUgPSB2ZXJ0aWNhbE1hcmdpbkFmdGVyOyAKLSAgICBlbHNlIGlmICh2ZXJ0 aWNhbE1hcmdpbi5oYXNDb2xsYXBzZWRWYWx1ZXMoKSkKLSAgICAgICAgdmVydGljYWxNYXJnaW5C ZWZvcmUgPSB2ZXJ0aWNhbE1hcmdpbi5jb2xsYXBzZWRWYWx1ZXMoKS5iZWZvcmU7CisgICAgICAg IGNvbGxhcHNlZFZlcnRpY2FsTWFyZ2luQmVmb3JlID0gY29sbGFwc2VkVmVydGljYWxNYXJnaW5B ZnRlcjsgCiAKLSAgICAvLyBVcGRhdGUgdmVydGljYWwgbWFyZ2luIHZhbHVlcy4KLSAgICB2ZXJ0 aWNhbE1hcmdpbi5zZXRDb2xsYXBzZWRWYWx1ZXMoeyB2ZXJ0aWNhbE1hcmdpbkJlZm9yZSwgdmVy dGljYWxNYXJnaW5BZnRlciB9KTsKLSAgICBkaXNwbGF5Qm94LnNldFZlcnRpY2FsTWFyZ2luKHZl cnRpY2FsTWFyZ2luKTsKKyAgICAvLyBVcGRhdGUgY29sbGFwc2VkIHZlcnRpY2FsIG1hcmdpbiB2 YWx1ZXMuCisgICAgcHJldmlvdXNTaWJsaW5nVmVydGljYWxNYXJnaW4uc2V0Q29sbGFwc2VkVmFs dWVzKHsgY29sbGFwc2VkVmVydGljYWxNYXJnaW5CZWZvcmUsIGNvbGxhcHNlZFZlcnRpY2FsTWFy Z2luQWZ0ZXIgfSk7CisgICAgcHJldmlvdXNTaWJsaW5nRGlzcGxheUJveC5zZXRWZXJ0aWNhbE1h cmdpbihwcmV2aW91c1NpYmxpbmdWZXJ0aWNhbE1hcmdpbik7CiAKICAgICAvLyBVcGRhdGUgcG9z aXRpdmUvbmVnYXRpdmUgY2FjaGUuCi0gICAgYXV0byYgYmxvY2tGb3JtYXR0aW5nU3RhdGUgPSBk b3duY2FzdDxCbG9ja0Zvcm1hdHRpbmdTdGF0ZT4obGF5b3V0U3RhdGUuZm9ybWF0dGluZ1N0YXRl Rm9yQm94KGxheW91dEJveCkpOwotICAgIGF1dG8gcG9zaXRpdmVOZWdhdGl2ZU1hcmdpbiA9IGJs b2NrRm9ybWF0dGluZ1N0YXRlLnBvc2l0aXZlQW5kTmVnYXRpdmVWZXJ0aWNhbE1hcmdpbihsYXlv dXRCb3gpOwotICAgIGF1dG8gbmV4dFNpYmxpbmdQb3NpdGl2ZU5lZ2F0aXZlTWFyZ2luQmVmb3Jl ID0gYmxvY2tGb3JtYXR0aW5nU3RhdGUucG9zaXRpdmVBbmROZWdhdGl2ZVZlcnRpY2FsTWFyZ2lu KCpsYXlvdXRCb3gubmV4dEluRmxvd1NpYmxpbmcoKSkuYmVmb3JlOworICAgIGF1dG8mIGJsb2Nr Rm9ybWF0dGluZ1N0YXRlID0gZG93bmNhc3Q8QmxvY2tGb3JtYXR0aW5nU3RhdGU+KGxheW91dFN0 YXRlLmZvcm1hdHRpbmdTdGF0ZUZvckJveChwcmV2aW91c1NpYmxpbmcpKTsKKyAgICBhdXRvIHBy ZXZpb3VzU2libGluZ1Bvc2l0aXZlTmVnYXRpdmVNYXJnaW4gPSBibG9ja0Zvcm1hdHRpbmdTdGF0 ZS5wb3NpdGl2ZUFuZE5lZ2F0aXZlVmVydGljYWxNYXJnaW4ocHJldmlvdXNTaWJsaW5nKTsKKyAg ICBhdXRvIHBvc2l0aXZlTmVnYXRpdmVNYXJnaW5CZWZvcmUgPSBibG9ja0Zvcm1hdHRpbmdTdGF0 ZS5wb3NpdGl2ZUFuZE5lZ2F0aXZlVmVydGljYWxNYXJnaW4obGF5b3V0Qm94KS5iZWZvcmU7CiAK LSAgICBwb3NpdGl2ZU5lZ2F0aXZlTWFyZ2luLmFmdGVyID0gY29tcHV0ZWRQb3NpdGl2ZUFuZE5l Z2F0aXZlTWFyZ2luKG5leHRTaWJsaW5nUG9zaXRpdmVOZWdhdGl2ZU1hcmdpbkJlZm9yZSwgcG9z aXRpdmVOZWdhdGl2ZU1hcmdpbi5hZnRlcik7CisgICAgcHJldmlvdXNTaWJsaW5nUG9zaXRpdmVO ZWdhdGl2ZU1hcmdpbi5hZnRlciA9IGNvbXB1dGVkUG9zaXRpdmVBbmROZWdhdGl2ZU1hcmdpbihw b3NpdGl2ZU5lZ2F0aXZlTWFyZ2luQmVmb3JlLCBwcmV2aW91c1NpYmxpbmdQb3NpdGl2ZU5lZ2F0 aXZlTWFyZ2luLmFmdGVyKTsKICAgICBpZiAobWFyZ2luc0NvbGxhcHNlVGhyb3VnaCkgewotICAg ICAgICBwb3NpdGl2ZU5lZ2F0aXZlTWFyZ2luLmJlZm9yZSA9IGNvbXB1dGVkUG9zaXRpdmVBbmRO ZWdhdGl2ZU1hcmdpbihwb3NpdGl2ZU5lZ2F0aXZlTWFyZ2luLmJlZm9yZSwgcG9zaXRpdmVOZWdh dGl2ZU1hcmdpbi5hZnRlcik7Ci0gICAgICAgIHBvc2l0aXZlTmVnYXRpdmVNYXJnaW4uYWZ0ZXIg PSBwb3NpdGl2ZU5lZ2F0aXZlTWFyZ2luLmJlZm9yZTsgCisgICAgICAgIHByZXZpb3VzU2libGlu Z1Bvc2l0aXZlTmVnYXRpdmVNYXJnaW4uYmVmb3JlID0gY29tcHV0ZWRQb3NpdGl2ZUFuZE5lZ2F0 aXZlTWFyZ2luKHByZXZpb3VzU2libGluZ1Bvc2l0aXZlTmVnYXRpdmVNYXJnaW4uYmVmb3JlLCBw cmV2aW91c1NpYmxpbmdQb3NpdGl2ZU5lZ2F0aXZlTWFyZ2luLmFmdGVyKTsKKyAgICAgICAgcHJl dmlvdXNTaWJsaW5nUG9zaXRpdmVOZWdhdGl2ZU1hcmdpbi5hZnRlciA9IHByZXZpb3VzU2libGlu Z1Bvc2l0aXZlTmVnYXRpdmVNYXJnaW4uYmVmb3JlOyAKICAgICB9Ci0gICAgYmxvY2tGb3JtYXR0 aW5nU3RhdGUuc2V0UG9zaXRpdmVBbmROZWdhdGl2ZVZlcnRpY2FsTWFyZ2luKGxheW91dEJveCwg cG9zaXRpdmVOZWdhdGl2ZU1hcmdpbik7CisgICAgYmxvY2tGb3JtYXR0aW5nU3RhdGUuc2V0UG9z aXRpdmVBbmROZWdhdGl2ZVZlcnRpY2FsTWFyZ2luKHByZXZpb3VzU2libGluZywgcHJldmlvdXNT aWJsaW5nUG9zaXRpdmVOZWdhdGl2ZU1hcmdpbik7CiAKLSAgICBpZiAoIW1hcmdpbnNDb2xsYXBz ZVRocm91Z2ggfHwgIW1hcmdpbkJlZm9yZUNvbGxhcHNlc1dpdGhQcmV2aW91c1NpYmxpbmdNYXJn aW5BZnRlcihsYXlvdXRTdGF0ZSwgbGF5b3V0Qm94KSkKKyAgICBpZiAoIW1hcmdpbnNDb2xsYXBz ZVRocm91Z2ggfHwgIW1hcmdpbkJlZm9yZUNvbGxhcHNlc1dpdGhQcmV2aW91c1NpYmxpbmdNYXJn aW5BZnRlcihsYXlvdXRTdGF0ZSwgcHJldmlvdXNTaWJsaW5nKSkKICAgICAgICAgcmV0dXJuOwog Ci0gICAgdXBkYXRlQ29sbGFwc2VkTWFyZ2luQWZ0ZXIobGF5b3V0U3RhdGUsICpsYXlvdXRCb3gu cHJldmlvdXNJbkZsb3dTaWJsaW5nKCksIHZlcnRpY2FsTWFyZ2luKTsKKyAgICB1cGRhdGVNYXJn aW5BZnRlckZvclByZXZpb3VzU2libGluZyhsYXlvdXRTdGF0ZSwgcHJldmlvdXNTaWJsaW5nKTsK IH0KIAogUG9zaXRpdmVBbmROZWdhdGl2ZVZlcnRpY2FsTWFyZ2luOjpWYWx1ZXMgQmxvY2tGb3Jt YXR0aW5nQ29udGV4dDo6TWFyZ2luQ29sbGFwc2U6OnBvc2l0aXZlTmVnYXRpdmVWYWx1ZXMoY29u c3QgTGF5b3V0U3RhdGUmIGxheW91dFN0YXRlLCBjb25zdCBCb3gmIGxheW91dEJveCwgTWFyZ2lu VHlwZSBtYXJnaW5UeXBlKQo=