206567 2020-01-21 19:25:35 -0800 [LFC][BFC] Move float avoider special available width handling to BlockFormattingContext::computeWidthAndMargin 2020-01-22 07:19:19 -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 1609435 0 zalan 2020-01-21 19:25:35 -0800 ssia 1609436 1 webkit-bug-importer 2020-01-21 19:25:56 -0800 <rdar://problem/58783979> 1609437 2 388391 zalan 2020-01-21 19:29:54 -0800 Created attachment 388391 Patch 1609525 3 388391 commit-queue 2020-01-22 07:19:17 -0800 Comment on attachment 388391 Patch Clearing flags on attachment: 388391 Committed r254921: <https://trac.webkit.org/changeset/254921> 1609526 4 commit-queue 2020-01-22 07:19:19 -0800 All reviewed patches have been landed. Closing bug. 388391 2020-01-21 19:29:54 -0800 2020-01-22 07:19:17 -0800 Patch bug-206567-20200121192953.patch text/plain 10389 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjU0ODc4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmFlZGQyN2NkODZiMWM3 NmZhZjllMzNjN2Q0YzYwOWY5MmQ2OGM3Ny4uNzY2MGJlZmVjZDRiNTQ2ODFiMjY0ZDFkMGZjYmEw ZTBjMzRjOGIyMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIwLTAxLTIxICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bQkZDXSBNb3ZlIGZs b2F0IGF2b2lkZXIgc3BlY2lhbCBhdmFpbGFibGUgd2lkdGggaGFuZGxpbmcgdG8gQmxvY2tGb3Jt YXR0aW5nQ29udGV4dDo6Y29tcHV0ZVdpZHRoQW5kTWFyZ2luCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDY1NjcKKyAgICAgICAgPHJkYXI6Ly9wcm9i bGVtLzU4NzgzOTc5PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIE5vdyB3ZSBjYW4gbW92ZSB0aGUgY29tcHV0ZSogZnVuY3Rpb25zIGZyb20gbGF5b3V0 Rm9ybWF0dGluZ0NvbnRleHRSb290IHRvIHRoZSBtYWluIGxvb3AgaW4gbGF5b3V0SW5GbG93Q29u dGVudC4KKworICAgICAgICAqIGxheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5n Q29udGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkJsb2NrRm9ybWF0dGluZ0Nv bnRleHQ6OmxheW91dEluRmxvd0NvbnRlbnQpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpC bG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpsYXlvdXRGb3JtYXR0aW5nQ29udGV4dFJvb3QpOgorICAg ICAgICAoV2ViQ29yZTo6TGF5b3V0OjpCbG9ja0Zvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlV2lk dGhBbmRNYXJnaW4pOgorICAgICAgICAqIGxheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3Jt YXR0aW5nQ29udGV4dC5oOgorCiAyMDIwLTAxLTIxICBKZXIgTm9ibGUgIDxqZXIubm9ibGVAYXBw bGUuY29tPgogCiAgICAgICAgIFtpUGFkXSBZb3VUdWJlIGRvZXMgbm90IGF1dG9tYXRpY2FsbHkg QWlyUGxheSB3aGVuIGEgcm91dGUgaXMgc2VsZWN0ZWQgZnJvbSBDb250cm9sIENlbnRlcgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1h dHRpbmdDb250ZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcv QmxvY2tGb3JtYXR0aW5nQ29udGV4dC5jcHAKaW5kZXggOTJjZWJhMjdhN2E3YmQxYWRkODk3M2Qz MzRmODBiNmIxYjBiNGNkMy4uY2QyNTdiMDBiYWRlNDg2ODA0NzJlNDQ2MzE0NTg4OTkwMmI2MWIw YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9j a0Zvcm1hdHRpbmdDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tm b3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuY3BwCkBAIC0xMTgsNiArMTE4LDExIEBA IHZvaWQgQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0SW5GbG93Q29udGVudChJbnZhbGlk YXRpb25TdGF0ZSYgaW52YWxpZGF0aW9uCiAgICAgICAgICAgICBhdXRvIGhvcml6b250YWxDb25z dHJhaW50cyA9IGhvcml6b250YWxDb25zdHJhaW50c0ZvckxheW91dEJveChsYXlvdXRCb3gpOwog ICAgICAgICAgICAgYXV0byB2ZXJ0aWNhbENvbnN0cmFpbnRzID0gdmVydGljYWxDb25zdHJhaW50 c0ZvckxheW91dEJveChsYXlvdXRCb3gpOwogCisgICAgICAgICAgICBjb21wdXRlQm9yZGVyQW5k UGFkZGluZyhsYXlvdXRCb3gsIGhvcml6b250YWxDb25zdHJhaW50cy5jb250YWluaW5nQmxvY2sp OworICAgICAgICAgICAgY29tcHV0ZVN0YXRpY1ZlcnRpY2FsUG9zaXRpb24oZmxvYXRpbmdDb250 ZXh0LCBsYXlvdXRCb3gsIGhvcml6b250YWxDb25zdHJhaW50cywgdmVydGljYWxDb25zdHJhaW50 cyk7CisgICAgICAgICAgICBjb21wdXRlV2lkdGhBbmRNYXJnaW4oZmxvYXRpbmdDb250ZXh0LCBs YXlvdXRCb3gsIGhvcml6b250YWxDb25zdHJhaW50cyk7CisgICAgICAgICAgICBjb21wdXRlU3Rh dGljSG9yaXpvbnRhbFBvc2l0aW9uKGxheW91dEJveCwgaG9yaXpvbnRhbENvbnN0cmFpbnRzKTsK KwogICAgICAgICAgICAgaWYgKGxheW91dEJveC5lc3RhYmxpc2hlc0Zvcm1hdHRpbmdDb250ZXh0 KCkpIHsKICAgICAgICAgICAgICAgICAvLyBsYXlvdXRGb3JtYXR0aW5nQ29udGV4dFJvb3QoKSB0 YWtlcyBjYXJlIG9mIHRoZSBsYXlvdXRCb3ggaXRzZWxmIGFuZCBpdHMgZGVzY2VuZGFudHMuCiAg ICAgICAgICAgICAgICAgbGF5b3V0Rm9ybWF0dGluZ0NvbnRleHRSb290KGxheW91dEJveCwgZmxv YXRpbmdDb250ZXh0LCBpbnZhbGlkYXRpb25TdGF0ZSwgaG9yaXpvbnRhbENvbnN0cmFpbnRzLCB2 ZXJ0aWNhbENvbnN0cmFpbnRzKTsKQEAgLTEyNiw5ICsxMzEsNiBAQCB2b2lkIEJsb2NrRm9ybWF0 dGluZ0NvbnRleHQ6OmxheW91dEluRmxvd0NvbnRlbnQoSW52YWxpZGF0aW9uU3RhdGUmIGludmFs aWRhdGlvbgogICAgICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgICAgICBjb250 aW51ZTsKICAgICAgICAgICAgIH0KLSAgICAgICAgICAgIGNvbXB1dGVCb3JkZXJBbmRQYWRkaW5n KGxheW91dEJveCwgaG9yaXpvbnRhbENvbnN0cmFpbnRzLmNvbnRhaW5pbmdCbG9jayk7Ci0gICAg ICAgICAgICBjb21wdXRlV2lkdGhBbmRNYXJnaW4obGF5b3V0Qm94LCBob3Jpem9udGFsQ29uc3Ry YWludHMpOwotICAgICAgICAgICAgY29tcHV0ZVN0YXRpY1Bvc2l0aW9uKGZsb2F0aW5nQ29udGV4 dCwgbGF5b3V0Qm94LCBob3Jpem9udGFsQ29uc3RyYWludHMsIHZlcnRpY2FsQ29uc3RyYWludHMp OwogICAgICAgICAgICAgaWYgKCFhcHBlbmROZXh0VG9MYXlvdXRRdWV1ZShsYXlvdXRCb3gsIExh eW91dERpcmVjdGlvbjo6Q2hpbGQpKQogICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9 CkBAIC0xODcsNDQgKzE4OSwzMyBAQCBPcHRpb25hbDxMYXlvdXRVbml0PiBCbG9ja0Zvcm1hdHRp bmdDb250ZXh0Ojp1c2VkQXZhaWxhYmxlV2lkdGhGb3JGbG9hdEF2b2lkZXIoYwogICAgIHJldHVy biBhdmFpbGFibGVXaWR0aDsKIH0KIAotdm9pZCBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpsYXlv dXRGb3JtYXR0aW5nQ29udGV4dFJvb3QoY29uc3QgQm94JiBsYXlvdXRCb3gsIEZsb2F0aW5nQ29u dGV4dCYgZmxvYXRpbmdDb250ZXh0LCBJbnZhbGlkYXRpb25TdGF0ZSYgaW52YWxpZGF0aW9uU3Rh dGUsIGNvbnN0IENvbnN0cmFpbnRzUGFpcjxIb3Jpem9udGFsQ29uc3RyYWludHM+JiBob3Jpem9u dGFsQ29uc3RyYWludHMsIGNvbnN0IENvbnN0cmFpbnRzUGFpcjxWZXJ0aWNhbENvbnN0cmFpbnRz PiYgdmVydGljYWxDb25zdHJhaW50cykKK3ZvaWQgQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6bGF5 b3V0Rm9ybWF0dGluZ0NvbnRleHRSb290KGNvbnN0IEJveCYgZm9ybWF0dGluZ0NvbnRleHRSb290 LCBGbG9hdGluZ0NvbnRleHQmIGZsb2F0aW5nQ29udGV4dCwgSW52YWxpZGF0aW9uU3RhdGUmIGlu dmFsaWRhdGlvblN0YXRlLCBjb25zdCBDb25zdHJhaW50c1BhaXI8SG9yaXpvbnRhbENvbnN0cmFp bnRzPiYgaG9yaXpvbnRhbENvbnN0cmFpbnRzLCBjb25zdCBDb25zdHJhaW50c1BhaXI8VmVydGlj YWxDb25zdHJhaW50cz4mIHZlcnRpY2FsQ29uc3RyYWludHMpCiB7Ci0gICAgQVNTRVJUKGxheW91 dEJveC5lc3RhYmxpc2hlc0Zvcm1hdHRpbmdDb250ZXh0KCkpOworICAgIEFTU0VSVChmb3JtYXR0 aW5nQ29udGV4dFJvb3QuZXN0YWJsaXNoZXNGb3JtYXR0aW5nQ29udGV4dCgpKTsKICAgICAvLyBT dGFydCBsYXlpbmcgb3V0IHRoaXMgZm9ybWF0dGluZyByb290IGluIHRoZSBmb3JtYXR0aW5nIGNv bnRlbnh0IGl0IGxpdmVzIGluLgotICAgIExPR19XSVRIX1NUUkVBTShGb3JtYXR0aW5nQ29udGV4 dExheW91dCwgc3RyZWFtIDw8ICJbQ29tcHV0ZV0gLT4gW1Bvc2l0aW9uXVtCb3JkZXJdW1BhZGRp bmddW1dpZHRoXVtNYXJnaW5dIC0+IGZvciBsYXlvdXRCb3goIiA8PCAmbGF5b3V0Qm94IDw8ICIp Iik7Ci0gICAgYXV0byBhdmFpbGFibGVXaWR0aCA9IGhvcml6b250YWxDb25zdHJhaW50cy5jb250 YWluaW5nQmxvY2subG9naWNhbFdpZHRoOwotICAgIGF1dG8gaG9yaXpvbnRhbEF2YWlsYWJsZVNw YWNlSXNDb25zdHJhaW5lZEJ5RXhpc3RpbmdGbG9hdHMgPSBsYXlvdXRCb3guaXNGbG9hdEF2b2lk ZXIoKSAmJiAhbGF5b3V0Qm94LmlzRmxvYXRpbmdQb3NpdGlvbmVkKCk7Ci0gICAgaWYgKGhvcml6 b250YWxBdmFpbGFibGVTcGFjZUlzQ29uc3RyYWluZWRCeUV4aXN0aW5nRmxvYXRzKSB7Ci0gICAg ICAgIGlmIChhdXRvIGFkanVzdGVkQXZhaWxhYmxlV2lkdGggPSB1c2VkQXZhaWxhYmxlV2lkdGhG b3JGbG9hdEF2b2lkZXIoZmxvYXRpbmdDb250ZXh0LCBsYXlvdXRCb3gpKQotICAgICAgICAgICAg YXZhaWxhYmxlV2lkdGggPSAqYWRqdXN0ZWRBdmFpbGFibGVXaWR0aDsKLSAgICB9Ci0gICAgYXV0 byBhZGp1c3RlZEhvcml6b250YWxDb25zdHJhaW50cyA9IENvbnN0cmFpbnRzUGFpcjxIb3Jpem9u dGFsQ29uc3RyYWludHM+IHsgaG9yaXpvbnRhbENvbnN0cmFpbnRzLnJvb3QsIHsgaG9yaXpvbnRh bENvbnN0cmFpbnRzLmNvbnRhaW5pbmdCbG9jay5sb2dpY2FsTGVmdCwgYXZhaWxhYmxlV2lkdGgg fSB9OwotCi0gICAgY29tcHV0ZUJvcmRlckFuZFBhZGRpbmcobGF5b3V0Qm94LCBhZGp1c3RlZEhv cml6b250YWxDb25zdHJhaW50cy5jb250YWluaW5nQmxvY2spOwotICAgIGNvbXB1dGVTdGF0aWNW ZXJ0aWNhbFBvc2l0aW9uKGZsb2F0aW5nQ29udGV4dCwgbGF5b3V0Qm94LCBob3Jpem9udGFsQ29u c3RyYWludHMsIHZlcnRpY2FsQ29uc3RyYWludHMpOwotICAgIGNvbXB1dGVXaWR0aEFuZE1hcmdp bihsYXlvdXRCb3gsIGFkanVzdGVkSG9yaXpvbnRhbENvbnN0cmFpbnRzKTsKLSAgICBjb21wdXRl U3RhdGljSG9yaXpvbnRhbFBvc2l0aW9uKGxheW91dEJveCwgYWRqdXN0ZWRIb3Jpem9udGFsQ29u c3RyYWludHMpOworICAgIExPR19XSVRIX1NUUkVBTShGb3JtYXR0aW5nQ29udGV4dExheW91dCwg c3RyZWFtIDw8ICJbQ29tcHV0ZV0gLT4gW1Bvc2l0aW9uXVtCb3JkZXJdW1BhZGRpbmddW1dpZHRo XVtNYXJnaW5dIC0+IGZvciBsYXlvdXRCb3goIiA8PCAmZm9ybWF0dGluZ0NvbnRleHRSb290IDw8 ICIpIik7CiAKLSAgICBpZiAoaXM8Q29udGFpbmVyPihsYXlvdXRCb3gpKSB7CisgICAgaWYgKGlz PENvbnRhaW5lcj4oZm9ybWF0dGluZ0NvbnRleHRSb290KSkgewogICAgICAgICAvLyBTd2ljaCBv dmVyIHRvIHRoZSBuZXcgZm9ybWF0dGluZyBjb250ZXh0ICh0aGUgb25lIHRoYXQgdGhlIHJvb3Qg Y3JlYXRlcykuCi0gICAgICAgIGF1dG8mIHJvb3RDb250YWluZXIgPSBkb3duY2FzdDxDb250YWlu ZXI+KGxheW91dEJveCk7CisgICAgICAgIGF1dG8mIHJvb3RDb250YWluZXIgPSBkb3duY2FzdDxD b250YWluZXI+KGZvcm1hdHRpbmdDb250ZXh0Um9vdCk7CiAgICAgICAgIGF1dG8mIHJvb3RDb250 YWluZXJEaXNwbGF5Qm94ID0gZ2VvbWV0cnlGb3JCb3gocm9vdENvbnRhaW5lcik7CiAgICAgICAg IGF1dG8gZm9ybWF0dGluZ0NvbnRleHQgPSBMYXlvdXRDb250ZXh0OjpjcmVhdGVGb3JtYXR0aW5n Q29udGV4dChyb290Q29udGFpbmVyLCBsYXlvdXRTdGF0ZSgpKTsKICAgICAgICAgZm9ybWF0dGlu Z0NvbnRleHQtPmxheW91dEluRmxvd0NvbnRlbnQoaW52YWxpZGF0aW9uU3RhdGUsIEdlb21ldHJ5 Ojpob3Jpem9udGFsQ29uc3RyYWludHNGb3JJbkZsb3cocm9vdENvbnRhaW5lckRpc3BsYXlCb3gp LCBHZW9tZXRyeTo6dmVydGljYWxDb25zdHJhaW50c0ZvckluRmxvdyhyb290Q29udGFpbmVyRGlz cGxheUJveCkpOwogICAgICAgICAvLyBDb21lIGJhY2sgYW5kIGZpbmFsaXplIHRoZSByb290J3Mg Z2VvbWV0cnkuCi0gICAgICAgIGNvbXB1dGVIZWlnaHRBbmRNYXJnaW4ocm9vdENvbnRhaW5lciwg YWRqdXN0ZWRIb3Jpem9udGFsQ29uc3RyYWludHMsIHZlcnRpY2FsQ29uc3RyYWludHMpOworICAg ICAgICBjb21wdXRlSGVpZ2h0QW5kTWFyZ2luKHJvb3RDb250YWluZXIsIGhvcml6b250YWxDb25z dHJhaW50cywgdmVydGljYWxDb25zdHJhaW50cyk7CiAgICAgICAgIC8vIE5vdyB0aGF0IHdlIGNv bXB1dGVkIHRoZSByb290J3MgaGVpZ2h0LCB3ZSBjYW4gZ28gYmFjayBhbmQgbGF5b3V0IHRoZSBv dXQtb2YtZmxvdyBjb250ZW50LgogICAgICAgICBhdXRvIGhvcml6b250YWxDb25zdHJhaW50c0Zv ck91dE9mRmxvdyA9ICBHZW9tZXRyeTo6aG9yaXpvbnRhbENvbnN0cmFpbnRzRm9yT3V0T2ZGbG93 KHJvb3RDb250YWluZXJEaXNwbGF5Qm94KTsKICAgICAgICAgYXV0byB2ZXJ0aWNhbENvbnN0cmFp bnRzRm9yT3V0T2ZGbG93ID0gR2VvbWV0cnk6OnZlcnRpY2FsQ29uc3RyYWludHNGb3JPdXRPZkZs b3cocm9vdENvbnRhaW5lckRpc3BsYXlCb3gpOwogICAgICAgICBmb3JtYXR0aW5nQ29udGV4dC0+ bGF5b3V0T3V0T2ZGbG93Q29udGVudChpbnZhbGlkYXRpb25TdGF0ZSwgaG9yaXpvbnRhbENvbnN0 cmFpbnRzRm9yT3V0T2ZGbG93LCB2ZXJ0aWNhbENvbnN0cmFpbnRzRm9yT3V0T2ZGbG93KTsKICAg ICB9IGVsc2UKLSAgICAgICAgY29tcHV0ZUhlaWdodEFuZE1hcmdpbihsYXlvdXRCb3gsIGFkanVz dGVkSG9yaXpvbnRhbENvbnN0cmFpbnRzLCB2ZXJ0aWNhbENvbnN0cmFpbnRzKTsKKyAgICAgICAg Y29tcHV0ZUhlaWdodEFuZE1hcmdpbihmb3JtYXR0aW5nQ29udGV4dFJvb3QsIGhvcml6b250YWxD b25zdHJhaW50cywgdmVydGljYWxDb25zdHJhaW50cyk7CiAgICAgLy8gRmxvYXQgcmVsYXRlZCBm aW5hbCBwb3NpdGlvbmluZy4KLSAgICBpZiAobGF5b3V0Qm94LmlzRmxvYXRpbmdQb3NpdGlvbmVk KCkpIHsKLSAgICAgICAgY29tcHV0ZUZsb2F0aW5nUG9zaXRpb24oZmxvYXRpbmdDb250ZXh0LCBs YXlvdXRCb3gpOwotICAgICAgICBmbG9hdGluZ0NvbnRleHQuYXBwZW5kKGxheW91dEJveCk7Ci0g ICAgfSBlbHNlIGlmIChsYXlvdXRCb3guZXN0YWJsaXNoZXNCbG9ja0Zvcm1hdHRpbmdDb250ZXh0 KCkpCi0gICAgICAgIGNvbXB1dGVQb3NpdGlvblRvQXZvaWRGbG9hdHMoZmxvYXRpbmdDb250ZXh0 LCBsYXlvdXRCb3gpOworICAgIGlmIChmb3JtYXR0aW5nQ29udGV4dFJvb3QuaXNGbG9hdGluZ1Bv c2l0aW9uZWQoKSkgeworICAgICAgICBjb21wdXRlRmxvYXRpbmdQb3NpdGlvbihmbG9hdGluZ0Nv bnRleHQsIGZvcm1hdHRpbmdDb250ZXh0Um9vdCk7CisgICAgICAgIGZsb2F0aW5nQ29udGV4dC5h cHBlbmQoZm9ybWF0dGluZ0NvbnRleHRSb290KTsKKyAgICB9CisgICAgaWYgKGZvcm1hdHRpbmdD b250ZXh0Um9vdC5pc0Zsb2F0QXZvaWRlcigpKQorICAgICAgICBjb21wdXRlUG9zaXRpb25Ub0F2 b2lkRmxvYXRzKGZsb2F0aW5nQ29udGV4dCwgZm9ybWF0dGluZ0NvbnRleHRSb290KTsKIH0KIAog dm9pZCBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpwbGFjZUluRmxvd1Bvc2l0aW9uZWRDaGlsZHJl bihjb25zdCBCb3gmIGxheW91dEJveCwgY29uc3QgQ29uc3RyYWludHNQYWlyPEhvcml6b250YWxD b25zdHJhaW50cz4mIGhvcml6b250YWxDb25zdHJhaW50cykKQEAgLTM4NywxNSArMzc4LDIwIEBA IHZvaWQgQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZVBvc2l0aW9uVG9Bdm9pZEZsb2F0 cyhjb25zdCBGbG9hdGluZ0NvbnRleHQmCiAgICAgICAgIGZvcm1hdHRpbmdTdGF0ZSgpLmRpc3Bs YXlCb3gobGF5b3V0Qm94KS5zZXRUb3BMZWZ0KCphZGp1c3RlZFBvc2l0aW9uKTsKIH0KIAotdm9p ZCBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlV2lkdGhBbmRNYXJnaW4oY29uc3QgQm94 JiBsYXlvdXRCb3gsIGNvbnN0IENvbnN0cmFpbnRzUGFpcjxIb3Jpem9udGFsQ29uc3RyYWludHM+ JiBob3Jpem9udGFsQ29uc3RyYWludHMpCit2b2lkIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6OmNv bXB1dGVXaWR0aEFuZE1hcmdpbihjb25zdCBGbG9hdGluZ0NvbnRleHQmIGZsb2F0aW5nQ29udGV4 dCwgY29uc3QgQm94JiBsYXlvdXRCb3gsIGNvbnN0IENvbnN0cmFpbnRzUGFpcjxIb3Jpem9udGFs Q29uc3RyYWludHM+JiBob3Jpem9udGFsQ29uc3RyYWludHMpCiB7CiAgICAgYXV0byBjb21wdXRl ID0gWyZdKE9wdGlvbmFsPExheW91dFVuaXQ+IHVzZWRXaWR0aCkgLT4gQ29udGVudFdpZHRoQW5k TWFyZ2luIHsKLSAgICAgICAgaWYgKGxheW91dEJveC5pc0luRmxvdygpKQotICAgICAgICAgICAg cmV0dXJuIGdlb21ldHJ5KCkuaW5GbG93V2lkdGhBbmRNYXJnaW4obGF5b3V0Qm94LCBob3Jpem9u dGFsQ29uc3RyYWludHMuY29udGFpbmluZ0Jsb2NrLCB7IHVzZWRXaWR0aCwgeyB9IH0pOwotCiAg ICAgICAgIGlmIChsYXlvdXRCb3guaXNGbG9hdGluZ1Bvc2l0aW9uZWQoKSkKICAgICAgICAgICAg IHJldHVybiBnZW9tZXRyeSgpLmZsb2F0aW5nV2lkdGhBbmRNYXJnaW4obGF5b3V0Qm94LCBob3Jp em9udGFsQ29uc3RyYWludHMuY29udGFpbmluZ0Jsb2NrLCB7IHVzZWRXaWR0aCwgeyB9IH0pOwog CisgICAgICAgIGlmIChsYXlvdXRCb3guaXNGbG9hdEF2b2lkZXIoKSkgeworICAgICAgICAgICAg YXV0byBhdmFpbGFibGVXaWR0aCA9IHVzZWRBdmFpbGFibGVXaWR0aEZvckZsb2F0QXZvaWRlcihm bG9hdGluZ0NvbnRleHQsIGxheW91dEJveCkudmFsdWVPcihob3Jpem9udGFsQ29uc3RyYWludHMu Y29udGFpbmluZ0Jsb2NrLmxvZ2ljYWxXaWR0aCk7CisgICAgICAgICAgICByZXR1cm4gZ2VvbWV0 cnkoKS5pbkZsb3dXaWR0aEFuZE1hcmdpbihsYXlvdXRCb3gsIHsgaG9yaXpvbnRhbENvbnN0cmFp bnRzLmNvbnRhaW5pbmdCbG9jay5sb2dpY2FsTGVmdCwgYXZhaWxhYmxlV2lkdGggfSwgeyB1c2Vk V2lkdGgsIHsgfSB9KTsKKyAgICAgICAgfQorCisgICAgICAgIGlmIChsYXlvdXRCb3guaXNJbkZs b3coKSkKKyAgICAgICAgICAgIHJldHVybiBnZW9tZXRyeSgpLmluRmxvd1dpZHRoQW5kTWFyZ2lu KGxheW91dEJveCwgaG9yaXpvbnRhbENvbnN0cmFpbnRzLmNvbnRhaW5pbmdCbG9jaywgeyB1c2Vk V2lkdGgsIHsgfSB9KTsKKwogICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICAgICAg cmV0dXJuIHsgfTsKICAgICB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Js b2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmggYi9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuaAppbmRleCA2MDEx NmZiYzZkNzZiNDZiMWIxNTBiNGFmODc3Y2Q4NjhmNjIwOTNmLi5mZGJhMDkyMDhiMTVmOGU0MjM4 ZWMyZjhkNDIzNjUyNTlkMWY5YzEzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv YmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuaApAQCAt NjAsNyArNjAsNyBAQCBwcml2YXRlOgogICAgIHZvaWQgbGF5b3V0Rm9ybWF0dGluZ0NvbnRleHRS b290KGNvbnN0IEJveCYsIEZsb2F0aW5nQ29udGV4dCYsIEludmFsaWRhdGlvblN0YXRlJiwgY29u c3QgQ29uc3RyYWludHNQYWlyPEhvcml6b250YWxDb25zdHJhaW50cz4mLCBjb25zdCBDb25zdHJh aW50c1BhaXI8VmVydGljYWxDb25zdHJhaW50cz4mKTsKICAgICB2b2lkIHBsYWNlSW5GbG93UG9z aXRpb25lZENoaWxkcmVuKGNvbnN0IEJveCYsIGNvbnN0IENvbnN0cmFpbnRzUGFpcjxIb3Jpem9u dGFsQ29uc3RyYWludHM+Jik7CiAKLSAgICB2b2lkIGNvbXB1dGVXaWR0aEFuZE1hcmdpbihjb25z dCBCb3gmLCBjb25zdCBDb25zdHJhaW50c1BhaXI8SG9yaXpvbnRhbENvbnN0cmFpbnRzPiYpOwor ICAgIHZvaWQgY29tcHV0ZVdpZHRoQW5kTWFyZ2luKGNvbnN0IEZsb2F0aW5nQ29udGV4dCYsIGNv bnN0IEJveCYsIGNvbnN0IENvbnN0cmFpbnRzUGFpcjxIb3Jpem9udGFsQ29uc3RyYWludHM+Jik7 CiAgICAgdm9pZCBjb21wdXRlSGVpZ2h0QW5kTWFyZ2luKGNvbnN0IEJveCYsIGNvbnN0IENvbnN0 cmFpbnRzUGFpcjxIb3Jpem9udGFsQ29uc3RyYWludHM+JiwgY29uc3QgQ29uc3RyYWludHNQYWly PFZlcnRpY2FsQ29uc3RyYWludHM+Jik7CiAKICAgICB2b2lkIGNvbXB1dGVTdGF0aWNIb3Jpem9u dGFsUG9zaXRpb24oY29uc3QgQm94JiwgY29uc3QgQ29uc3RyYWludHNQYWlyPEhvcml6b250YWxD b25zdHJhaW50cz4mKTsK