245345 2022-09-18 15:38:34 -0700 [LFC][Cleanup] Remove LayoutState::formattingStateForBox 2022-09-19 06:58:18 -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 1899378 0 zalan 2022-09-18 15:38:34 -0700 ssia 1899380 1 462426 zalan 2022-09-18 16:04:43 -0700 Created attachment 462426 Patch 1899472 2 ews-feeder 2022-09-19 06:57:08 -0700 Committed 254625@main (ca0f0776f820): <https://commits.webkit.org/254625@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 462426. 1899474 3 webkit-bug-importer 2022-09-19 06:58:18 -0700 <rdar://problem/100120267> 462426 2022-09-18 16:04:43 -0700 2022-09-19 06:57:09 -0700 Patch bug-245345-20220918160442.patch text/plain 14705 zalan RnJvbSBjNWYxZDNlNDI4OWViMjQyMDlhZmQxOGNhOTUxOWZkZjY3NmRlNmRkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJ1anRhcyA8emFsYW5AYXBwbGUuY29tPgpEYXRlOiBT dW4sIDE4IFNlcCAyMDIyIDE1OjM4OjQ3IC0wNzAwClN1YmplY3Q6IFtQQVRDSF0gW0xGQ11bQ2xl YW51cF0gUmVtb3ZlIExheW91dFN0YXRlOjpmb3JtYXR0aW5nU3RhdGVGb3JCb3gKIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNDUzNDUKClJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgoKSW4gbW9zdCBjYXNlcyB0aGUgZm9ybWF0dGluZyBzdGF0ZSB3ZSBhcmUgbG9v a2luZyBmb3IgaXMgdGhlIGN1cnJlbnQgZm9ybWF0dGluZyBjb250ZXh0J3Mgc3RhdGUgKGUuZy4g aW50cmluc2ljIHdpZHRoIGNvbXB1dGF0aW9uKS4gVGhlcmUgYXJlIG9ubHkgYSBmZXcgZXhjZXB0 aW9ucyAoZS5nLiBnZW9tZXRyeSB2ZXJpZmljYXRpb24pIHdoZXJlIHdlIGRvbid0IGhhdmUgZW5v dWdoIGNvbnRleHQgdG8gZ2V0IHRoZSBjb3JyZWN0IHN0YXRlLgpUaGlzIGlzIGFsc28gaW4gcHJl cGFyYXRpb24gZm9yIHJlbW92aW5nIExheW91dDo6Qm94Ojpmb3JtYXR0aW5nQ29udGV4dFJvb3Qo KS4KCiogU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdTdGF0ZS5oOgooV2ViQ29yZTo6 TGF5b3V0OjpGb3JtYXR0aW5nU3RhdGU6OnNldEludHJpbnNpY1dpZHRoQ29uc3RyYWludHNGb3JC b3gpOgooV2ViQ29yZTo6TGF5b3V0OjpGb3JtYXR0aW5nU3RhdGU6OmludHJpbnNpY1dpZHRoQ29u c3RyYWludHNGb3JCb3ggY29uc3QpOgoqIFNvdXJjZS9XZWJDb3JlL2xheW91dC9MYXlvdXRTdGF0 ZS5jcHA6CihXZWJDb3JlOjpMYXlvdXQ6OkxheW91dFN0YXRlOjpmb3JtYXR0aW5nU3RhdGVGb3JC b3ggY29uc3QpOiBEZWxldGVkLgoqIFNvdXJjZS9XZWJDb3JlL2xheW91dC9MYXlvdXRTdGF0ZS5o OgoqIFNvdXJjZS9XZWJDb3JlL2xheW91dC9WZXJpZmljYXRpb24uY3BwOgooV2ViQ29yZTo6TGF5 b3V0OjpvdXRwdXRNaXNtYXRjaGluZ0Jsb2NrQm94SW5mb3JtYXRpb25JZk5lZWRlZCk6CiogU291 cmNlL1dlYkNvcmUvbGF5b3V0L2Zsb2F0cy9GbG9hdGluZ0NvbnRleHQuY3BwOgooV2ViQ29yZTo6 TGF5b3V0OjpGbG9hdGluZ0NvbnRleHQ6OnZlcnRpY2FsUG9zaXRpb25XaXRoQ2xlYXJhbmNlIGNv bnN0KToKKiBTb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL0Zvcm1hdHRp bmdHZW9tZXRyeS5jcHA6CihXZWJDb3JlOjpMYXlvdXQ6OkZvcm1hdHRpbmdHZW9tZXRyeTo6c3Rh dGljVmVydGljYWxQb3NpdGlvbkZvck91dE9mRmxvd1Bvc2l0aW9uZWQgY29uc3QpOgoqIFNvdXJj ZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvYmxvY2svQmxvY2tGb3JtYXR0aW5n R2VvbWV0cnkuY3BwOgooV2ViQ29yZTo6TGF5b3V0OjpCbG9ja0Zvcm1hdHRpbmdHZW9tZXRyeTo6 aW50cmluc2ljV2lkdGhDb25zdHJhaW50cyBjb25zdCk6CiogU291cmNlL1dlYkNvcmUvbGF5b3V0 L2Zvcm1hdHRpbmdDb250ZXh0cy9ibG9jay9QcmVjb21wdXRlZEJsb2NrTWFyZ2luQ29sbGFwc2Uu Y3BwOgooV2ViQ29yZTo6TGF5b3V0OjpCbG9ja01hcmdpbkNvbGxhcHNlOjpwcmVjb21wdXRlZFBv c2l0aXZlTmVnYXRpdmVWYWx1ZXMgY29uc3QpOgooV2ViQ29yZTo6TGF5b3V0OjpCbG9ja01hcmdp bkNvbGxhcHNlOjpwcmVjb21wdXRlZFBvc2l0aXZlTmVnYXRpdmVNYXJnaW5CZWZvcmUgY29uc3Qp OgoqIFNvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGlu ZUZvcm1hdHRpbmdDb250ZXh0LmNwcDoKKFdlYkNvcmU6OkxheW91dDo6SW5saW5lRm9ybWF0dGlu Z0NvbnRleHQ6OmNvbXB1dGVkSW50cmluc2ljV2lkdGhDb25zdHJhaW50cyk6Ci0tLQogU291cmNl L1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdTdGF0ZS5oICAgICAgICAgICAgfCAgNCArKy0tCiBT b3VyY2UvV2ViQ29yZS9sYXlvdXQvTGF5b3V0U3RhdGUuY3BwICAgICAgICAgICAgICB8ICA1IC0t LS0tCiBTb3VyY2UvV2ViQ29yZS9sYXlvdXQvTGF5b3V0U3RhdGUuaCAgICAgICAgICAgICAgICB8 ICAxIC0KIFNvdXJjZS9XZWJDb3JlL2xheW91dC9WZXJpZmljYXRpb24uY3BwICAgICAgICAgICAg IHwgIDIgKy0KIFNvdXJjZS9XZWJDb3JlL2xheW91dC9mbG9hdHMvRmxvYXRpbmdDb250ZXh0LmNw cCAgIHwgIDIgKy0KIC4uLi9mb3JtYXR0aW5nQ29udGV4dHMvRm9ybWF0dGluZ0dlb21ldHJ5LmNw cCAgICAgIHwgIDUgKystLS0KIC4uLi9ibG9jay9CbG9ja0Zvcm1hdHRpbmdHZW9tZXRyeS5jcHAg ICAgICAgICAgICAgIHwgIDIgKy0KIC4uLi9ibG9jay9QcmVjb21wdXRlZEJsb2NrTWFyZ2luQ29s bGFwc2UuY3BwICAgICAgIHwgIDggKysrLS0tLS0KIC4uLi9pbmxpbmUvSW5saW5lRm9ybWF0dGlu Z0NvbnRleHQuY3BwICAgICAgICAgICAgIHwgMTQgKysrKysrKy0tLS0tLS0KIDkgZmlsZXMgY2hh bmdlZCwgMTcgaW5zZXJ0aW9ucygrKSwgMjYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdTdGF0ZS5oIGIvU291cmNlL1dlYkNvcmUvbGF5 b3V0L0Zvcm1hdHRpbmdTdGF0ZS5oCmluZGV4IGQxMGQxODE4ZmNkMi4uNzRlMzA5Mzc2MzBjIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0dGluZ1N0YXRlLmgKKysrIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdTdGF0ZS5oCkBAIC04NSw3ICs4NSw3IEBA IHByaXZhdGU6CiBpbmxpbmUgdm9pZCBGb3JtYXR0aW5nU3RhdGU6OnNldEludHJpbnNpY1dpZHRo Q29uc3RyYWludHNGb3JCb3goY29uc3QgQm94JiBsYXlvdXRCb3gsIEludHJpbnNpY1dpZHRoQ29u c3RyYWludHMgaW50cmluc2ljV2lkdGhDb25zdHJhaW50cykKIHsKICAgICBBU1NFUlQoIW1faW50 cmluc2ljV2lkdGhDb25zdHJhaW50c0ZvckJveGVzLmNvbnRhaW5zKCZsYXlvdXRCb3gpKTsKLSAg ICBBU1NFUlQoJm1fbGF5b3V0U3RhdGUuZm9ybWF0dGluZ1N0YXRlRm9yQm94KGxheW91dEJveCkg PT0gdGhpcyk7CisgICAgQVNTRVJUKCZtX2xheW91dFN0YXRlLmZvcm1hdHRpbmdTdGF0ZUZvckZv cm1hdHRpbmdDb250ZXh0KGxheW91dEJveC5mb3JtYXR0aW5nQ29udGV4dFJvb3QoKSkgPT0gdGhp cyk7CiAgICAgbV9pbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzRm9yQm94ZXMuc2V0KCZsYXlvdXRC b3gsIGludHJpbnNpY1dpZHRoQ29uc3RyYWludHMpOwogfQogCkBAIC05Nyw3ICs5Nyw3IEBAIGlu bGluZSB2b2lkIEZvcm1hdHRpbmdTdGF0ZTo6Y2xlYXJJbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRz KGNvbnN0IEJveCYgbGF5b3V0Qm94CiAKIGlubGluZSBzdGQ6Om9wdGlvbmFsPEludHJpbnNpY1dp ZHRoQ29uc3RyYWludHM+IEZvcm1hdHRpbmdTdGF0ZTo6aW50cmluc2ljV2lkdGhDb25zdHJhaW50 c0ZvckJveChjb25zdCBCb3gmIGxheW91dEJveCkgY29uc3QKIHsKLSAgICBBU1NFUlQoJm1fbGF5 b3V0U3RhdGUuZm9ybWF0dGluZ1N0YXRlRm9yQm94KGxheW91dEJveCkgPT0gdGhpcyk7CisgICAg QVNTRVJUKCZtX2xheW91dFN0YXRlLmZvcm1hdHRpbmdTdGF0ZUZvckZvcm1hdHRpbmdDb250ZXh0 KGxheW91dEJveC5mb3JtYXR0aW5nQ29udGV4dFJvb3QoKSkgPT0gdGhpcyk7CiAgICAgYXV0byBp dGVyYXRvciA9IG1faW50cmluc2ljV2lkdGhDb25zdHJhaW50c0ZvckJveGVzLmZpbmQoJmxheW91 dEJveCk7CiAgICAgaWYgKGl0ZXJhdG9yID09IG1faW50cmluc2ljV2lkdGhDb25zdHJhaW50c0Zv ckJveGVzLmVuZCgpKQogICAgICAgICByZXR1cm4geyB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvbGF5b3V0L0xheW91dFN0YXRlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9MYXlv dXRTdGF0ZS5jcHAKaW5kZXggOTIwY2U0NWMxMzYyLi4xYzU1MzFhZmM3MjUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2xheW91dC9MYXlvdXRTdGF0ZS5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvbGF5b3V0L0xheW91dFN0YXRlLmNwcApAQCAtODEsMTEgKzgxLDYgQEAgQm94R2VvbWV0cnkm IExheW91dFN0YXRlOjplbnN1cmVHZW9tZXRyeUZvckJveFNsb3coY29uc3QgQm94JiBsYXlvdXRC b3gpCiAgICAgfSkuaXRlcmF0b3ItPnZhbHVlOwogfQogCi1Gb3JtYXR0aW5nU3RhdGUmIExheW91 dFN0YXRlOjpmb3JtYXR0aW5nU3RhdGVGb3JCb3goY29uc3QgQm94JiBsYXlvdXRCb3gpIGNvbnN0 Ci17Ci0gICAgcmV0dXJuIGZvcm1hdHRpbmdTdGF0ZUZvckZvcm1hdHRpbmdDb250ZXh0KGxheW91 dEJveC5mb3JtYXR0aW5nQ29udGV4dFJvb3QoKSk7Ci19Ci0KIGJvb2wgTGF5b3V0U3RhdGU6Omhh c0Zvcm1hdHRpbmdTdGF0ZShjb25zdCBDb250YWluZXJCb3gmIGZvcm1hdHRpbmdDb250ZXh0Um9v dCkgY29uc3QKIHsKICAgICBBU1NFUlQoZm9ybWF0dGluZ0NvbnRleHRSb290LmVzdGFibGlzaGVz Rm9ybWF0dGluZ0NvbnRleHQoKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv TGF5b3V0U3RhdGUuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9MYXlvdXRTdGF0ZS5oCmluZGV4 IDZiZWExYmQ1MjU4Zi4uNzIxNmU4ZDQxYzcwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvTGF5b3V0U3RhdGUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvTGF5b3V0U3Rh dGUuaApAQCAtNjUsNyArNjUsNiBAQCBwdWJsaWM6CiAgICAgRmxleEZvcm1hdHRpbmdTdGF0ZSYg Zm9ybWF0dGluZ1N0YXRlRm9yRmxleEZvcm1hdHRpbmdDb250ZXh0KGNvbnN0IENvbnRhaW5lckJv eCYgZmxleEZvcm1hdHRpbmdDb250ZXh0Um9vdCkgY29uc3Q7CiAKICAgICBGb3JtYXR0aW5nU3Rh dGUmIGZvcm1hdHRpbmdTdGF0ZUZvckZvcm1hdHRpbmdDb250ZXh0KGNvbnN0IENvbnRhaW5lckJv eCYgZm9ybWF0dGluZ1Jvb3QpIGNvbnN0OwotICAgIEZvcm1hdHRpbmdTdGF0ZSYgZm9ybWF0dGlu Z1N0YXRlRm9yQm94KGNvbnN0IEJveCYpIGNvbnN0OwogCiAgICAgYm9vbCBoYXNGb3JtYXR0aW5n U3RhdGUoY29uc3QgQ29udGFpbmVyQm94JiBmb3JtYXR0aW5nUm9vdCkgY29uc3Q7CiAgICAgYm9v bCBoYXNJbmxpbmVGb3JtYXR0aW5nU3RhdGUoY29uc3QgQ29udGFpbmVyQm94JiBmb3JtYXR0aW5n Um9vdCkgY29uc3QgeyByZXR1cm4gbV9pbmxpbmVGb3JtYXR0aW5nU3RhdGVzLmNvbnRhaW5zKCZm b3JtYXR0aW5nUm9vdCk7IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9WZXJp ZmljYXRpb24uY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L1ZlcmlmaWNhdGlvbi5jcHAKaW5k ZXggMzBkODE2ZTc3ZjE3Li43ZjgzYTFmYjdkNWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9WZXJpZmljYXRpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9WZXJp ZmljYXRpb24uY3BwCkBAIC0xOTYsNyArMTk2LDcgQEAgc3RhdGljIGJvb2wgb3V0cHV0TWlzbWF0 Y2hpbmdCbG9ja0JveEluZm9ybWF0aW9uSWZOZWVkZWQoVGV4dFN0cmVhbSYgc3RyZWFtLCBjb24K ICAgICAgICAgYXV0byBtYXJnaW5CZWZvcmUgPSBib3hHZW9tZXRyeS5tYXJnaW5CZWZvcmUoKTsK ICAgICAgICAgYXV0byBtYXJnaW5BZnRlciA9IGJveEdlb21ldHJ5Lm1hcmdpbkFmdGVyKCk7CiAg ICAgICAgIGlmIChsYXlvdXRCb3guZm9ybWF0dGluZ0NvbnRleHRSb290KCkuZXN0YWJsaXNoZXNC bG9ja0Zvcm1hdHRpbmdDb250ZXh0KCkpIHsKLSAgICAgICAgICAgIGF1dG8mIGZvcm1hdHRpbmdT dGF0ZSA9IGRvd25jYXN0PEJsb2NrRm9ybWF0dGluZ1N0YXRlPihsYXlvdXRTdGF0ZS5mb3JtYXR0 aW5nU3RhdGVGb3JCb3gobGF5b3V0Qm94KSk7CisgICAgICAgICAgICBhdXRvJiBmb3JtYXR0aW5n U3RhdGUgPSBkb3duY2FzdDxCbG9ja0Zvcm1hdHRpbmdTdGF0ZT4obGF5b3V0U3RhdGUuZm9ybWF0 dGluZ1N0YXRlRm9yRm9ybWF0dGluZ0NvbnRleHQobGF5b3V0Qm94LmZvcm1hdHRpbmdDb250ZXh0 Um9vdCgpKSk7CiAgICAgICAgICAgICBhdXRvIHZlcnRpY2FsTWFyZ2luID0gZm9ybWF0dGluZ1N0 YXRlLnVzZWRWZXJ0aWNhbE1hcmdpbihsYXlvdXRCb3gpOwogICAgICAgICAgICAgbWFyZ2luQmVm b3JlID0gdmVydGljYWxNYXJnaW4ubm9uQ29sbGFwc2VkVmFsdWVzLmJlZm9yZTsKICAgICAgICAg ICAgIG1hcmdpbkFmdGVyID0gdmVydGljYWxNYXJnaW4ubm9uQ29sbGFwc2VkVmFsdWVzLmFmdGVy OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zsb2F0cy9GbG9hdGluZ0NvbnRl eHQuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zsb2F0cy9GbG9hdGluZ0NvbnRleHQuY3Bw CmluZGV4IGIwNzY0NGM4ZDI2ZC4uMzk0YzllNGQyNWIyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvZmxvYXRzL0Zsb2F0aW5nQ29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvbGF5b3V0L2Zsb2F0cy9GbG9hdGluZ0NvbnRleHQuY3BwCkBAIC0zMjIsNyArMzIyLDcgQEAg c3RkOjpvcHRpb25hbDxGbG9hdGluZ0NvbnRleHQ6OlBvc2l0aW9uV2l0aENsZWFyYW5jZT4gRmxv YXRpbmdDb250ZXh0Ojp2ZXJ0aWNhbFAKICAgICAgICAgICAgIC8vIENsZWFyYW5jZSBpbmhpYml0 cyBtYXJnaW4gY29sbGFwc2luZyBpbiBibG9jayBmb3JtYXR0aW5nIGNvbnRleHQuCiAgICAgICAg ICAgICBpZiAoYXV0byogcHJldmlvdXNJbkZsb3dTaWJsaW5nID0gbGF5b3V0Qm94LnByZXZpb3Vz SW5GbG93U2libGluZygpKSB7CiAgICAgICAgICAgICAgICAgLy8gRG9lcyB0aGlzIGJveCB3aXRo IGNsZWFyYW5jZSBhY3R1YWxseSBjb2xsYXBzZSBpdHMgbWFyZ2luIGJlZm9yZSB3aXRoIHRoZSBw cmV2aW91cyBpbmZsb3cgYm94J3MgbWFyZ2luIGFmdGVyPwotICAgICAgICAgICAgICAgIGF1dG8m IGZvcm1hdHRpbmdTdGF0ZSA9IGRvd25jYXN0PEJsb2NrRm9ybWF0dGluZ1N0YXRlPihsYXlvdXRT dGF0ZSgpLmZvcm1hdHRpbmdTdGF0ZUZvckJveChsYXlvdXRCb3gpKTsKKyAgICAgICAgICAgICAg ICBhdXRvJiBmb3JtYXR0aW5nU3RhdGUgPSBkb3duY2FzdDxCbG9ja0Zvcm1hdHRpbmdTdGF0ZT4o Zm9ybWF0dGluZ0NvbnRleHQoKS5mb3JtYXR0aW5nU3RhdGUoKSk7CiAgICAgICAgICAgICAgICAg YXV0byB2ZXJ0aWNhbE1hcmdpbiA9IGZvcm1hdHRpbmdTdGF0ZS51c2VkVmVydGljYWxNYXJnaW4o bGF5b3V0Qm94KTsKICAgICAgICAgICAgICAgICBpZiAodmVydGljYWxNYXJnaW4uY29sbGFwc2Vk VmFsdWVzLmJlZm9yZSkgewogICAgICAgICAgICAgICAgICAgICBhdXRvIHByZXZpb3VzVmVydGlj YWxNYXJnaW5BZnRlciA9IGZvcm1hdHRpbmdDb250ZXh0KCkuZ2VvbWV0cnlGb3JCb3goKnByZXZp b3VzSW5GbG93U2libGluZykubWFyZ2luQWZ0ZXIoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvRm9ybWF0dGluZ0dlb21ldHJ5LmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvRm9ybWF0dGluZ0dlb21ldHJ5 LmNwcAppbmRleCBmMWUyNmZlOGU4NjEuLmY4MDA4YTFjZGJlYyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9Gb3JtYXR0aW5nR2VvbWV0cnkuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvRm9ybWF0dGlu Z0dlb21ldHJ5LmNwcApAQCAtMjQyLDEzICsyNDIsMTIgQEAgTGF5b3V0VW5pdCBGb3JtYXR0aW5n R2VvbWV0cnk6OnN0YXRpY1ZlcnRpY2FsUG9zaXRpb25Gb3JPdXRPZkZsb3dQb3NpdGlvbmVkKGNv bnMKIAogICAgIC8vIFN0YXJ0IHdpdGggdGhpcyBib3gncyBib3JkZXIgYm94IG9mZnNldCBmcm9t IHRoZSBwYXJlbnQncyBib3JkZXIgYm94LgogICAgIGF1dG8mIGZvcm1hdHRpbmdDb250ZXh0ID0g dGhpcy0+Zm9ybWF0dGluZ0NvbnRleHQoKTsKLSAgICBMYXlvdXRVbml0IHRvcDsKKyAgICBhdXRv IHRvcCA9IExheW91dFVuaXQgeyB9OwogICAgIGlmIChsYXlvdXRCb3gucHJldmlvdXNJbkZsb3dT aWJsaW5nKCkgJiYgbGF5b3V0Qm94LnByZXZpb3VzSW5GbG93U2libGluZygpLT5pc0Jsb2NrTGV2 ZWxCb3goKSkgewogICAgICAgICAvLyBBZGQgc2libGluZyBvZmZzZXQKICAgICAgICAgYXV0byYg cHJldmlvdXNJbkZsb3dTaWJsaW5nID0gKmxheW91dEJveC5wcmV2aW91c0luRmxvd1NpYmxpbmco KTsKICAgICAgICAgYXV0byYgcHJldmlvdXNJbkZsb3dCb3hHZW9tZXRyeSA9IGZvcm1hdHRpbmdD b250ZXh0Lmdlb21ldHJ5Rm9yQm94KHByZXZpb3VzSW5GbG93U2libGluZywgRm9ybWF0dGluZ0Nv bnRleHQ6OkVzY2FwZVJlYXNvbjo6T3V0T2ZGbG93Qm94TmVlZHNJbkZsb3dHZW9tZXRyeSk7Ci0g ICAgICAgIGF1dG8mIGZvcm1hdHRpbmdTdGF0ZSA9IGRvd25jYXN0PEJsb2NrRm9ybWF0dGluZ1N0 YXRlPihsYXlvdXRTdGF0ZSgpLmZvcm1hdHRpbmdTdGF0ZUZvckJveChwcmV2aW91c0luRmxvd1Np YmxpbmcpKTsKLSAgICAgICAgYXV0byB1c2VkVmVydGljYWxNYXJnaW5Gb3JQcmV2aW91c0JveCA9 IGZvcm1hdHRpbmdTdGF0ZS51c2VkVmVydGljYWxNYXJnaW4ocHJldmlvdXNJbkZsb3dTaWJsaW5n KTsKKyAgICAgICAgYXV0byB1c2VkVmVydGljYWxNYXJnaW5Gb3JQcmV2aW91c0JveCA9IGRvd25j YXN0PEJsb2NrRm9ybWF0dGluZ1N0YXRlPihmb3JtYXR0aW5nQ29udGV4dC5mb3JtYXR0aW5nU3Rh dGUoKSkudXNlZFZlcnRpY2FsTWFyZ2luKHByZXZpb3VzSW5GbG93U2libGluZyk7CiAKICAgICAg ICAgdG9wICs9IEJveEdlb21ldHJ5Ojpib3JkZXJCb3hSZWN0KHByZXZpb3VzSW5GbG93Qm94R2Vv bWV0cnkpLmJvdHRvbSgpICsgdXNlZFZlcnRpY2FsTWFyZ2luRm9yUHJldmlvdXNCb3gubm9uQ29s bGFwc2VkVmFsdWVzLmFmdGVyOwogICAgIH0gZWxzZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9ibG9jay9CbG9ja0Zvcm1hdHRpbmdHZW9tZXRy eS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2Jsb2NrL0Js b2NrRm9ybWF0dGluZ0dlb21ldHJ5LmNwcAppbmRleCBiYjU5Mzk5NDM1MzguLjhkZWY0MjVmYWUw MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9i bG9jay9CbG9ja0Zvcm1hdHRpbmdHZW9tZXRyeS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9ibG9jay9CbG9ja0Zvcm1hdHRpbmdHZW9tZXRyeS5jcHAK QEAgLTM3Nyw3ICszNzcsNyBAQCBJbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzIEJsb2NrRm9ybWF0 dGluZ0dlb21ldHJ5OjppbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzKGNvbgogICAgICAgICB9CiAK ICAgICAgICAgYXV0byBpbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzID0gSW50cmluc2ljV2lkdGhD b25zdHJhaW50cyB7IH07Ci0gICAgICAgIGF1dG8mIGZvcm1hdHRpbmdTdGF0ZSA9IGxheW91dFN0 YXRlLmZvcm1hdHRpbmdTdGF0ZUZvckJveChsYXlvdXRCb3gpOworICAgICAgICBhdXRvJiBmb3Jt YXR0aW5nU3RhdGUgPSBmb3JtYXR0aW5nQ29udGV4dCgpLmZvcm1hdHRpbmdTdGF0ZSgpOwogICAg ICAgICBmb3IgKGF1dG8mIGNoaWxkIDogY2hpbGRyZW5PZlR5cGU8Qm94Pihkb3duY2FzdDxDb250 YWluZXJCb3g+KGxheW91dEJveCkpKSB7CiAgICAgICAgICAgICBpZiAoY2hpbGQuaXNPdXRPZkZs b3dQb3NpdGlvbmVkKCkgfHwgKGNoaWxkLmlzRmxvYXRBdm9pZGVyKCkgJiYgIWNoaWxkLmhhc0Zs b2F0Q2xlYXIoKSkpCiAgICAgICAgICAgICAgICAgY29udGludWU7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2Jsb2NrL1ByZWNvbXB1dGVkQmxv Y2tNYXJnaW5Db2xsYXBzZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0Nv bnRleHRzL2Jsb2NrL1ByZWNvbXB1dGVkQmxvY2tNYXJnaW5Db2xsYXBzZS5jcHAKaW5kZXggMTAy ZWJjMWExNmFlLi43MDk5ZWRlMWMxZGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9mb3JtYXR0aW5nQ29udGV4dHMvYmxvY2svUHJlY29tcHV0ZWRCbG9ja01hcmdpbkNvbGxhcHNl LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2Jsb2Nr L1ByZWNvbXB1dGVkQmxvY2tNYXJnaW5Db2xsYXBzZS5jcHAKQEAgLTQwLDkgKzQwLDggQEAgbmFt ZXNwYWNlIExheW91dCB7CiAKIFVzZWRWZXJ0aWNhbE1hcmdpbjo6UG9zaXRpdmVBbmROZWdhdGl2 ZVBhaXI6OlZhbHVlcyBCbG9ja01hcmdpbkNvbGxhcHNlOjpwcmVjb21wdXRlZFBvc2l0aXZlTmVn YXRpdmVWYWx1ZXMoY29uc3QgQm94JiBsYXlvdXRCb3gsIGNvbnN0IEJsb2NrRm9ybWF0dGluZ0dl b21ldHJ5JiBmb3JtYXR0aW5nR2VvbWV0cnkpIGNvbnN0CiB7Ci0gICAgYXV0byYgYmxvY2tGb3Jt YXR0aW5nU3RhdGUgPSBkb3duY2FzdDxCbG9ja0Zvcm1hdHRpbmdTdGF0ZT4obGF5b3V0U3RhdGUo KS5mb3JtYXR0aW5nU3RhdGVGb3JCb3gobGF5b3V0Qm94KSk7Ci0gICAgaWYgKGJsb2NrRm9ybWF0 dGluZ1N0YXRlLmhhc1VzZWRWZXJ0aWNhbE1hcmdpbihsYXlvdXRCb3gpKQotICAgICAgICByZXR1 cm4gYmxvY2tGb3JtYXR0aW5nU3RhdGUudXNlZFZlcnRpY2FsTWFyZ2luKGxheW91dEJveCkucG9z aXRpdmVBbmROZWdhdGl2ZVZhbHVlcy5iZWZvcmU7CisgICAgaWYgKGZvcm1hdHRpbmdTdGF0ZSgp Lmhhc1VzZWRWZXJ0aWNhbE1hcmdpbihsYXlvdXRCb3gpKQorICAgICAgICByZXR1cm4gZm9ybWF0 dGluZ1N0YXRlKCkudXNlZFZlcnRpY2FsTWFyZ2luKGxheW91dEJveCkucG9zaXRpdmVBbmROZWdh dGl2ZVZhbHVlcy5iZWZvcmU7CiAKICAgICBhdXRvIGhvcml6b250YWxDb25zdHJhaW50cyA9IGZv cm1hdHRpbmdHZW9tZXRyeS5jb25zdHJhaW50c0ZvckluRmxvd0NvbnRlbnQobGF5b3V0Qm94LmNv bnRhaW5pbmdCbG9jaygpKS5ob3Jpem9udGFsKCk7CiAgICAgYXV0byBjb21wdXRlZFZlcnRpY2Fs TWFyZ2luID0gZm9ybWF0dGluZ0dlb21ldHJ5LmNvbXB1dGVkVmVydGljYWxNYXJnaW4obGF5b3V0 Qm94LCBob3Jpem9udGFsQ29uc3RyYWludHMpOwpAQCAtNjIsOCArNjEsNyBAQCBVc2VkVmVydGlj YWxNYXJnaW46OlBvc2l0aXZlQW5kTmVnYXRpdmVQYWlyOjpWYWx1ZXMgQmxvY2tNYXJnaW5Db2xs YXBzZTo6cHJlY29tcAogICAgICAgICBpZiAoIW1hcmdpbkJlZm9yZUNvbGxhcHNlc1dpdGhQcmV2 aW91c1NpYmxpbmdNYXJnaW5BZnRlcihsYXlvdXRCb3gpKQogICAgICAgICAgICAgcmV0dXJuIHsg fTsKICAgICAgICAgYXV0byYgcHJldmlvdXNJbkZsb3dTaWJsaW5nID0gKmxheW91dEJveC5wcmV2 aW91c0luRmxvd1NpYmxpbmcoKTsKLSAgICAgICAgYXV0byYgYmxvY2tGb3JtYXR0aW5nU3RhdGUg PSBkb3duY2FzdDxCbG9ja0Zvcm1hdHRpbmdTdGF0ZT4obGF5b3V0U3RhdGUoKS5mb3JtYXR0aW5n U3RhdGVGb3JCb3gocHJldmlvdXNJbkZsb3dTaWJsaW5nKSk7Ci0gICAgICAgIHJldHVybiBibG9j a0Zvcm1hdHRpbmdTdGF0ZS51c2VkVmVydGljYWxNYXJnaW4ocHJldmlvdXNJbkZsb3dTaWJsaW5n KS5wb3NpdGl2ZUFuZE5lZ2F0aXZlVmFsdWVzLmFmdGVyOworICAgICAgICByZXR1cm4gZm9ybWF0 dGluZ1N0YXRlKCkudXNlZFZlcnRpY2FsTWFyZ2luKHByZXZpb3VzSW5GbG93U2libGluZykucG9z aXRpdmVBbmROZWdhdGl2ZVZhbHVlcy5hZnRlcjsKICAgICB9OwogCiAgICAgLy8gMS4gR2F0aGVy IHBvc2l0aXZlIGFuZCBuZWdhdGl2ZSBtYXJnaW4gdmFsdWVzIGZyb20gZmlyc3QgY2hpbGQgaWYg bWFyZ2lucyBhcmUgYWRqb2luaW5nLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRm9y bWF0dGluZ0NvbnRleHQuY3BwCmluZGV4IDk4OGM0YTc2ZDRmMS4uMGM3MzgxZDY4OTdmIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9J bmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zv cm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwCkBAIC0y OTIsMTMgKzI5MiwxMyBAQCB2b2lkIElubGluZUZvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlU3Rh dGljUG9zaXRpb25Gb3JPdXRPZkZsb3dDb250ZW50KGNvbnN0IEZvcgogCiBJbnRyaW5zaWNXaWR0 aENvbnN0cmFpbnRzIElubGluZUZvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlZEludHJpbnNpY1dp ZHRoQ29uc3RyYWludHMoKQogewotICAgIGF1dG8mIGxheW91dFN0YXRlID0gdGhpcy0+bGF5b3V0 U3RhdGUoKTsKLSAgICBpZiAoZm9ybWF0dGluZ1N0YXRlKCkuaW50cmluc2ljV2lkdGhDb25zdHJh aW50cygpKQotICAgICAgICByZXR1cm4gKmZvcm1hdHRpbmdTdGF0ZSgpLmludHJpbnNpY1dpZHRo Q29uc3RyYWludHMoKTsKKyAgICBhdXRvJiBmb3JtYXR0aW5nU3RhdGUgPSB0aGlzLT5mb3JtYXR0 aW5nU3RhdGUoKTsKKyAgICBpZiAoZm9ybWF0dGluZ1N0YXRlLmludHJpbnNpY1dpZHRoQ29uc3Ry YWludHMoKSkKKyAgICAgICAgcmV0dXJuICpmb3JtYXR0aW5nU3RhdGUuaW50cmluc2ljV2lkdGhD b25zdHJhaW50cygpOwogCiAgICAgaWYgKCFyb290KCkuaGFzSW5GbG93T3JGbG9hdGluZ0NoaWxk KCkpIHsKICAgICAgICAgYXV0byBjb25zdHJhaW50cyA9IGZvcm1hdHRpbmdHZW9tZXRyeSgpLmNv bnN0cmFpbkJ5TWluTWF4V2lkdGgocm9vdCgpLCB7IH0pOwotICAgICAgICBmb3JtYXR0aW5nU3Rh dGUoKS5zZXRJbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzKGNvbnN0cmFpbnRzKTsKKyAgICAgICAg Zm9ybWF0dGluZ1N0YXRlLnNldEludHJpbnNpY1dpZHRoQ29uc3RyYWludHMoY29uc3RyYWludHMp OwogICAgICAgICByZXR1cm4gY29uc3RyYWludHM7CiAgICAgfQogCkBAIC0zMzQsOCArMzM0LDgg QEAgSW50cmluc2ljV2lkdGhDb25zdHJhaW50cyBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6Y29t cHV0ZWRJbnRyaW5zaWNXaWR0aENvbnN0cmEKICAgICBhdXRvIG1heGltdW1MaW5lV2lkdGggPSBb Jl0oYXV0byBpbnRyaW5zaWNXaWR0aE1vZGUpIHsKICAgICAgICAgLy8gU3dpdGNoIHRvIHRoZSBt aW4vbWF4IGZvcm1hdHRpbmcgcm9vdCB3aWR0aCB2YWx1ZXMgYmVmb3JlIGZvcm1hdHRpbmcgdGhl IGxpbmVzLgogICAgICAgICBmb3IgKGF1dG8qIGZvcm1hdHRpbmdSb290IDogZm9ybWF0dGluZ0Nv bnRleHRSb290TGlzdCkgewotICAgICAgICAgICAgYXV0byBpbnRyaW5zaWNXaWR0aHMgPSBsYXlv dXRTdGF0ZS5mb3JtYXR0aW5nU3RhdGVGb3JCb3goKmZvcm1hdHRpbmdSb290KS5pbnRyaW5zaWNX aWR0aENvbnN0cmFpbnRzRm9yQm94KCpmb3JtYXR0aW5nUm9vdCk7Ci0gICAgICAgICAgICBhdXRv JiBib3hHZW9tZXRyeSA9IGZvcm1hdHRpbmdTdGF0ZSgpLmJveEdlb21ldHJ5KCpmb3JtYXR0aW5n Um9vdCk7CisgICAgICAgICAgICBhdXRvIGludHJpbnNpY1dpZHRocyA9IGZvcm1hdHRpbmdTdGF0 ZS5pbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzRm9yQm94KCpmb3JtYXR0aW5nUm9vdCk7CisgICAg ICAgICAgICBhdXRvJiBib3hHZW9tZXRyeSA9IGZvcm1hdHRpbmdTdGF0ZS5ib3hHZW9tZXRyeSgq Zm9ybWF0dGluZ1Jvb3QpOwogICAgICAgICAgICAgYXV0byBjb250ZW50V2lkdGggPSAoaW50cmlu c2ljV2lkdGhNb2RlID09IEludHJpbnNpY1dpZHRoTW9kZTo6TWF4aW11bSA/IGludHJpbnNpY1dp ZHRocy0+bWF4aW11bSA6IGludHJpbnNpY1dpZHRocy0+bWluaW11bSkgLSBib3hHZW9tZXRyeS5o b3Jpem9udGFsTWFyZ2luQm9yZGVyQW5kUGFkZGluZygpOwogICAgICAgICAgICAgYm94R2VvbWV0 cnkuc2V0Q29udGVudEJveFdpZHRoKGNvbnRlbnRXaWR0aCk7CiAgICAgICAgIH0KQEAgLTM0NSw3 ICszNDUsNyBAQCBJbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzIElubGluZUZvcm1hdHRpbmdDb250 ZXh0Ojpjb21wdXRlZEludHJpbnNpY1dpZHRoQ29uc3RyYQogICAgIGF1dG8gbWluaW11bUNvbnRl bnRXaWR0aCA9IGNlaWxlZExheW91dFVuaXQobWF4aW11bUxpbmVXaWR0aChJbnRyaW5zaWNXaWR0 aE1vZGU6Ok1pbmltdW0pKTsKICAgICBhdXRvIG1heGltdW1Db250ZW50V2lkdGggPSBjZWlsZWRM YXlvdXRVbml0KG1heGltdW1MaW5lV2lkdGgoSW50cmluc2ljV2lkdGhNb2RlOjpNYXhpbXVtKSk7 CiAgICAgYXV0byBjb25zdHJhaW50cyA9IGZvcm1hdHRpbmdHZW9tZXRyeSgpLmNvbnN0cmFpbkJ5 TWluTWF4V2lkdGgocm9vdCgpLCB7IG1pbmltdW1Db250ZW50V2lkdGgsIG1heGltdW1Db250ZW50 V2lkdGggfSk7Ci0gICAgZm9ybWF0dGluZ1N0YXRlKCkuc2V0SW50cmluc2ljV2lkdGhDb25zdHJh aW50cyhjb25zdHJhaW50cyk7CisgICAgZm9ybWF0dGluZ1N0YXRlLnNldEludHJpbnNpY1dpZHRo Q29uc3RyYWludHMoY29uc3RyYWludHMpOwogICAgIHJldHVybiBjb25zdHJhaW50czsKIH0KIAo=