220245 2021-01-04 08:49:02 -0800 [LFC][IFC] InlineBox::setHasContent should be called when the inline box actually has some content 2021-01-11 06:57:12 -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 1717131 0 zalan 2021-01-04 08:49:02 -0800 ssia 1717132 1 416946 zalan 2021-01-04 08:52:27 -0800 Created attachment 416946 Patch 1718615 2 417358 zalan 2021-01-10 18:02:49 -0800 Created attachment 417358 Patch 1718676 3 ews-feeder 2021-01-11 06:56:10 -0800 Committed r271359: <https://trac.webkit.org/changeset/271359> All reviewed patches have been landed. Closing bug and clearing flags on attachment 417358. 1718677 4 webkit-bug-importer 2021-01-11 06:57:12 -0800 <rdar://problem/72996459> 416946 2021-01-04 08:52:27 -0800 2021-01-10 18:02:48 -0800 Patch bug-220245-20210104085226.patch text/plain 5438 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxMTE4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2Y1Y2I5ZWVkYjgwNGQx ZjE0NjdiOTZmNTU1NWRjNmE3MDMzMGU3ZS4uNDc4NzIxNTQ3MjA5ZTI0NjM1OGQ4NjlmYmUzZjgx NmNjMDA5ZmY2ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTAxLTA0ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBJbmxpbmVC b3g6OnNldEhhc0NvbnRlbnQgc2hvdWxkIGJlIGNhbGxlZCB3aGVuIHRoZSBpbmxpbmUgYm94IGFj dHVhbGx5IGhhcyBzb21lIGNvbnRlbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIyMDI0NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIE1vdmUgdGhlICJ3aWxsIHN0cmV0Y2ggdGhlIGxpbmUiIGxvZ2ljIHRv IFF1aXJrczo6aW5saW5lTGV2ZWxCb3hBZmZlY3RzTGluZUJveC4KKyAgICAgICAgVGhpcyBpcyBh bHNvIGluIHByZXBhcmF0aW9uIGZvciBtYWtpbmcgaXMtY29uc2lkZXJlZC1lbXB0eSBtb3JlIGV4 cGxpY2l0IGluIGdlbmVyYWwgZm9yIGxpbmUvbGluZSBib3guCisgICAgICAgIChRdWlya3M6Omlu bGluZUxldmVsQm94QWZmZWN0c0xpbmVCb3ggaXMgdGhlIG9ubHkgY2xpZW50IG9mIExpbmVCb3g6 OmlzQ29uc2lkZXJlZEVtcHR5KQorCisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcv SW5saW5lRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpM YXlvdXQ6OkxpbmVCb3hCdWlsZGVyOjpjb25zdHJ1Y3RJbmxpbmVMZXZlbEJveGVzKToKKyAgICAg ICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dFF1aXJr cy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUZvcm1hdHRpbmdDb250ZXh0 OjpRdWlya3M6OmlubGluZUxldmVsQm94QWZmZWN0c0xpbmVCb3ggY29uc3QpOgorCiAyMDIxLTAx LTAzICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xGQ11bSUZD XSBNYWtlICJpbmxpbmUgbGV2ZWwgYm94IGFmZmVjdHMgbGluZSBib3ggZ2VvbWV0cnkiIGxvZ2lj IG1vcmUgZXhwbGljaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVm b3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwIGIvU291cmNlL1dl YkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRHZW9t ZXRyeS5jcHAKaW5kZXggNWNhZGJhZDdmYzY1OThmZGY3ODBlZTdlN2MyNWZjMWM0NDZmY2YyNC4u MzBiYWQxZjNkNTcyODBmMzU3M2Y2MWJiMWQzMWM2N2Y4MDVjOGE5NyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRl eHRHZW9tZXRyeS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRp bmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAKQEAgLTIxNywxMSArMjE3LDYg QEAgdm9pZCBMaW5lQm94QnVpbGRlcjo6Y29uc3RydWN0SW5saW5lTGV2ZWxCb3hlcyhMaW5lQm94 JiBsaW5lQm94LCBjb25zdCBMaW5lOjpSdW4KIAogICAgIGF1dG8gY3JlYXRlUm9vdElubGluZUJv eCA9IFsmXSB7CiAgICAgICAgIGF1dG8gcm9vdElubGluZUJveCA9IExpbmVCb3g6OklubGluZUxl dmVsQm94OjpjcmVhdGVSb290SW5saW5lQm94KHJvb3RCb3goKSwgaG9yaXpvbnRhbEFsaWdtZW50 T2Zmc2V0LCBsaW5lQm94LmxvZ2ljYWxXaWR0aCgpKTsKLQotICAgICAgICBhdXRvIGlubGluZUJv eEhhc0ltYWdpbmFyeVN0cnV0ID0gbGF5b3V0U3RhdGUoKS5pbk5vUXVpcmtzTW9kZSgpOwotICAg ICAgICBhdXRvIGlzSW5pdGlhbGx5Q29uc2lkZXJlZE5vbkVtcHR5ID0gIWxpbmVCb3guaXNDb25z aWRlcmVkRW1wdHkoKSAmJiBpbmxpbmVCb3hIYXNJbWFnaW5hcnlTdHJ1dDsKLSAgICAgICAgaWYg KGlzSW5pdGlhbGx5Q29uc2lkZXJlZE5vbkVtcHR5KQotICAgICAgICAgICAgcm9vdElubGluZUJv eC0+c2V0SGFzQ29udGVudCgpOwogICAgICAgICBzZXRWZXJ0aWNhbEdlb21ldHJ5Rm9ySW5saW5l Qm94KCpyb290SW5saW5lQm94KTsKICAgICAgICAgc2ltcGxpZmllZFZlcnRpY2FsQWxpZ25tZW50 ID0geyB7IH0gLCByb290SW5saW5lQm94LT5sYXlvdXRCb3VuZHMoKS5oZWlnaHQoKSwgcm9vdElu bGluZUJveC0+bGF5b3V0Qm91bmRzKCkuYXNjZW50IC0gcm9vdElubGluZUJveC0+YmFzZWxpbmUo KSB9OwogICAgICAgICBsaW5lQm94LmFkZFJvb3RJbmxpbmVCb3goV1RGTW92ZShyb290SW5saW5l Qm94KSk7CkBAIC0zMTUsMTIgKzMxMCw2IEBAIHZvaWQgTGluZUJveEJ1aWxkZXI6OmNvbnN0cnVj dElubGluZUxldmVsQm94ZXMoTGluZUJveCYgbGluZUJveCwgY29uc3QgTGluZTo6UnVuCiAgICAg ICAgICAgICBhdXRvIGluaXRpYWxMb2dpY2FsV2lkdGggPSBsaW5lQm94LmxvZ2ljYWxXaWR0aCgp IC0gcnVuLmxvZ2ljYWxMZWZ0KCk7CiAgICAgICAgICAgICBBU1NFUlQoaW5pdGlhbExvZ2ljYWxX aWR0aCA+PSAwKTsKICAgICAgICAgICAgIGF1dG8gaW5saW5lQm94ID0gTGluZUJveDo6SW5saW5l TGV2ZWxCb3g6OmNyZWF0ZUlubGluZUJveChsYXlvdXRCb3gsIGxvZ2ljYWxMZWZ0LCBpbml0aWFs TG9naWNhbFdpZHRoKTsKLSAgICAgICAgICAgIGF1dG8mIGlubGluZUJveEdlb21ldHJ5ID0gZm9y bWF0dGluZ0NvbnRleHQoKS5nZW9tZXRyeUZvckJveChsYXlvdXRCb3gpOwotICAgICAgICAgICAg Ly8gSW5saW5lIGxldmVsIGJveGVzIG9uIGVtcHR5IGxpbmVzIGFyZSBzdGlsbCBjb25zaWRlcmVk IGVtcHR5IChlLmcuIDxzcGFuPjxkaXY+cHJlIGFuZCBwb3N0IGJsb2NrcyBhcmUgZW1wdHk8L2Rp dj48L3NwYW4+KQotICAgICAgICAgICAgYXV0byBpbmxpbmVCb3hIYXNJbWFnaW5hcnlTdHJ1dCA9 IGxheW91dFN0YXRlKCkuaW5Ob1F1aXJrc01vZGUoKSAmJiAhbGluZUJveC5pc0NvbnNpZGVyZWRF bXB0eSgpOwotICAgICAgICAgICAgYXV0byBpc0NvbnNpZGVyZWROb25FbXB0eSA9IGlubGluZUJv eEhhc0ltYWdpbmFyeVN0cnV0IHx8IGlubGluZUJveEdlb21ldHJ5Lmhvcml6b250YWxQYWRkaW5n KCkudmFsdWVPcigwX2x1KSB8fCBpbmxpbmVCb3hHZW9tZXRyeS5ob3Jpem9udGFsQm9yZGVyKCk7 Ci0gICAgICAgICAgICBpZiAoaXNDb25zaWRlcmVkTm9uRW1wdHkpCi0gICAgICAgICAgICAgICAg aW5saW5lQm94LT5zZXRIYXNDb250ZW50KCk7CiAgICAgICAgICAgICBzZXRWZXJ0aWNhbEdlb21l dHJ5Rm9ySW5saW5lQm94KCppbmxpbmVCb3gpOwogICAgICAgICAgICAgbGluZUJveC5hZGRJbmxp bmVMZXZlbEJveChXVEZNb3ZlKGlubGluZUJveCkpOwogICAgICAgICAgICAgY29udGludWU7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVG b3JtYXR0aW5nQ29udGV4dFF1aXJrcy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5l Zm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dFF1aXJrcy5jcHAKaW5kZXggZGJjY2Ri MTAyYmY5NTRjZWY2NzU3MjdlZmE1ZjgzOTI3M2FhNjk4Ni4uMjBlMDcyZWI5YzlkOWE5MzIxNmRk ZjczNjBmOTYyN2IwOGM4N2UwYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lu bGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRRdWlya3MuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250 ZXh0UXVpcmtzLmNwcApAQCAtNDIsOCArNDIsMjAgQEAgSW5saW5lTGF5b3V0VW5pdCBJbmxpbmVG b3JtYXR0aW5nQ29udGV4dDo6UXVpcmtzOjppbml0aWFsTGluZUhlaWdodCgpIGNvbnN0CiAKIGJv b2wgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OlF1aXJrczo6aW5saW5lTGV2ZWxCb3hBZmZlY3Rz TGluZUJveChjb25zdCBMaW5lQm94OjpJbmxpbmVMZXZlbEJveCYgaW5saW5lTGV2ZWxCb3gsIGNv bnN0IExpbmVCb3gmIGxpbmVCb3gpIGNvbnN0CiB7Ci0gICAgaWYgKGlubGluZUxldmVsQm94Lmlz SW5saW5lQm94KCkpCi0gICAgICAgIHJldHVybiBpbmxpbmVMZXZlbEJveC5oYXNDb250ZW50KCk7 CisgICAgaWYgKGlubGluZUxldmVsQm94LmlzSW5saW5lQm94KCkpIHsKKyAgICAgICAgLy8gSW5s aW5lIGJveGVzIChlLmcuIHJvb3QgaW5saW5lIGJveCBvciA8c3Bhbj4pIGFmZmVjdHMgbGluZSBi b3hlcyBlaXRoZXIgdGhyb3VnaCB0aGUgc3RydXQgb3IgYWN0dWFsIGNvbnRlbnQuCisgICAgICAg IGlmIChpbmxpbmVMZXZlbEJveC5oYXNDb250ZW50KCkpCisgICAgICAgICAgICByZXR1cm4gdHJ1 ZTsKKyAgICAgICAgaWYgKCFpbmxpbmVMZXZlbEJveC5pc1Jvb3RJbmxpbmVCb3goKSkgeworICAg ICAgICAgICAgYXV0byYgYm94R2VvbWV0cnkgPSBmb3JtYXR0aW5nQ29udGV4dCgpLmdlb21ldHJ5 Rm9yQm94KGlubGluZUxldmVsQm94LmxheW91dEJveCgpKTsKKyAgICAgICAgICAgIGlmIChib3hH ZW9tZXRyeS5ob3Jpem9udGFsQm9yZGVyKCkgfHwgYm94R2VvbWV0cnkuaG9yaXpvbnRhbFBhZGRp bmcoKS52YWx1ZU9yKDBfbHUpKSB7CisgICAgICAgICAgICAgICAgLy8gSG9yaXpvbnRhbCBib3Jk ZXIgYW5kIHBhZGRpbmcgbWFrZSB0aGUgaW5saW5lIGJveCBzdHJldGNoIHRoZSBsaW5lIChlLmcu IDxzcGFuIHN0eWxlPSJwYWRkaW5nOiAxMHB4OyI+PC9zcGFuPikuCisgICAgICAgICAgICAgICAg cmV0dXJuIHRydWU7CisgICAgICAgICAgICB9CisgICAgICAgIH0KKyAgICAgICAgYXV0byBpbmxp bmVCb3hIYXNJbWFnaW5hcnlTdHJ1dCA9IGxheW91dFN0YXRlKCkuaW5Ob1F1aXJrc01vZGUoKTsK KyAgICAgICAgcmV0dXJuIGlubGluZUJveEhhc0ltYWdpbmFyeVN0cnV0ICYmICFsaW5lQm94Lmlz Q29uc2lkZXJlZEVtcHR5KCk7CisgICAgfQogICAgIGlmIChpbmxpbmVMZXZlbEJveC5pc0xpbmVC cmVha0JveCgpKSB7CiAgICAgICAgIC8vIDxicj4gaW4gbm9uLXN0YW5kYXJkIG1vZGUgc3RyZXRj aGVzIHRoZSBsaW5lIGJveCBvbmx5IHdoZW4gdGhlIGxpbmUgaXMgZW1wdHkuCiAgICAgICAgIC8v IGUuZy4gPGRpdj48c3Bhbj48YnI+PC9zcGFuPjwvZGl2PiB3aWxsIHN0cmV0Y2ggYnV0IDxkaXY+ dGhpcyB3aWxsIG5vdCBzdHJldGNoIHRvIDIwMHB4PHNwYW4gc3R5bGU9ImZvbnQtc2l6ZTogMjAw cHg7Ij48YnI+PC9zcGFuPjwvZGl2Pgo= 417358 2021-01-10 18:02:49 -0800 2021-01-11 06:56:11 -0800 Patch bug-220245-20210110180248.patch text/plain 5514 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxMzUxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGYyMWM2MzAxMWJkYjNh NmIwNzdhZWU5YWEyMzdiZGRiZDk0OTM4ZS4uZjBlMGJkZjNlM2Y0ZmMwNGVjNDMyMjU4ZDNlM2U1 ZjRhOTJmODZjYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIxLTAxLTEwICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBJbmxpbmVC b3g6OnNldEhhc0NvbnRlbnQgc2hvdWxkIGJlIGNhbGxlZCB3aGVuIHRoZSBpbmxpbmUgYm94IGFj dHVhbGx5IGhhcyBzb21lIGNvbnRlbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIyMDI0NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIERvIG5vdCBjYWxsIHNldEhhc0NvbnRlbnQgdW5sZXNzIHRoZSBpbmxp bmUgYm94IGhhcyBhY3R1YWwgY29udGVudCAoZXhjbHVkaW5nIGJvcmRlciBhbmQgcGFkZGluZyku CisgICAgICAgIEhvd2V2ZXIgdGhlICJ3aWxsIHN0cmV0Y2ggdGhlIGxpbmUiIGxvZ2ljIGNoZWNr cyBhZ2FpbnN0IGJvcmRlcnMgYW5kIHBhZGRpbmdzIHNvIG1vdmUgdGhhdCBvdmVyIHRvCisgICAg ICAgIFF1aXJrczo6aW5saW5lTGV2ZWxCb3hBZmZlY3RzTGluZUJveC4KKyAgICAgICAgVGhpcyBj aGFuZ2UgbWFrZXMgUXVpcmtzOjppbmxpbmVMZXZlbEJveEFmZmVjdHNMaW5lQm94IHRoZSBvbmx5 IGNsaWVudCBvZiBMaW5lQm94Ojppc0NvbnNpZGVyZWRFbXB0eS4KKworICAgICAgICAqIGxheW91 dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94QnVpbGRlcjo6Y29uc3RydWN0SW5saW5l TGV2ZWxCb3hlcyk6CisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9y bWF0dGluZ0NvbnRleHRRdWlya3MuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxp bmVGb3JtYXR0aW5nQ29udGV4dDo6UXVpcmtzOjppbmxpbmVMZXZlbEJveEFmZmVjdHNMaW5lQm94 IGNvbnN0KToKKwogMjAyMS0wMS0xMCAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgog CiAgICAgICAgIFtMRkNdW0lGQ10gTWFrZSAiaW5saW5lIGxldmVsIGJveCBhZmZlY3RzIGxpbmUg Ym94IGdlb21ldHJ5IiBsb2dpYyBtb3JlIGV4cGxpY2l0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dEdlb21l dHJ5LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZv cm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCmluZGV4IDA0NTk3ZmIxZDFkMzc1MjZkZTc2NjNk NWQ1ODA2NDAwYjQ0OGY3N2UuLmM2YWI4YzNiNTkxZmRlNTI1MDE0YzcxNDgwNzRjOTI0MzZhMzRk YzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lu bGluZUZvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3Bw CkBAIC0yMTcsMTEgKzIxNyw2IEBAIHZvaWQgTGluZUJveEJ1aWxkZXI6OmNvbnN0cnVjdElubGlu ZUxldmVsQm94ZXMoTGluZUJveCYgbGluZUJveCwgY29uc3QgTGluZTo6UnVuCiAKICAgICBhdXRv IGNyZWF0ZVJvb3RJbmxpbmVCb3ggPSBbJl0gewogICAgICAgICBhdXRvIHJvb3RJbmxpbmVCb3gg PSBMaW5lQm94OjpJbmxpbmVMZXZlbEJveDo6Y3JlYXRlUm9vdElubGluZUJveChyb290Qm94KCks IGhvcml6b250YWxBbGlnbWVudE9mZnNldCwgbGluZUJveC5sb2dpY2FsV2lkdGgoKSk7Ci0KLSAg ICAgICAgYXV0byBpbmxpbmVCb3hIYXNJbWFnaW5hcnlTdHJ1dCA9IGxheW91dFN0YXRlKCkuaW5O b1F1aXJrc01vZGUoKTsKLSAgICAgICAgYXV0byBpc0luaXRpYWxseUNvbnNpZGVyZWROb25FbXB0 eSA9ICFsaW5lQm94LmlzQ29uc2lkZXJlZEVtcHR5KCkgJiYgaW5saW5lQm94SGFzSW1hZ2luYXJ5 U3RydXQ7Ci0gICAgICAgIGlmIChpc0luaXRpYWxseUNvbnNpZGVyZWROb25FbXB0eSkKLSAgICAg ICAgICAgIHJvb3RJbmxpbmVCb3gtPnNldEhhc0NvbnRlbnQoKTsKICAgICAgICAgc2V0VmVydGlj YWxHZW9tZXRyeUZvcklubGluZUJveCgqcm9vdElubGluZUJveCk7CiAgICAgICAgIHNpbXBsaWZp ZWRWZXJ0aWNhbEFsaWdubWVudCA9IHsgeyB9ICwgcm9vdElubGluZUJveC0+bGF5b3V0Qm91bmRz KCkuaGVpZ2h0KCksIHJvb3RJbmxpbmVCb3gtPmxheW91dEJvdW5kcygpLmFzY2VudCAtIHJvb3RJ bmxpbmVCb3gtPmJhc2VsaW5lKCkgfTsKICAgICAgICAgbGluZUJveC5hZGRSb290SW5saW5lQm94 KFdURk1vdmUocm9vdElubGluZUJveCkpOwpAQCAtMzI2LDEyICszMjEsNiBAQCB2b2lkIExpbmVC b3hCdWlsZGVyOjpjb25zdHJ1Y3RJbmxpbmVMZXZlbEJveGVzKExpbmVCb3gmIGxpbmVCb3gsIGNv bnN0IExpbmU6OlJ1bgogICAgICAgICAgICAgYXV0byBpbml0aWFsTG9naWNhbFdpZHRoID0gbGlu ZUJveC5sb2dpY2FsV2lkdGgoKSAtIHJ1bi5sb2dpY2FsTGVmdCgpOwogICAgICAgICAgICAgQVNT RVJUKGluaXRpYWxMb2dpY2FsV2lkdGggPj0gMCk7CiAgICAgICAgICAgICBhdXRvIGlubGluZUJv eCA9IExpbmVCb3g6OklubGluZUxldmVsQm94OjpjcmVhdGVJbmxpbmVCb3gobGF5b3V0Qm94LCBs b2dpY2FsTGVmdCwgaW5pdGlhbExvZ2ljYWxXaWR0aCk7Ci0gICAgICAgICAgICBhdXRvJiBpbmxp bmVCb3hHZW9tZXRyeSA9IGZvcm1hdHRpbmdDb250ZXh0KCkuZ2VvbWV0cnlGb3JCb3gobGF5b3V0 Qm94KTsKLSAgICAgICAgICAgIC8vIElubGluZSBsZXZlbCBib3hlcyBvbiBlbXB0eSBsaW5lcyBh cmUgc3RpbGwgY29uc2lkZXJlZCBlbXB0eSAoZS5nLiA8c3Bhbj48ZGl2PnByZSBhbmQgcG9zdCBi bG9ja3MgYXJlIGVtcHR5PC9kaXY+PC9zcGFuPikKLSAgICAgICAgICAgIGF1dG8gaW5saW5lQm94 SGFzSW1hZ2luYXJ5U3RydXQgPSBsYXlvdXRTdGF0ZSgpLmluTm9RdWlya3NNb2RlKCkgJiYgIWxp bmVCb3guaXNDb25zaWRlcmVkRW1wdHkoKTsKLSAgICAgICAgICAgIGF1dG8gaXNDb25zaWRlcmVk Tm9uRW1wdHkgPSBpbmxpbmVCb3hIYXNJbWFnaW5hcnlTdHJ1dCB8fCBpbmxpbmVCb3hHZW9tZXRy eS5ob3Jpem9udGFsUGFkZGluZygpLnZhbHVlT3IoMF9sdSkgfHwgaW5saW5lQm94R2VvbWV0cnku aG9yaXpvbnRhbEJvcmRlcigpOwotICAgICAgICAgICAgaWYgKGlzQ29uc2lkZXJlZE5vbkVtcHR5 KQotICAgICAgICAgICAgICAgIGlubGluZUJveC0+c2V0SGFzQ29udGVudCgpOwogICAgICAgICAg ICAgc2V0VmVydGljYWxHZW9tZXRyeUZvcklubGluZUJveCgqaW5saW5lQm94KTsKICAgICAgICAg ICAgIGxpbmVCb3guYWRkSW5saW5lTGV2ZWxCb3goV1RGTW92ZShpbmxpbmVCb3gpKTsKICAgICAg ICAgICAgIGNvbnRpbnVlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGlu ZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRRdWlya3MuY3BwIGIvU291cmNlL1dl YkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRRdWly a3MuY3BwCmluZGV4IDViODBiNDQxYWYxOGJmNzllZGFjMzk0MjI0Yzk1YjMwYzEwNzcyMTYuLmI4 NDE3OWE0YzE0ZmQxNzJkZGZjMmQyM2FjZTQ0MDg5ZjE1Mzg0YzIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0 UXVpcmtzLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9J bmxpbmVGb3JtYXR0aW5nQ29udGV4dFF1aXJrcy5jcHAKQEAgLTQyLDggKzQyLDIwIEBAIElubGlu ZUxheW91dFVuaXQgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OlF1aXJrczo6aW5pdGlhbExpbmVI ZWlnaHQoKSBjb25zdAogCiBib29sIElubGluZUZvcm1hdHRpbmdDb250ZXh0OjpRdWlya3M6Omlu bGluZUxldmVsQm94QWZmZWN0c0xpbmVCb3goY29uc3QgTGluZUJveDo6SW5saW5lTGV2ZWxCb3gm IGlubGluZUxldmVsQm94LCBjb25zdCBMaW5lQm94JiBsaW5lQm94KSBjb25zdAogewotICAgIGlm IChpbmxpbmVMZXZlbEJveC5pc0lubGluZUJveCgpKQotICAgICAgICByZXR1cm4gaW5saW5lTGV2 ZWxCb3guaGFzQ29udGVudCgpOworICAgIGlmIChpbmxpbmVMZXZlbEJveC5pc0lubGluZUJveCgp KSB7CisgICAgICAgIC8vIElubGluZSBib3hlcyAoZS5nLiByb290IGlubGluZSBib3ggb3IgPHNw YW4+KSBhZmZlY3RzIGxpbmUgYm94ZXMgZWl0aGVyIHRocm91Z2ggdGhlIHN0cnV0IG9yIGFjdHVh bCBjb250ZW50LgorICAgICAgICBpZiAoaW5saW5lTGV2ZWxCb3guaGFzQ29udGVudCgpKQorICAg ICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgIGlmICghaW5saW5lTGV2ZWxCb3guaXNSb290 SW5saW5lQm94KCkpIHsKKyAgICAgICAgICAgIGF1dG8mIGJveEdlb21ldHJ5ID0gZm9ybWF0dGlu Z0NvbnRleHQoKS5nZW9tZXRyeUZvckJveChpbmxpbmVMZXZlbEJveC5sYXlvdXRCb3goKSk7Cisg ICAgICAgICAgICBpZiAoYm94R2VvbWV0cnkuaG9yaXpvbnRhbEJvcmRlcigpIHx8IGJveEdlb21l dHJ5Lmhvcml6b250YWxQYWRkaW5nKCkudmFsdWVPcigwX2x1KSkgeworICAgICAgICAgICAgICAg IC8vIEhvcml6b250YWwgYm9yZGVyIGFuZCBwYWRkaW5nIG1ha2UgdGhlIGlubGluZSBib3ggc3Ry ZXRjaCB0aGUgbGluZSAoZS5nLiA8c3BhbiBzdHlsZT0icGFkZGluZzogMTBweDsiPjwvc3Bhbj4p LgorICAgICAgICAgICAgICAgIHJldHVybiB0cnVlOworICAgICAgICAgICAgfQorICAgICAgICB9 CisgICAgICAgIGF1dG8gaW5saW5lQm94SGFzSW1hZ2luYXJ5U3RydXQgPSBsYXlvdXRTdGF0ZSgp LmluTm9RdWlya3NNb2RlKCk7CisgICAgICAgIHJldHVybiBpbmxpbmVCb3hIYXNJbWFnaW5hcnlT dHJ1dCAmJiAhbGluZUJveC5pc0NvbnNpZGVyZWRFbXB0eSgpOworICAgIH0KICAgICBpZiAoaW5s aW5lTGV2ZWxCb3guaXNMaW5lQnJlYWtCb3goKSkgewogICAgICAgICAvLyA8YnI+IGluIG5vbi1z dGFuZGFyZCBtb2RlIHN0cmV0Y2hlcyB0aGUgbGluZSBib3ggb25seSB3aGVuIHRoZSBsaW5lIGlz IGVtcHR5LgogICAgICAgICAvLyBlLmcuIDxkaXY+PHNwYW4+PGJyPjwvc3Bhbj48L2Rpdj4gd2ls bCBzdHJldGNoIGJ1dCA8ZGl2PnRoaXMgd2lsbCBub3Qgc3RyZXRjaCB0byAyMDBweDxzcGFuIHN0 eWxlPSJmb250LXNpemU6IDIwMHB4OyI+PGJyPjwvc3Bhbj48L2Rpdj4K