205831 2020-01-06 14:04:32 -0800 [LFC] Start using the UsedHorizontalValues::Constraints values in ::layoutInFlowContent 2020-01-06 21:48:51 -0800 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 1603260 0 zalan 2020-01-06 14:04:32 -0800 ssia 1603263 1 webkit-bug-importer 2020-01-06 14:04:55 -0800 <rdar://problem/58353565> 1603265 2 386885 zalan 2020-01-06 14:08:26 -0800 Created attachment 386885 Patch 1603437 3 386930 zalan 2020-01-06 21:01:21 -0800 Created attachment 386930 Patch 1603450 4 386930 commit-queue 2020-01-06 21:48:49 -0800 Comment on attachment 386930 Patch Clearing flags on attachment: 386930 Committed r254113: <https://trac.webkit.org/changeset/254113> 1603451 5 commit-queue 2020-01-06 21:48:51 -0800 All reviewed patches have been landed. Closing bug. 386885 2020-01-06 14:08:26 -0800 2020-01-06 21:01:19 -0800 Patch bug-205831-20200106140825.patch text/plain 5764 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjU0MDQ0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGJlMTAxNmMxNjUxYTU2 MWE3MmFlZDkwOTBlZThmOWEzMjQ0MDQ4Ny4uMGI5N2ViOTU1OTA2ZjZlODczYTM0OThkNDNkZjk1 NDZmNjFkYzdmYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIwLTAxLTA2ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ10gU3RhcnQgdXNpbmcg dGhlIFVzZWRIb3Jpem9udGFsVmFsdWVzOjpDb25zdHJhaW50cyB2YWx1ZXMgaW4gOjpsYXlvdXRJ bkZsb3dDb250ZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMDU4MzEKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzU4MzUzNTY1PgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVzZSB0aGUgaW5jb21pbmcg aG9yaXpvbnRhbCBjb25zdHJhaW50IHZhbHVlIGluc3RlYWQgb2YgcXVlcnlpbmcgdGhlIHJvb3Qn cyBnZW9tZXRyeSAod2hpY2ggaXMgdGVjaG5pY2FsbHkgb3V0c2lkZSBvZiB0aGUgY3VycmVudCBm b3JtYXR0aW5nIGNvbnRleHQpLgorCisgICAgICAgICogbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9C bG9ja0Zvcm1hdHRpbmdDb250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6Qmxv Y2tGb3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0SW5GbG93Q29udGVudCk6CisgICAgICAgICogbGF5 b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0SW5GbG93 Q29udGVudCk6CisKIDIwMjAtMDEtMDYgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4K IAogICAgICAgICBbTEZDXSBjb21wdXRlQm9yZGVyQW5kUGFkZGluZy9jb21wdXRlV2lkdGhBbmRN YXJnaW4vY29tcHV0ZVN0YXRpY1Bvc2l0aW9uIGZ1bmN0aW9ucyBzaG91bGQgdGFrZSBVc2VkSG9y aXpvbnRhbFZhbHVlczo6Q29uc3RyYWludHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuY3Bw CmluZGV4IGJhMWE2NDYyODY1YjIzNzQwZjgzNTg4NWY5ZmQ2YzJjMDI5MTM5NDQuLjNmNzA1NDc0 ODExMmExOWI3MzUyZjFlOWFhNzhiNDI1ZTAwZGQ3NWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdD b250ZXh0LmNwcApAQCAtNTIsNyArNTIsNyBAQCBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpCbG9j a0Zvcm1hdHRpbmdDb250ZXh0KGNvbnN0IENvbnRhaW5lciYgZm9ybWF0dGluZ0NvbnRleAogfQog CiBlbnVtIGNsYXNzIExheW91dERpcmVjdGlvbiB7IENoaWxkLCBTaWJsaW5nIH07Ci12b2lkIEJs b2NrRm9ybWF0dGluZ0NvbnRleHQ6OmxheW91dEluRmxvd0NvbnRlbnQoSW52YWxpZGF0aW9uU3Rh dGUmIGludmFsaWRhdGlvblN0YXRlLCBjb25zdCBVc2VkSG9yaXpvbnRhbFZhbHVlczo6Q29uc3Ry YWludHMmKQordm9pZCBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpsYXlvdXRJbkZsb3dDb250ZW50 KEludmFsaWRhdGlvblN0YXRlJiBpbnZhbGlkYXRpb25TdGF0ZSwgY29uc3QgVXNlZEhvcml6b250 YWxWYWx1ZXM6OkNvbnN0cmFpbnRzJiByb290SG9yaXpvbnRhbENvbnN0cmFpbnRzKQogewogICAg IC8vIDkuNC4xIEJsb2NrIGZvcm1hdHRpbmcgY29udGV4dHMKICAgICAvLyBJbiBhIGJsb2NrIGZv cm1hdHRpbmcgY29udGV4dCwgYm94ZXMgYXJlIGxhaWQgb3V0IG9uZSBhZnRlciB0aGUgb3RoZXIs IHZlcnRpY2FsbHksIGJlZ2lubmluZyBhdCB0aGUgdG9wIG9mIGEgY29udGFpbmluZyBibG9jay4K QEAgLTg5LDYgKzg5LDEzIEBAIHZvaWQgQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0SW5G bG93Q29udGVudChJbnZhbGlkYXRpb25TdGF0ZSYgaW52YWxpZGF0aW9uCiAgICAgICAgIHJldHVy biBmYWxzZTsKICAgICB9OwogCisgICAgYXV0byBob3Jpem9udGFsQ29uc3RyYWludHNGb3JMYXlv dXRCb3ggPSBbJl0gKGNvbnN0IGF1dG8mIGxheW91dEJveCkgeworICAgICAgICBhdXRvKiBjb250 YWluaW5nQmxvY2sgPSBsYXlvdXRCb3guY29udGFpbmluZ0Jsb2NrKCk7CisgICAgICAgIEFTU0VS VChjb250YWluaW5nQmxvY2spOworICAgICAgICBpZiAoY29udGFpbmluZ0Jsb2NrID09ICZmb3Jt YXR0aW5nUm9vdCkKKyAgICAgICAgICAgIHJldHVybiByb290SG9yaXpvbnRhbENvbnN0cmFpbnRz OworICAgICAgICByZXR1cm4gVXNlZEhvcml6b250YWxWYWx1ZXM6OkNvbnN0cmFpbnRzIHsgZ2Vv bWV0cnlGb3JCb3goKmNvbnRhaW5pbmdCbG9jaykuY29udGVudEJveCgpIH07CisgICAgfTsKICAg ICAvLyBUaGlzIGlzIGEgcG9zdC1vcmRlciB0cmVlIHRyYXZlcnNhbCBsYXlvdXQuCiAgICAgLy8g VGhlIHJvb3QgY29udGFpbmVyIGxheW91dCBpcyBkb25lIGluIHRoZSBmb3JtYXR0aW5nIGNvbnRl eHQgaXQgbGl2ZXMgaW4sIG5vdCB0aGF0IG9uZSBpdCBjcmVhdGVzLCBzbyBsZXQncyBzdGFydCB3 aXRoIHRoZSBmaXJzdCBjaGlsZC4KICAgICBhcHBlbmROZXh0VG9MYXlvdXRRdWV1ZShmb3JtYXR0 aW5nUm9vdCwgTGF5b3V0RGlyZWN0aW9uOjpDaGlsZCk7CkBAIC0xMTAsMTAgKzExNywxMiBAQCB2 b2lkIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6OmxheW91dEluRmxvd0NvbnRlbnQoSW52YWxpZGF0 aW9uU3RhdGUmIGludmFsaWRhdGlvbgogICAgICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAg ICAgICAgfQogCi0gICAgICAgICAgICBhdXRvIGhvcml6b250YWxDb25zdHJhaW50cyA9IFVzZWRI b3Jpem9udGFsVmFsdWVzOjpDb25zdHJhaW50cyB7IGdlb21ldHJ5Rm9yQm94KCpsYXlvdXRCb3gu Y29udGFpbmluZ0Jsb2NrKCkpLmNvbnRlbnRCb3goKSB9OwotICAgICAgICAgICAgY29tcHV0ZUJv cmRlckFuZFBhZGRpbmcobGF5b3V0Qm94LCBob3Jpem9udGFsQ29uc3RyYWludHMpOwotICAgICAg ICAgICAgY29tcHV0ZVdpZHRoQW5kTWFyZ2luKGxheW91dEJveCwgaG9yaXpvbnRhbENvbnN0cmFp bnRzKTsKLSAgICAgICAgICAgIGNvbXB1dGVTdGF0aWNQb3NpdGlvbihmbG9hdGluZ0NvbnRleHQs IGxheW91dEJveCwgaG9yaXpvbnRhbENvbnN0cmFpbnRzKTsKKyAgICAgICAgICAgIHsKKyAgICAg ICAgICAgICAgICBhdXRvIGhvcml6b250YWxDb25zdHJhaW50cyA9IGhvcml6b250YWxDb25zdHJh aW50c0ZvckxheW91dEJveChsYXlvdXRCb3gpOworICAgICAgICAgICAgICAgIGNvbXB1dGVCb3Jk ZXJBbmRQYWRkaW5nKGxheW91dEJveCwgaG9yaXpvbnRhbENvbnN0cmFpbnRzKTsKKyAgICAgICAg ICAgICAgICBjb21wdXRlV2lkdGhBbmRNYXJnaW4obGF5b3V0Qm94LCBob3Jpem9udGFsQ29uc3Ry YWludHMpOworICAgICAgICAgICAgICAgIGNvbXB1dGVTdGF0aWNQb3NpdGlvbihmbG9hdGluZ0Nv bnRleHQsIGxheW91dEJveCwgaG9yaXpvbnRhbENvbnN0cmFpbnRzKTsKKyAgICAgICAgICAgIH0K IAogICAgICAgICAgICAgaWYgKCFhcHBlbmROZXh0VG9MYXlvdXRRdWV1ZShsYXlvdXRCb3gsIExh eW91dERpcmVjdGlvbjo6Q2hpbGQpKQogICAgICAgICAgICAgICAgIGJyZWFrOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGlu Z0NvbnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5s aW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwCmluZGV4IGVmZGViOWNhMjFkMDlkODkxMGM5M2E0MDAw NjY4OGZhMTY3OTdkZmIuLjFlNzI3MDUxMDRlNjE0N2IxMjRmMWM0ZTRhYWM5ZjdkZTRiNDRhMTIg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGlu ZUZvcm1hdHRpbmdDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5l Zm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAKQEAgLTY0LDE2ICs2NCwxNSBA QCBzdGF0aWMgaW5saW5lIGNvbnN0IEJveCogbmV4dEluUHJlT3JkZXIoY29uc3QgQm94JiBsYXlv dXRCb3gsIGNvbnN0IENvbnRhaW5lciYgcwogICAgIHJldHVybiBudWxscHRyOwogfQogCi12b2lk IElubGluZUZvcm1hdHRpbmdDb250ZXh0OjpsYXlvdXRJbkZsb3dDb250ZW50KEludmFsaWRhdGlv blN0YXRlJiBpbnZhbGlkYXRpb25TdGF0ZSwgY29uc3QgVXNlZEhvcml6b250YWxWYWx1ZXM6OkNv bnN0cmFpbnRzJikKK3ZvaWQgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmxheW91dEluRmxvd0Nv bnRlbnQoSW52YWxpZGF0aW9uU3RhdGUmIGludmFsaWRhdGlvblN0YXRlLCBjb25zdCBVc2VkSG9y aXpvbnRhbFZhbHVlczo6Q29uc3RyYWludHMmIHJvb3RIb3Jpem9udGFsQ29uc3RyYWludCkKIHsK ICAgICBpZiAoIXJvb3QoKS5oYXNJbkZsb3dPckZsb2F0aW5nQ2hpbGQoKSkKICAgICAgICAgcmV0 dXJuOwogCiAgICAgaW52YWxpZGF0ZUZvcm1hdHRpbmdTdGF0ZShpbnZhbGlkYXRpb25TdGF0ZSk7 CiAgICAgTE9HX1dJVEhfU1RSRUFNKEZvcm1hdHRpbmdDb250ZXh0TGF5b3V0LCBzdHJlYW0gPDwg IltTdGFydF0gLT4gaW5saW5lIGZvcm1hdHRpbmcgY29udGV4dCAtPiBmb3JtYXR0aW5nIHJvb3Qo IiA8PCAmcm9vdCgpIDw8ICIpIik7Ci0gICAgYXV0byByb290Q29udGVudEJveCA9IGdlb21ldHJ5 Rm9yQm94KHJvb3QoKSkuY29udGVudEJveCgpOwotICAgIGF1dG8gdXNlZEhvcml6b250YWxWYWx1 ZXMgPSBVc2VkSG9yaXpvbnRhbFZhbHVlcyB7IFVzZWRIb3Jpem9udGFsVmFsdWVzOjpDb25zdHJh aW50cyB7IHJvb3RDb250ZW50Qm94IH0gfTsKLSAgICBhdXRvIHVzZWRWZXJ0aWNhbFZhbHVlcyA9 IFVzZWRWZXJ0aWNhbFZhbHVlcyB7IFVzZWRWZXJ0aWNhbFZhbHVlczo6Q29uc3RyYWludHMgeyBy b290Q29udGVudEJveC50b3AoKSB9IH07CisgICAgYXV0byB1c2VkSG9yaXpvbnRhbFZhbHVlcyA9 IFVzZWRIb3Jpem9udGFsVmFsdWVzIHsgcm9vdEhvcml6b250YWxDb25zdHJhaW50IH07CisgICAg YXV0byB1c2VkVmVydGljYWxWYWx1ZXMgPSBVc2VkVmVydGljYWxWYWx1ZXMgeyBVc2VkVmVydGlj YWxWYWx1ZXM6OkNvbnN0cmFpbnRzIHsgZ2VvbWV0cnlGb3JCb3gocm9vdCgpKS5jb250ZW50Qm94 KCkudG9wKCkgfSB9OwogICAgIGF1dG8qIGxheW91dEJveCA9IHJvb3QoKS5maXJzdEluRmxvd09y RmxvYXRpbmdDaGlsZCgpOwogICAgIC8vIDEuIFZpc2l0IGVhY2ggaW5saW5lIGJveCBhbmQgcGFy dGlhbGx5IGNvbXB1dGUgdGhlaXIgZ2VvbWV0cnkgKG1hcmdpbnMsIHBhZGRpbmdzIGFuZCBib3Jk ZXJzKS4KICAgICAvLyAyLiBDb2xsZWN0IHRoZSBpbmxpbmUgaXRlbXMgKGZsYXR0ZW4gdGhlIHRo ZSBsYXlvdXQgdHJlZSkgYW5kIHBsYWNlIHRoZW0gb24gbGluZXMgaW4gYmlkaXJlY3Rpb25hbCBv cmRlci4gCg== 386930 2020-01-06 21:01:21 -0800 2020-01-06 21:48:49 -0800 Patch bug-205831-20200106210120.patch text/plain 5752 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjU0MTEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjMyZjMxZjBkMGRiYWVm MTQ1ODNlZGRkMzRmOGZlZWVkMGVkNjhjMy4uZTdiNmQyNDFlMzg2MjZlOTlmMzI2YTU0ZGU4Y2U3 Y2ZiNDcwMzQ0YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIwLTAxLTA2ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ10gU3RhcnQgdXNpbmcg dGhlIFVzZWRIb3Jpem9udGFsVmFsdWVzOjpDb25zdHJhaW50cyB2YWx1ZXMgaW4gOjpsYXlvdXRJ bkZsb3dDb250ZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMDU4MzEKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzU4MzUzNTY1PgorCisgICAgICAg IFJldmlld2VkIGJ5IEFudHRpIEtvaXZpc3RvLgorCisgICAgICAgIFVzZSB0aGUgaW5jb21pbmcg aG9yaXpvbnRhbCBjb25zdHJhaW50IHZhbHVlIGluc3RlYWQgb2YgcXVlcnlpbmcgdGhlIHJvb3Qn cyBnZW9tZXRyeSAod2hpY2ggaXMgdGVjaG5pY2FsbHkgb3V0c2lkZSBvZiB0aGUgY3VycmVudCBm b3JtYXR0aW5nIGNvbnRleHQpLgorCisgICAgICAgICogbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9C bG9ja0Zvcm1hdHRpbmdDb250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6Qmxv Y2tGb3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0SW5GbG93Q29udGVudCk6CisgICAgICAgICogbGF5 b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0SW5GbG93 Q29udGVudCk6CisKIDIwMjAtMDEtMDYgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4K IAogICAgICAgICBbTEZDXSBjb21wdXRlQm9yZGVyQW5kUGFkZGluZy9jb21wdXRlV2lkdGhBbmRN YXJnaW4vY29tcHV0ZVN0YXRpY1Bvc2l0aW9uIGZ1bmN0aW9ucyBzaG91bGQgdGFrZSBVc2VkSG9y aXpvbnRhbFZhbHVlczo6Q29uc3RyYWludHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuY3Bw CmluZGV4IDlkYTY3NDMzYzg1YWIwYjU4YzNiODA4MDhkMWE0YTBkNmRjMGZmYWIuLmU3YTgwMjRi MDgyODQwOGQwODM2YmUxYjZkMGE5ZjZjYjY2MGVkM2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdD b250ZXh0LmNwcApAQCAtNTIsNyArNTIsNyBAQCBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpCbG9j a0Zvcm1hdHRpbmdDb250ZXh0KGNvbnN0IENvbnRhaW5lciYgZm9ybWF0dGluZ0NvbnRleAogfQog CiBlbnVtIGNsYXNzIExheW91dERpcmVjdGlvbiB7IENoaWxkLCBTaWJsaW5nIH07Ci12b2lkIEJs b2NrRm9ybWF0dGluZ0NvbnRleHQ6OmxheW91dEluRmxvd0NvbnRlbnQoSW52YWxpZGF0aW9uU3Rh dGUmIGludmFsaWRhdGlvblN0YXRlLCBjb25zdCBVc2VkSG9yaXpvbnRhbFZhbHVlczo6Q29uc3Ry YWludHMmKQordm9pZCBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpsYXlvdXRJbkZsb3dDb250ZW50 KEludmFsaWRhdGlvblN0YXRlJiBpbnZhbGlkYXRpb25TdGF0ZSwgY29uc3QgVXNlZEhvcml6b250 YWxWYWx1ZXM6OkNvbnN0cmFpbnRzJiByb290SG9yaXpvbnRhbENvbnN0cmFpbnRzKQogewogICAg IC8vIDkuNC4xIEJsb2NrIGZvcm1hdHRpbmcgY29udGV4dHMKICAgICAvLyBJbiBhIGJsb2NrIGZv cm1hdHRpbmcgY29udGV4dCwgYm94ZXMgYXJlIGxhaWQgb3V0IG9uZSBhZnRlciB0aGUgb3RoZXIs IHZlcnRpY2FsbHksIGJlZ2lubmluZyBhdCB0aGUgdG9wIG9mIGEgY29udGFpbmluZyBibG9jay4K QEAgLTg5LDYgKzg5LDEzIEBAIHZvaWQgQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0SW5G bG93Q29udGVudChJbnZhbGlkYXRpb25TdGF0ZSYgaW52YWxpZGF0aW9uCiAgICAgICAgIHJldHVy biBmYWxzZTsKICAgICB9OwogCisgICAgYXV0byBob3Jpem9udGFsQ29uc3RyYWludHNGb3JMYXlv dXRCb3ggPSBbJl0gKGNvbnN0IGF1dG8mIGxheW91dEJveCkgeworICAgICAgICBhdXRvKiBjb250 YWluaW5nQmxvY2sgPSBsYXlvdXRCb3guY29udGFpbmluZ0Jsb2NrKCk7CisgICAgICAgIEFTU0VS VChjb250YWluaW5nQmxvY2spOworICAgICAgICBpZiAoY29udGFpbmluZ0Jsb2NrID09ICZmb3Jt YXR0aW5nUm9vdCkKKyAgICAgICAgICAgIHJldHVybiByb290SG9yaXpvbnRhbENvbnN0cmFpbnRz OworICAgICAgICByZXR1cm4gR2VvbWV0cnk6OmluRmxvd0hvcml6b250YWxDb25zdHJhaW50cyhn ZW9tZXRyeUZvckJveCgqY29udGFpbmluZ0Jsb2NrKSk7CisgICAgfTsKICAgICAvLyBUaGlzIGlz IGEgcG9zdC1vcmRlciB0cmVlIHRyYXZlcnNhbCBsYXlvdXQuCiAgICAgLy8gVGhlIHJvb3QgY29u dGFpbmVyIGxheW91dCBpcyBkb25lIGluIHRoZSBmb3JtYXR0aW5nIGNvbnRleHQgaXQgbGl2ZXMg aW4sIG5vdCB0aGF0IG9uZSBpdCBjcmVhdGVzLCBzbyBsZXQncyBzdGFydCB3aXRoIHRoZSBmaXJz dCBjaGlsZC4KICAgICBhcHBlbmROZXh0VG9MYXlvdXRRdWV1ZShmb3JtYXR0aW5nUm9vdCwgTGF5 b3V0RGlyZWN0aW9uOjpDaGlsZCk7CkBAIC0xMDksMTEgKzExNiwxMiBAQCB2b2lkIEJsb2NrRm9y bWF0dGluZ0NvbnRleHQ6OmxheW91dEluRmxvd0NvbnRlbnQoSW52YWxpZGF0aW9uU3RhdGUmIGlu dmFsaWRhdGlvbgogICAgICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgICAgICBj b250aW51ZTsKICAgICAgICAgICAgIH0KLQotICAgICAgICAgICAgYXV0byBob3Jpem9udGFsQ29u c3RyYWludHMgPSBHZW9tZXRyeTo6aW5GbG93SG9yaXpvbnRhbENvbnN0cmFpbnRzKGdlb21ldHJ5 Rm9yQm94KCpsYXlvdXRCb3guY29udGFpbmluZ0Jsb2NrKCkpKTsKLSAgICAgICAgICAgIGNvbXB1 dGVCb3JkZXJBbmRQYWRkaW5nKGxheW91dEJveCwgaG9yaXpvbnRhbENvbnN0cmFpbnRzKTsKLSAg ICAgICAgICAgIGNvbXB1dGVXaWR0aEFuZE1hcmdpbihsYXlvdXRCb3gsIGhvcml6b250YWxDb25z dHJhaW50cyk7Ci0gICAgICAgICAgICBjb21wdXRlU3RhdGljUG9zaXRpb24oZmxvYXRpbmdDb250 ZXh0LCBsYXlvdXRCb3gsIGhvcml6b250YWxDb25zdHJhaW50cyk7CisgICAgICAgICAgICB7Cisg ICAgICAgICAgICAgICAgYXV0byBob3Jpem9udGFsQ29uc3RyYWludHMgPSBob3Jpem9udGFsQ29u c3RyYWludHNGb3JMYXlvdXRCb3gobGF5b3V0Qm94KTsKKyAgICAgICAgICAgICAgICBjb21wdXRl Qm9yZGVyQW5kUGFkZGluZyhsYXlvdXRCb3gsIGhvcml6b250YWxDb25zdHJhaW50cyk7CisgICAg ICAgICAgICAgICAgY29tcHV0ZVdpZHRoQW5kTWFyZ2luKGxheW91dEJveCwgaG9yaXpvbnRhbENv bnN0cmFpbnRzKTsKKyAgICAgICAgICAgICAgICBjb21wdXRlU3RhdGljUG9zaXRpb24oZmxvYXRp bmdDb250ZXh0LCBsYXlvdXRCb3gsIGhvcml6b250YWxDb25zdHJhaW50cyk7CisgICAgICAgICAg ICB9CiAKICAgICAgICAgICAgIGlmICghYXBwZW5kTmV4dFRvTGF5b3V0UXVldWUobGF5b3V0Qm94 LCBMYXlvdXREaXJlY3Rpb246OkNoaWxkKSkKICAgICAgICAgICAgICAgICBicmVhazsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1h dHRpbmdDb250ZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5n L0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcAppbmRleCBhMDcwOGU4MWEyMjEzYTQ1MDlhZTBl MzhlNWQxMmRhZWQ4OTM4NDZmLi4xMzNiOTcwOWYwNWU0OGNlMWJjYjM3ODkwNmM0MDQ5MzFlYmQx YWFkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9J bmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lu bGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwCkBAIC02NCwxNiArNjQs MTUgQEAgc3RhdGljIGlubGluZSBjb25zdCBCb3gqIG5leHRJblByZU9yZGVyKGNvbnN0IEJveCYg bGF5b3V0Qm94LCBjb25zdCBDb250YWluZXImIHMKICAgICByZXR1cm4gbnVsbHB0cjsKIH0KIAot dm9pZCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0SW5GbG93Q29udGVudChJbnZhbGlk YXRpb25TdGF0ZSYgaW52YWxpZGF0aW9uU3RhdGUsIGNvbnN0IFVzZWRIb3Jpem9udGFsVmFsdWVz OjpDb25zdHJhaW50cyYpCit2b2lkIElubGluZUZvcm1hdHRpbmdDb250ZXh0OjpsYXlvdXRJbkZs b3dDb250ZW50KEludmFsaWRhdGlvblN0YXRlJiBpbnZhbGlkYXRpb25TdGF0ZSwgY29uc3QgVXNl ZEhvcml6b250YWxWYWx1ZXM6OkNvbnN0cmFpbnRzJiBob3JpenRvbmFsQ29uc3RyYWludHMpCiB7 CiAgICAgaWYgKCFyb290KCkuaGFzSW5GbG93T3JGbG9hdGluZ0NoaWxkKCkpCiAgICAgICAgIHJl dHVybjsKIAogICAgIGludmFsaWRhdGVGb3JtYXR0aW5nU3RhdGUoaW52YWxpZGF0aW9uU3RhdGUp OwogICAgIExPR19XSVRIX1NUUkVBTShGb3JtYXR0aW5nQ29udGV4dExheW91dCwgc3RyZWFtIDw8 ICJbU3RhcnRdIC0+IGlubGluZSBmb3JtYXR0aW5nIGNvbnRleHQgLT4gZm9ybWF0dGluZyByb290 KCIgPDwgJnJvb3QoKSA8PCAiKSIpOwotICAgIGF1dG8mIHJvb3RHZW9tZXRyeSA9IGdlb21ldHJ5 Rm9yQm94KHJvb3QoKSk7Ci0gICAgYXV0byB1c2VkSG9yaXpvbnRhbFZhbHVlcyA9IFVzZWRIb3Jp em9udGFsVmFsdWVzIHsgR2VvbWV0cnk6OmluRmxvd0hvcml6b250YWxDb25zdHJhaW50cyhyb290 R2VvbWV0cnkpIH07Ci0gICAgYXV0byB1c2VkVmVydGljYWxWYWx1ZXMgPSBVc2VkVmVydGljYWxW YWx1ZXMgeyBVc2VkVmVydGljYWxWYWx1ZXM6OkNvbnN0cmFpbnRzIHsgcm9vdEdlb21ldHJ5LmNv bnRlbnRCb3hUb3AoKSB9IH07CisgICAgYXV0byB1c2VkSG9yaXpvbnRhbFZhbHVlcyA9IFVzZWRI b3Jpem9udGFsVmFsdWVzIHsgaG9yaXp0b25hbENvbnN0cmFpbnRzIH07CisgICAgYXV0byB1c2Vk VmVydGljYWxWYWx1ZXMgPSBVc2VkVmVydGljYWxWYWx1ZXMgeyBVc2VkVmVydGljYWxWYWx1ZXM6 OkNvbnN0cmFpbnRzIHsgZ2VvbWV0cnlGb3JCb3gocm9vdCgpKS5jb250ZW50Qm94VG9wKCkgfSB9 OwogICAgIGF1dG8qIGxheW91dEJveCA9IHJvb3QoKS5maXJzdEluRmxvd09yRmxvYXRpbmdDaGls ZCgpOwogICAgIC8vIDEuIFZpc2l0IGVhY2ggaW5saW5lIGJveCBhbmQgcGFydGlhbGx5IGNvbXB1 dGUgdGhlaXIgZ2VvbWV0cnkgKG1hcmdpbnMsIHBhZGRpbmdzIGFuZCBib3JkZXJzKS4KICAgICAv LyAyLiBDb2xsZWN0IHRoZSBpbmxpbmUgaXRlbXMgKGZsYXR0ZW4gdGhlIHRoZSBsYXlvdXQgdHJl ZSkgYW5kIHBsYWNlIHRoZW0gb24gbGluZXMgaW4gYmlkaXJlY3Rpb25hbCBvcmRlci4gCg==