218043 2020-10-21 11:55:51 -0700 [LFC][IFC] Apply font line-spacing to <br> inline level box 2020-10-21 14:22:19 -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 1700302 0 zalan 2020-10-21 11:55:51 -0700 ssia 1700307 1 412014 zalan 2020-10-21 12:10:39 -0700 Created attachment 412014 Patch 1700315 2 412014 koivisto 2020-10-21 12:20:41 -0700 Comment on attachment 412014 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=412014&action=review > Source/WebCore/layout/inlineformatting/InlineFormattingContextGeometry.cpp:183 > + auto lineSpacing = isRootInlineBox(inlineLevelBox) || inlineLevelBox.isLineBreakBox() ? fontMetrics.lineSpacing() - logicalHeight : InlineLayoutUnit(); I usually put parenthesis around this sort of things `(a || b) ? :` since it can be difficult to parse otherwise (or just put the condition to a temporary). 1700317 3 zalan 2020-10-21 12:25:18 -0700 (In reply to Antti Koivisto from comment #2) > Comment on attachment 412014 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=412014&action=review > > > Source/WebCore/layout/inlineformatting/InlineFormattingContextGeometry.cpp:183 > > + auto lineSpacing = isRootInlineBox(inlineLevelBox) || inlineLevelBox.isLineBreakBox() ? fontMetrics.lineSpacing() - logicalHeight : InlineLayoutUnit(); > > I usually put parenthesis around this sort of things `(a || b) ? :` since it > can be difficult to parse otherwise (or just put the condition to a > temporary). good point. will fix. 1700343 4 412021 zalan 2020-10-21 13:18:51 -0700 Created attachment 412021 Patch 1700388 5 ews-feeder 2020-10-21 14:21:26 -0700 Committed r268823: <https://trac.webkit.org/changeset/268823> All reviewed patches have been landed. Closing bug and clearing flags on attachment 412021. 1700390 6 webkit-bug-importer 2020-10-21 14:22:19 -0700 <rdar://problem/70545083> 412014 2020-10-21 12:10:39 -0700 2020-10-21 13:18:49 -0700 Patch bug-218043-20201021121035.patch text/plain 4839 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjY4ODA1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTc5NmI4NDA4OGNmNjBl NDVkNzRkZWMxMjMwNjQ2NDI1NTVhYTYzYS4uMDdhZTRlMDZlNWQwMWNkZWFlYTY0MDg3NzQ4Y2Ew NWJiNGM5ZTg1MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIwLTEwLTIxICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBBcHBseSBm b250IGxpbmUtc3BhY2luZyB0byA8YnI+IGlubGluZSBsZXZlbCBib3gKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxODA0MworCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBpbmxpbmUgbGV2ZWwgYm94IGlu aXRpYXRlZCBieSA8YnI+IHNob3VsZCBiZSB2ZXJ0aWNhbGx5IHNpemVkIHRoZSBzYW1lIHdheSBh cyB0aGUgcm9vdCBpbmxpbmUgYm94IGlzLgorICAgICAgICAoZS5nLiA8ZGl2PnJvb3QgdGV4dDxi cj48L2Rpdj4gPC0gbGluZSBicmVhaydzIGlubGluZSBsZXZlbCBib3ggc2hvdWxkIG1hdGNoIHRo ZSBsYXlvdXQgYm91bmRzIG9mIHRoZSByb290IGlubGluZSBib3gpLgorCisgICAgICAgICogbGF5 b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3hCdWlsZGVyOjppc1Jvb3RJbmxpbmVC b3ggY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94QnVpbGRlcjo6aXNS b290Qm94IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJveEJ1aWxkZXI6 OnNldFZlcnRpY2FsR2VvbWV0cnlGb3JJbmxpbmVCb3ggY29uc3QpOgorICAgICAgICAoV2ViQ29y ZTo6TGF5b3V0OjpMaW5lQm94QnVpbGRlcjo6Y29uc3RydWN0SW5saW5lTGV2ZWxCb3hlcyk6CisK IDIwMjAtMTAtMjEgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAgICAg IFdlYlJUQyBWUDkgRGVjb2RlciBzaG91bGQgYmUgYWJsZSB0byB1c2UgVlRCCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5n Q29udGV4dEdlb21ldHJ5LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0 aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCmluZGV4IDQ2MzNkOTg4MTcw NDMxNmFiNWI1NTMzNmIzNDk3NmY4ZjE1NzI1MzguLjU0YmJhMDIxMjc3MGE3NzYxYmMyYTVlYzcw YzExZDc4ZmI3ZDNiYjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVm b3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0 R2VvbWV0cnkuY3BwCkBAIC01Myw2ICs1Myw5IEBAIHByaXZhdGU6CiAgICAgY29uc3QgQm94JiBy b290Qm94KCkgY29uc3QgeyByZXR1cm4gZm9ybWF0dGluZ0NvbnRleHQoKS5yb290KCk7IH0KICAg ICBMYXlvdXRTdGF0ZSYgbGF5b3V0U3RhdGUoKSBjb25zdCB7IHJldHVybiBmb3JtYXR0aW5nQ29u dGV4dCgpLmxheW91dFN0YXRlKCk7IH0KIAorICAgIGJvb2wgaXNSb290SW5saW5lQm94KGNvbnN0 IExpbmVCb3g6OklubGluZUxldmVsQm94JiBpbmxpbmVMZXZlbEJveCkgY29uc3QgeyByZXR1cm4g JmlubGluZUxldmVsQm94LmxheW91dEJveCgpID09ICZyb290Qm94KCk7IH0KKyAgICBib29sIGlz Um9vdEJveChjb25zdCBDb250YWluZXJCb3gmIGNvbnRhaW5lckJveCkgY29uc3QgeyByZXR1cm4g JmNvbnRhaW5lckJveCA9PSAmcm9vdEJveCgpOyB9CisKIHByaXZhdGU6CiAgICAgY29uc3QgSW5s aW5lRm9ybWF0dGluZ0NvbnRleHQmIG1faW5saW5lRm9ybWF0dGluZ0NvbnRleHQ7CiB9OwpAQCAt MTc3LDcgKzE4MCw3IEBAIHZvaWQgTGluZUJveEJ1aWxkZXI6OnNldFZlcnRpY2FsR2VvbWV0cnlG b3JJbmxpbmVCb3goTGluZUJveDo6SW5saW5lTGV2ZWxCb3gmIGluCiAgICAgaWYgKGxpbmVIZWln aHQuaXNOZWdhdGl2ZSgpKSB7CiAgICAgICAgIC8vIElmIGxpbmUtaGVpZ2h0IGNvbXB1dGVzIHRv IG5vcm1hbCBhbmQgZWl0aGVyIHRleHQtZWRnZSBpcyBsZWFkaW5nIG9yIHRoaXMgaXMgdGhlIHJv b3QgaW5saW5lIGJveCwKICAgICAgICAgLy8gdGhlIGZvbnTigJlzIGxpbmUgZ2FwIG1ldHJpYyBt YXkgYWxzbyBiZSBpbmNvcnBvcmF0ZWQgaW50byBBIGFuZCBEIGJ5IGFkZGluZyBoYWxmIHRvIGVh Y2ggc2lkZSBhcyBoYWxmLWxlYWRpbmcuCi0gICAgICAgIGF1dG8gbGluZVNwYWNpbmcgPSAmaW5s aW5lTGV2ZWxCb3gubGF5b3V0Qm94KCkgPT0gJnJvb3RCb3goKSA/IGZvbnRNZXRyaWNzLmxpbmVT cGFjaW5nKCkgLSBsb2dpY2FsSGVpZ2h0IDogSW5saW5lTGF5b3V0VW5pdCgpOworICAgICAgICBh dXRvIGxpbmVTcGFjaW5nID0gaXNSb290SW5saW5lQm94KGlubGluZUxldmVsQm94KSB8fCBpbmxp bmVMZXZlbEJveC5pc0xpbmVCcmVha0JveCgpID8gZm9udE1ldHJpY3MubGluZVNwYWNpbmcoKSAt IGxvZ2ljYWxIZWlnaHQgOiBJbmxpbmVMYXlvdXRVbml0KCk7CiAgICAgICAgIGFzY2VudCArPSBs aW5lU3BhY2luZyAvIDI7CiAgICAgICAgIGRlc2NlbnQgKz0gbGluZVNwYWNpbmcgLyAyOwogICAg IH0gZWxzZSB7CkBAIC0yMjMsMTcgKzIyNiwxNyBAQCB2b2lkIExpbmVCb3hCdWlsZGVyOjpjb25z dHJ1Y3RJbmxpbmVMZXZlbEJveGVzKExpbmVCb3gmIGxpbmVCb3gsIGNvbnN0IExpbmU6OlJ1bgog ICAgICAgICAvLyBXZSBvbmx5IGhhdmUgdG8gZG8gaXQgb24gdGhlIGZpcnN0IHJ1biBhcyBhbnkg c3Vic2VxdWVudCBpbmxpbmUgY29udGVudCBpcyBlaXRoZXIgYXQgdGhlIHNhbWUvaGlnaGVyIG5l c3RpbmcgbGV2ZWwgb3IKICAgICAgICAgLy8gbmVzdGVkIHdpdGggYSBbY29udGFpbmVyIHN0YXJ0 XSBydW4uCiAgICAgICAgIGF1dG8mIGZpcnN0UnVuID0gcnVuc1swXTsKLSAgICAgICAgYXV0byYg Zmlyc3RSdW5QYXJlbnRJbmxpbmVCb3ggPSBmaXJzdFJ1bi5sYXlvdXRCb3goKS5wYXJlbnQoKTsK KyAgICAgICAgYXV0byYgZmlyc3RSdW5QYXJlbnRMYXlvdXRCb3ggPSBmaXJzdFJ1bi5sYXlvdXRC b3goKS5wYXJlbnQoKTsKICAgICAgICAgLy8gSWYgdGhlIHBhcmVudCBpcyB0aGUgZm9ybWF0dGlu ZyByb290LCB3ZSBjYW4gc3RvcCBoZXJlLiBUaGlzIGlzIHJvb3QgaW5saW5lIGJveCBjb250ZW50 LCB0aGVyZSdzIG5vIG5lc3RpbmcgaW5saW5lIGJveCBmcm9tIHRoZSBwcmV2aW91cyBsaW5lKHMp CiAgICAgICAgIC8vIHVubGVzcyB0aGUgaW5saW5lIGJveCBjbG9zaW5nIChjb250YWluZXIgZW5k IHJ1bikgaXMgZm9yY2VkIG92ZXIgdG8gdGhlIGN1cnJlbnQgbGluZS4KICAgICAgICAgLy8gZS5n LgogICAgICAgICAvLyA8c3Bhbj5ub3JtYWxseSB0aGUgaW5saW5lIGJveCBjbG9zaW5nIGZvcm1z IGEgY29udGludW91cyBjb250ZW50PC9zcGFuPgogICAgICAgICAvLyA8c3Bhbj51bmxlc3MgaXQn cyBmb3JjZWQgdG8gdGhlIG5leHQgbGluZTxicj48L3NwYW4+Ci0gICAgICAgIGlmICgmZmlyc3RS dW5QYXJlbnRJbmxpbmVCb3ggPT0gJnJvb3RCb3goKSAmJiAhZmlyc3RSdW4uaXNDb250YWluZXJF bmQoKSkKKyAgICAgICAgaWYgKGlzUm9vdEJveChmaXJzdFJ1blBhcmVudExheW91dEJveCkgJiYg IWZpcnN0UnVuLmlzQ29udGFpbmVyRW5kKCkpCiAgICAgICAgICAgICByZXR1cm47Ci0gICAgICAg IGF1dG8qIGFuY2VzdG9yID0gJmZpcnN0UnVuUGFyZW50SW5saW5lQm94OworICAgICAgICBhdXRv KiBhbmNlc3RvciA9ICZmaXJzdFJ1blBhcmVudExheW91dEJveDsKICAgICAgICAgVmVjdG9yPGNv bnN0IEJveCo+IGFuY2VzdG9yc1dpdGhvdXRJbmxpbmVCb3hlczsKLSAgICAgICAgd2hpbGUgKGFu Y2VzdG9yICE9ICZyb290Qm94KCkpIHsKKyAgICAgICAgd2hpbGUgKCFpc1Jvb3RCb3goKmFuY2Vz dG9yKSkgewogICAgICAgICAgICAgYW5jZXN0b3JzV2l0aG91dElubGluZUJveGVzLmFwcGVuZChh bmNlc3Rvcik7CiAgICAgICAgICAgICBhbmNlc3RvciA9ICZhbmNlc3Rvci0+cGFyZW50KCk7CiAg ICAgICAgIH0KQEAgLTI0OCw3ICsyNTEsNyBAQCB2b2lkIExpbmVCb3hCdWlsZGVyOjpjb25zdHJ1 Y3RJbmxpbmVMZXZlbEJveGVzKExpbmVCb3gmIGxpbmVCb3gsIGNvbnN0IExpbmU6OlJ1bgogCiAg ICAgYXV0byBzdHJldGNoUm9vdElubGluZUJveElmTmVlZGVkUXVpcmsgPSBbJl0gKGNvbnN0IGF1 dG8mIGxheW91dEJveCkgewogICAgICAgICBhdXRvJiBwYXJlbnRJbmxpbmVCb3ggPSBsaW5lQm94 LmlubGluZUxldmVsQm94Rm9yTGF5b3V0Qm94KGxheW91dEJveC5wYXJlbnQoKSk7Ci0gICAgICAg IGlmICgmcGFyZW50SW5saW5lQm94LmxheW91dEJveCgpICE9ICZyb290Qm94KCkgfHwgIXBhcmVu dElubGluZUJveC5pc0VtcHR5KCkpCisgICAgICAgIGlmICghaXNSb290SW5saW5lQm94KHBhcmVu dElubGluZUJveCkgfHwgIXBhcmVudElubGluZUJveC5pc0VtcHR5KCkpCiAgICAgICAgICAgICBy ZXR1cm47CiAgICAgICAgIHNldFZlcnRpY2FsR2VvbWV0cnlGb3JJbmxpbmVCb3gocGFyZW50SW5s aW5lQm94KTsKICAgICAgICAgcGFyZW50SW5saW5lQm94LnNldElzTm9uRW1wdHkoKTsK 412021 2020-10-21 13:18:51 -0700 2020-10-21 14:21:26 -0700 Patch bug-218043-20201021131850.patch text/plain 5173 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjY4ODE4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2NiMjc1NWQxYjIyMGRi YTJhNWZmOWFlMzI1MTBmNGIxNWVkNmUwZS4uNTc5MGQyMTc4NDQ0ZTc2ZDc3NDg4YWYzNmFlZGFi MzBlYjhiZDZlMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIwLTEwLTIxICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBBcHBseSBm b250IGxpbmUtc3BhY2luZyB0byA8YnI+IGlubGluZSBsZXZlbCBib3gKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxODA0MworCisgICAgICAgIFJldmll d2VkIGJ5IEFudHRpIEtvaXZpc3RvLgorCisgICAgICAgIFRoZSBpbmxpbmUgbGV2ZWwgYm94IGlu aXRpYXRlZCBieSA8YnI+IHNob3VsZCBiZSB2ZXJ0aWNhbGx5IHNpemVkIHRoZSBzYW1lIHdheSBh cyB0aGUgcm9vdCBpbmxpbmUgYm94IGlzLgorICAgICAgICAoZS5nLiA8ZGl2PnJvb3QgdGV4dDxi cj48L2Rpdj4gPC0gbGluZSBicmVhaydzIGlubGluZSBsZXZlbCBib3ggc2hvdWxkIG1hdGNoIHRo ZSBsYXlvdXQgYm91bmRzIG9mIHRoZSByb290IGlubGluZSBib3gpLgorCisgICAgICAgICogbGF5 b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3hCdWlsZGVyOjppc1Jvb3RJbmxpbmVC b3ggY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94QnVpbGRlcjo6aXNS b290Qm94IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJveEJ1aWxkZXI6 OnNldFZlcnRpY2FsR2VvbWV0cnlGb3JJbmxpbmVCb3ggY29uc3QpOgorICAgICAgICAoV2ViQ29y ZTo6TGF5b3V0OjpMaW5lQm94QnVpbGRlcjo6Y29uc3RydWN0SW5saW5lTGV2ZWxCb3hlcyk6CisK IDIwMjAtMTAtMjEgIEFudHRpIEtvaXZpc3RvICA8YW50dGlAYXBwbGUuY29tPgogCiAgICAgICAg IFtMRkNdW0ludGVncmF0aW9uXSBVcGRhdGUgc3R5bGUgb2YgY29udGFpbmVkIGxheW91dCBib3hl cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5s aW5lRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv aW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcAppbmRl eCA5NzRlODY0NDE5Mjg0ODEyYmY5YzE1YjYyMTQyNGQxODBmODVjZmZkLi5hNmIyNGEzNjU2MDEx MzEyNjdhMzAzMDQ2ZWE4MmFkYWNkMzQ4ODRhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3Jt YXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcApAQCAtNTMsNiArNTMsOSBAQCBwcml2YXRlOgogICAg IGNvbnN0IEJveCYgcm9vdEJveCgpIGNvbnN0IHsgcmV0dXJuIGZvcm1hdHRpbmdDb250ZXh0KCku cm9vdCgpOyB9CiAgICAgTGF5b3V0U3RhdGUmIGxheW91dFN0YXRlKCkgY29uc3QgeyByZXR1cm4g Zm9ybWF0dGluZ0NvbnRleHQoKS5sYXlvdXRTdGF0ZSgpOyB9CiAKKyAgICBib29sIGlzUm9vdElu bGluZUJveChjb25zdCBMaW5lQm94OjpJbmxpbmVMZXZlbEJveCYgaW5saW5lTGV2ZWxCb3gpIGNv bnN0IHsgcmV0dXJuICZpbmxpbmVMZXZlbEJveC5sYXlvdXRCb3goKSA9PSAmcm9vdEJveCgpOyB9 CisgICAgYm9vbCBpc1Jvb3RCb3goY29uc3QgQ29udGFpbmVyQm94JiBjb250YWluZXJCb3gpIGNv bnN0IHsgcmV0dXJuICZjb250YWluZXJCb3ggPT0gJnJvb3RCb3goKTsgfQorCiBwcml2YXRlOgog ICAgIGNvbnN0IElubGluZUZvcm1hdHRpbmdDb250ZXh0JiBtX2lubGluZUZvcm1hdHRpbmdDb250 ZXh0OwogfTsKQEAgLTE3Nyw5ICsxODAsMTIgQEAgdm9pZCBMaW5lQm94QnVpbGRlcjo6c2V0VmVy dGljYWxHZW9tZXRyeUZvcklubGluZUJveChMaW5lQm94OjpJbmxpbmVMZXZlbEJveCYgaW4KICAg ICBpZiAobGluZUhlaWdodC5pc05lZ2F0aXZlKCkpIHsKICAgICAgICAgLy8gSWYgbGluZS1oZWln aHQgY29tcHV0ZXMgdG8gbm9ybWFsIGFuZCBlaXRoZXIgdGV4dC1lZGdlIGlzIGxlYWRpbmcgb3Ig dGhpcyBpcyB0aGUgcm9vdCBpbmxpbmUgYm94LAogICAgICAgICAvLyB0aGUgZm9udOKAmXMgbGlu ZSBnYXAgbWV0cmljIG1heSBhbHNvIGJlIGluY29ycG9yYXRlZCBpbnRvIEEgYW5kIEQgYnkgYWRk aW5nIGhhbGYgdG8gZWFjaCBzaWRlIGFzIGhhbGYtbGVhZGluZy4KLSAgICAgICAgYXV0byBsaW5l U3BhY2luZyA9ICZpbmxpbmVMZXZlbEJveC5sYXlvdXRCb3goKSA9PSAmcm9vdEJveCgpID8gZm9u dE1ldHJpY3MubGluZVNwYWNpbmcoKSAtIGxvZ2ljYWxIZWlnaHQgOiBJbmxpbmVMYXlvdXRVbml0 KCk7Ci0gICAgICAgIGFzY2VudCArPSBsaW5lU3BhY2luZyAvIDI7Ci0gICAgICAgIGRlc2NlbnQg Kz0gbGluZVNwYWNpbmcgLyAyOworICAgICAgICBhdXRvIHNob3VsZExpbmVHYXBTdHJldGNoSW5s aW5lTGV2ZWxCb3ggPSBpc1Jvb3RJbmxpbmVCb3goaW5saW5lTGV2ZWxCb3gpIHx8IGlubGluZUxl dmVsQm94LmlzTGluZUJyZWFrQm94KCk7CisgICAgICAgIGlmIChzaG91bGRMaW5lR2FwU3RyZXRj aElubGluZUxldmVsQm94KSB7CisgICAgICAgICAgICBhdXRvIGhhbGZMaW5lR2FwID0gKGZvbnRN ZXRyaWNzLmxpbmVTcGFjaW5nKCkgLSBsb2dpY2FsSGVpZ2h0KSAvIDI7CisgICAgICAgICAgICBh c2NlbnQgKz0gaGFsZkxpbmVHYXA7CisgICAgICAgICAgICBkZXNjZW50ICs9IGhhbGZMaW5lR2Fw OworICAgICAgICB9CiAgICAgfSBlbHNlIHsKICAgICAgICAgSW5saW5lTGF5b3V0VW5pdCBsaW5l SGVpZ2h0ID0gc3R5bGUuY29tcHV0ZWRMaW5lSGVpZ2h0KCk7CiAgICAgICAgIElubGluZUxheW91 dFVuaXQgaGFsZkxlYWRpbmcgPSAobGluZUhlaWdodCAtIChhc2NlbnQgKyBkZXNjZW50KSkgLyAy OwpAQCAtMjIzLDE3ICsyMjksMTcgQEAgdm9pZCBMaW5lQm94QnVpbGRlcjo6Y29uc3RydWN0SW5s aW5lTGV2ZWxCb3hlcyhMaW5lQm94JiBsaW5lQm94LCBjb25zdCBMaW5lOjpSdW4KICAgICAgICAg Ly8gV2Ugb25seSBoYXZlIHRvIGRvIGl0IG9uIHRoZSBmaXJzdCBydW4gYXMgYW55IHN1YnNlcXVl bnQgaW5saW5lIGNvbnRlbnQgaXMgZWl0aGVyIGF0IHRoZSBzYW1lL2hpZ2hlciBuZXN0aW5nIGxl dmVsIG9yCiAgICAgICAgIC8vIG5lc3RlZCB3aXRoIGEgW2NvbnRhaW5lciBzdGFydF0gcnVuLgog ICAgICAgICBhdXRvJiBmaXJzdFJ1biA9IHJ1bnNbMF07Ci0gICAgICAgIGF1dG8mIGZpcnN0UnVu UGFyZW50SW5saW5lQm94ID0gZmlyc3RSdW4ubGF5b3V0Qm94KCkucGFyZW50KCk7CisgICAgICAg IGF1dG8mIGZpcnN0UnVuUGFyZW50TGF5b3V0Qm94ID0gZmlyc3RSdW4ubGF5b3V0Qm94KCkucGFy ZW50KCk7CiAgICAgICAgIC8vIElmIHRoZSBwYXJlbnQgaXMgdGhlIGZvcm1hdHRpbmcgcm9vdCwg d2UgY2FuIHN0b3AgaGVyZS4gVGhpcyBpcyByb290IGlubGluZSBib3ggY29udGVudCwgdGhlcmUn cyBubyBuZXN0aW5nIGlubGluZSBib3ggZnJvbSB0aGUgcHJldmlvdXMgbGluZShzKQogICAgICAg ICAvLyB1bmxlc3MgdGhlIGlubGluZSBib3ggY2xvc2luZyAoY29udGFpbmVyIGVuZCBydW4pIGlz IGZvcmNlZCBvdmVyIHRvIHRoZSBjdXJyZW50IGxpbmUuCiAgICAgICAgIC8vIGUuZy4KICAgICAg ICAgLy8gPHNwYW4+bm9ybWFsbHkgdGhlIGlubGluZSBib3ggY2xvc2luZyBmb3JtcyBhIGNvbnRp bnVvdXMgY29udGVudDwvc3Bhbj4KICAgICAgICAgLy8gPHNwYW4+dW5sZXNzIGl0J3MgZm9yY2Vk IHRvIHRoZSBuZXh0IGxpbmU8YnI+PC9zcGFuPgotICAgICAgICBpZiAoJmZpcnN0UnVuUGFyZW50 SW5saW5lQm94ID09ICZyb290Qm94KCkgJiYgIWZpcnN0UnVuLmlzQ29udGFpbmVyRW5kKCkpCisg ICAgICAgIGlmIChpc1Jvb3RCb3goZmlyc3RSdW5QYXJlbnRMYXlvdXRCb3gpICYmICFmaXJzdFJ1 bi5pc0NvbnRhaW5lckVuZCgpKQogICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICBhdXRvKiBh bmNlc3RvciA9ICZmaXJzdFJ1blBhcmVudElubGluZUJveDsKKyAgICAgICAgYXV0byogYW5jZXN0 b3IgPSAmZmlyc3RSdW5QYXJlbnRMYXlvdXRCb3g7CiAgICAgICAgIFZlY3Rvcjxjb25zdCBCb3gq PiBhbmNlc3RvcnNXaXRob3V0SW5saW5lQm94ZXM7Ci0gICAgICAgIHdoaWxlIChhbmNlc3RvciAh PSAmcm9vdEJveCgpKSB7CisgICAgICAgIHdoaWxlICghaXNSb290Qm94KCphbmNlc3RvcikpIHsK ICAgICAgICAgICAgIGFuY2VzdG9yc1dpdGhvdXRJbmxpbmVCb3hlcy5hcHBlbmQoYW5jZXN0b3Ip OwogICAgICAgICAgICAgYW5jZXN0b3IgPSAmYW5jZXN0b3ItPnBhcmVudCgpOwogICAgICAgICB9 CkBAIC0yNDgsNyArMjU0LDcgQEAgdm9pZCBMaW5lQm94QnVpbGRlcjo6Y29uc3RydWN0SW5saW5l TGV2ZWxCb3hlcyhMaW5lQm94JiBsaW5lQm94LCBjb25zdCBMaW5lOjpSdW4KIAogICAgIGF1dG8g c3RyZXRjaFJvb3RJbmxpbmVCb3hJZk5lZWRlZFF1aXJrID0gWyZdIChjb25zdCBhdXRvJiBsYXlv dXRCb3gpIHsKICAgICAgICAgYXV0byYgcGFyZW50SW5saW5lQm94ID0gbGluZUJveC5pbmxpbmVM ZXZlbEJveEZvckxheW91dEJveChsYXlvdXRCb3gucGFyZW50KCkpOwotICAgICAgICBpZiAoJnBh cmVudElubGluZUJveC5sYXlvdXRCb3goKSAhPSAmcm9vdEJveCgpIHx8ICFwYXJlbnRJbmxpbmVC b3guaXNFbXB0eSgpKQorICAgICAgICBpZiAoIWlzUm9vdElubGluZUJveChwYXJlbnRJbmxpbmVC b3gpIHx8ICFwYXJlbnRJbmxpbmVCb3guaXNFbXB0eSgpKQogICAgICAgICAgICAgcmV0dXJuOwog ICAgICAgICBzZXRWZXJ0aWNhbEdlb21ldHJ5Rm9ySW5saW5lQm94KHBhcmVudElubGluZUJveCk7 CiAgICAgICAgIHBhcmVudElubGluZUJveC5zZXRJc05vbkVtcHR5KCk7Cg==