206372 2020-01-16 14:15:31 -0800 [LFC][IFC] Optimize LineLayoutContext::tryAddingInlineItems for the most common inline content 2020-01-16 20:52:11 -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 1607658 0 zalan 2020-01-16 14:15:31 -0800 ssia 1607659 1 webkit-bug-importer 2020-01-16 14:15:47 -0800 <rdar://problem/58657525> 1607663 2 387958 zalan 2020-01-16 14:17:56 -0800 Created attachment 387958 Patch 1607665 3 387958 simon.fraser 2020-01-16 14:21:58 -0800 Comment on attachment 387958 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=387958&action=review > Source/WebCore/layout/inlineformatting/LineLayoutContext.cpp:209 > +inline void LineCandidateContent::reset() Does the inlining actually make a difference? 1607724 4 zalan 2020-01-16 15:56:16 -0800 (In reply to Simon Fraser (smfr) from comment #3) > Comment on attachment 387958 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=387958&action=review > > > Source/WebCore/layout/inlineformatting/LineLayoutContext.cpp:209 > > +inline void LineCandidateContent::reset() > > Does the inlining actually make a difference? yes, this is a very hot codepath (I wouldn't have made this change otherwise) 1607827 5 388002 zalan 2020-01-16 19:04:05 -0800 Created attachment 388002 Patch 1607858 6 388002 commit-queue 2020-01-16 20:52:10 -0800 Comment on attachment 388002 Patch Clearing flags on attachment: 388002 Committed r254736: <https://trac.webkit.org/changeset/254736> 1607859 7 commit-queue 2020-01-16 20:52:11 -0800 All reviewed patches have been landed. Closing bug. 387958 2020-01-16 14:17:56 -0800 2020-01-16 19:04:04 -0800 Patch bug-206372-20200116141755.patch text/plain 7948 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjU0NzAyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWRlOTk3MDZjYWQwZmUw NWE5ZWIzZDRkNWNjNDZmOGJiMjc4NjVjMi4uZmY4MGIxMmU5YmM2N2Y2MjBjOTU0ZTkxNjMxOGM2 Y2M0ODk3YmE3OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIwLTAxLTE2ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBPcHRpbWl6 ZSBMaW5lTGF5b3V0Q29udGV4dDo6dHJ5QWRkaW5nSW5saW5lSXRlbXMgZm9yIHRoZSBtb3N0IGNv bW1vbiBpbmxpbmUgY29udGVudAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjA2MzcyCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81ODY1NzUyNT4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICB+NCUgcHJvZ3Jl c3Npb24gb24gUGVyZm9ybWFuY2VUZXN0cy9MYXlvdXQvbGluZS1sYXlvdXQtc2ltcGxlLmh0bWwu CisKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9MaW5lTGF5b3V0Q29udGV4dC5j cHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OmVuZHNXaXRoU29mdFdyYXBPcHBvcnR1bml0 eSk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OmlzQXRTb2Z0V3JhcE9wcG9ydHVuaXR5KToK KyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6bmV4dFdyYXBPcHBvcnR1bml0eSk6CisgICAgICAg IChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVDYW5kaWRhdGVDb250ZW50OjphcHBlbmRJbmxpbmVDb250 ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUNhbmRpZGF0ZUNvbnRlbnQ6OnJl c2V0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUxheW91dENvbnRleHQ6OnRyeUFk ZGluZ0lubGluZUl0ZW1zKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUxheW91dENv bnRleHQ6OmNvbW1pdFBhcnRpYWxDb250ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6 TGluZUxheW91dENvbnRleHQ6OmNvbW1pdENvbnRlbnQpOiBEZWxldGVkLgorICAgICAgICAqIGxh eW91dC9pbmxpbmVmb3JtYXR0aW5nL0xpbmVMYXlvdXRDb250ZXh0Lmg6CisKIDIwMjAtMDEtMTYg IFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXVtJRkNdIE9w dGltaXplIExpbmVDYW5kaWRhdGVDb250ZW50IGZvciB0aGUgbW9zdCBjb21tb24gdHlwZSBvZiBj b250ZW50CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGlu Zy9MaW5lTGF5b3V0Q29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9y bWF0dGluZy9MaW5lTGF5b3V0Q29udGV4dC5jcHAKaW5kZXggNjVkNjM2YmFkZjA0MmY1NTA1M2Ri ZWE4NTI5YzAxMWFlZDgzOWU4OS4uZGZiZjljYTg3NzY5MzU3ZjlhMTg0NjAzZGM2YWQyMGZmOGQy Njc1YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcv TGluZUxheW91dENvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVm b3JtYXR0aW5nL0xpbmVMYXlvdXRDb250ZXh0LmNwcApAQCAtMzUsNyArMzUsNyBAQAogbmFtZXNw YWNlIFdlYkNvcmUgewogbmFtZXNwYWNlIExheW91dCB7CiAKLXN0YXRpYyBib29sIGVuZHNXaXRo U29mdFdyYXBPcHBvcnR1bml0eShjb25zdCBJbmxpbmVUZXh0SXRlbSYgY3VycmVudFRleHRJdGVt LCBjb25zdCBJbmxpbmVUZXh0SXRlbSYgbmV4dElubGluZVRleHRJdGVtKQorc3RhdGljIGlubGlu ZSBib29sIGVuZHNXaXRoU29mdFdyYXBPcHBvcnR1bml0eShjb25zdCBJbmxpbmVUZXh0SXRlbSYg Y3VycmVudFRleHRJdGVtLCBjb25zdCBJbmxpbmVUZXh0SXRlbSYgbmV4dElubGluZVRleHRJdGVt KQogewogICAgIEFTU0VSVCghbmV4dElubGluZVRleHRJdGVtLmlzV2hpdGVzcGFjZSgpKTsKICAg ICAvLyBXZSBhcmUgYXQgdGhlIHBvc2l0aW9uIGFmdGVyIGEgd2hpdGVzcGFjZS4KQEAgLTYxLDcg KzYxLDcgQEAgc3RhdGljIGJvb2wgZW5kc1dpdGhTb2Z0V3JhcE9wcG9ydHVuaXR5KGNvbnN0IElu bGluZVRleHRJdGVtJiBjdXJyZW50VGV4dEl0ZW0sIGMKICAgICByZXR1cm4gIVRleHRVdGlsOjpm aW5kTmV4dEJyZWFrYWJsZVBvc2l0aW9uKGxpbmVCcmVha0l0ZXJhdG9yLCAwLCBuZXh0SW5saW5l VGV4dEl0ZW0uc3R5bGUoKSk7CiB9CiAKLXN0YXRpYyBib29sIGlzQXRTb2Z0V3JhcE9wcG9ydHVu aXR5KGNvbnN0IElubGluZUl0ZW0mIGN1cnJlbnQsIGNvbnN0IElubGluZUl0ZW0mIG5leHQpCitz dGF0aWMgaW5saW5lIGJvb2wgaXNBdFNvZnRXcmFwT3Bwb3J0dW5pdHkoY29uc3QgSW5saW5lSXRl bSYgY3VycmVudCwgY29uc3QgSW5saW5lSXRlbSYgbmV4dCkKIHsKICAgICAvLyAiaXMgYXQiIHNp bXBsZSBtZWFucyB0aGF0IHRoZXJlJ3MgYSBzb2Z0IHdyYXAgb3Bwb3J0dW5pdHkgcmlnaHQgYWZ0 ZXIgdGhlIFtjdXJyZW50XS4KICAgICAvLyBbdGV4dF1bIF1bdGV4dF1bY29udGFpbmVyIHN0YXJ0 XS4uLiAoPGRpdj50ZXh0IGNvbnRlbnQ8c3Bhbj4uLjwvZGl2PikKQEAgLTEwMSw3ICsxMDEsNyBA QCBzdGF0aWMgYm9vbCBpc0F0U29mdFdyYXBPcHBvcnR1bml0eShjb25zdCBJbmxpbmVJdGVtJiBj dXJyZW50LCBjb25zdCBJbmxpbmVJdGVtJgogICAgIHJldHVybiBlbmRzV2l0aFNvZnRXcmFwT3Bw b3J0dW5pdHkoY3VycmVudElubGluZVRleHRJdGVtLCBuZXh0SW5saW5lVGV4dEl0ZW0pOwogfQog Ci1zdGF0aWMgc2l6ZV90IG5leHRXcmFwT3Bwb3J0dW5pdHkoY29uc3QgSW5saW5lSXRlbXMmIGlu bGluZUNvbnRlbnQsIHVuc2lnbmVkIHN0YXJ0SW5kZXgpCitzdGF0aWMgaW5saW5lIHNpemVfdCBu ZXh0V3JhcE9wcG9ydHVuaXR5KGNvbnN0IElubGluZUl0ZW1zJiBpbmxpbmVDb250ZW50LCB1bnNp Z25lZCBzdGFydEluZGV4KQogewogICAgIC8vIDEuIEZpbmQgdGhlIHN0YXJ0IGNhbmRpZGF0ZSBi eSBza2lwcGluZyBsZWFkaW5nIG5vbi1jb250ZW50IGl0ZW1zIGUuZyA8c3Bhbj48c3Bhbj5zdGFy dCA6IHNraXAgIjxzcGFuPjxzcGFuPiIKICAgICAvLyAyLiBGaW5kIHRoZSBlbmQgY2FuZGlkYXRl IGJ5IHNraXBwaW5nIG5vbi1jb250ZW50IGl0ZW1zIGluYmV0d2VlbiBlLmcuIDxzcGFuPjxzcGFu PnN0YXJ0PC9zcGFuPmVuZDogc2tpcCAiPC9zcGFuPiIKQEAgLTIwMCwxMyArMjAwLDEzIEBAIHBy aXZhdGU6CiAgICAgY29uc3QgSW5saW5lSXRlbSogbV90cmFpbGluZ0xpbmVCcmVhayB7IG51bGxw dHIgfTsKIH07CiAKLXZvaWQgTGluZUNhbmRpZGF0ZUNvbnRlbnQ6OmFwcGVuZElubGluZUNvbnRl bnQoY29uc3QgSW5saW5lSXRlbSYgaW5saW5lSXRlbSwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2Fs V2lkdGgpCitpbmxpbmUgdm9pZCBMaW5lQ2FuZGlkYXRlQ29udGVudDo6YXBwZW5kSW5saW5lQ29u dGVudChjb25zdCBJbmxpbmVJdGVtJiBpbmxpbmVJdGVtLCBJbmxpbmVMYXlvdXRVbml0IGxvZ2lj YWxXaWR0aCkKIHsKICAgICBtX2lubGluZUNvbnRlbnRMb2dpY2FsV2lkdGggKz0gbG9naWNhbFdp ZHRoOwogICAgIG1faW5saW5lUnVucy5hcHBlbmQoeyBpbmxpbmVJdGVtLCBsb2dpY2FsV2lkdGgg fSk7CiB9CiAKLXZvaWQgTGluZUNhbmRpZGF0ZUNvbnRlbnQ6OnJlc2V0KCkKK2lubGluZSB2b2lk IExpbmVDYW5kaWRhdGVDb250ZW50OjpyZXNldCgpCiB7CiAgICAgbV9pbmxpbmVDb250ZW50TG9n aWNhbFdpZHRoID0gMDsKICAgICBtX2lubGluZVJ1bnMuY2xlYXIoKTsKQEAgLTQyMyw3ICs0MjMs OCBAQCBMaW5lTGF5b3V0Q29udGV4dDo6UmVzdWx0IExpbmVMYXlvdXRDb250ZXh0Ojp0cnlBZGRp bmdJbmxpbmVJdGVtcyhMaW5lQnJlYWtlciYgbAogICAgIGF1dG8gcmVzdWx0ID0gbGluZUJyZWFr ZXIuc2hvdWxkV3JhcElubGluZUNvbnRlbnQoY2FuZGlkYXRlUnVucywgY2FuZGlkYXRlQ29udGVu dC5pbmxpbmVDb250ZW50TG9naWNhbFdpZHRoKCksIGxpbmVTdGF0dXMpOwogICAgIGlmIChyZXN1 bHQuYWN0aW9uID09IExpbmVCcmVha2VyOjpSZXN1bHQ6OkFjdGlvbjo6S2VlcCkgewogICAgICAg ICAvLyBUaGlzIGNvbnRpbnVvdXMgY29udGVudCBjYW4gYmUgZnVsbHkgcGxhY2VkIG9uIHRoZSBj dXJyZW50IGxpbmUuCi0gICAgICAgIGNvbW1pdENvbnRlbnQobGluZSwgY2FuZGlkYXRlUnVucywg eyB9KTsKKyAgICAgICAgZm9yIChhdXRvJiBydW4gOiBjYW5kaWRhdGVSdW5zKQorICAgICAgICAg ICAgbGluZS5hcHBlbmQocnVuLmlubGluZUl0ZW0sIHJ1bi5sb2dpY2FsV2lkdGgpOwogICAgICAg ICAvLyBDb25zdW1lIHRyYWlsaW5nIGxpbmUgYnJlYWsgYXMgd2VsbC4KICAgICAgICAgaWYgKGF1 dG8qIGxpbmVCcmVha0l0ZW0gPSBjYW5kaWRhdGVDb250ZW50LnRyYWlsaW5nTGluZUJyZWFrKCkp IHsKICAgICAgICAgICAgIGxpbmUuYXBwZW5kKCpsaW5lQnJlYWtJdGVtLCAwKTsKQEAgLTQ0Miw3 ICs0NDMsNyBAQCBMaW5lTGF5b3V0Q29udGV4dDo6UmVzdWx0IExpbmVMYXlvdXRDb250ZXh0Ojp0 cnlBZGRpbmdJbmxpbmVJdGVtcyhMaW5lQnJlYWtlciYgbAogICAgIGlmIChyZXN1bHQuYWN0aW9u ID09IExpbmVCcmVha2VyOjpSZXN1bHQ6OkFjdGlvbjo6U3BsaXQpIHsKICAgICAgICAgLy8gQ29t bWl0IHRoZSBjb21iaW5hdGlvbiBvZiBmdWxsIGFuZCBwYXJ0aWFsIGNvbnRlbnQgb24gdGhlIGN1 cnJlbnQgbGluZS4KICAgICAgICAgQVNTRVJUKHJlc3VsdC5wYXJ0aWFsVHJhaWxpbmdDb250ZW50 KTsKLSAgICAgICAgY29tbWl0Q29udGVudChsaW5lLCBjYW5kaWRhdGVSdW5zLCByZXN1bHQucGFy dGlhbFRyYWlsaW5nQ29udGVudCk7CisgICAgICAgIGNvbW1pdFBhcnRpYWxDb250ZW50KGxpbmUs IGNhbmRpZGF0ZVJ1bnMsICpyZXN1bHQucGFydGlhbFRyYWlsaW5nQ29udGVudCk7CiAgICAgICAg IC8vIFdoZW4gc3BsaXR0aW5nIG11bHRpcGxlIHJ1bnMgPHNwYW4gc3R5bGU9IndvcmQtYnJlYWs6 IGJyZWFrLWFsbCI+dGV4dDwvc3Bhbj48c3Bhbj5jb250ZW50PC9zcGFuPiwgd2UgbWlnaHQgZW5k IHVwIHNwbGl0dGluZyB0aGVtIGF0IHJ1biBib3VuZGFyeS4KICAgICAgICAgLy8gSXQgc2ltcGx5 IG1lYW5zIHdlIGRvbid0IHJlYWxseSBoYXZlIGEgcGFydGlhbCBydW4uIFBhcnRpYWwgY29udGVu dCB5ZXMsIGJ1dCBub3QgcGFydGlhbCBydW4uCiAgICAgICAgIGF1dG8gdHJhaWxpbmdSdW5JbmRl eCA9IHJlc3VsdC5wYXJ0aWFsVHJhaWxpbmdDb250ZW50LT50cmFpbGluZ1J1bkluZGV4OwpAQCAt NDU5LDE1ICs0NjAsMTUgQEAgTGluZUxheW91dENvbnRleHQ6OlJlc3VsdCBMaW5lTGF5b3V0Q29u dGV4dDo6dHJ5QWRkaW5nSW5saW5lSXRlbXMoTGluZUJyZWFrZXImIGwKICAgICByZXR1cm4geyBM aW5lQnJlYWtlcjo6SXNFbmRPZkxpbmU6Ok5vIH07CiB9CiAKLXZvaWQgTGluZUxheW91dENvbnRl eHQ6OmNvbW1pdENvbnRlbnQoTGluZUJ1aWxkZXImIGxpbmUsIGNvbnN0IExpbmVCcmVha2VyOjpS dW5MaXN0JiBydW5zLCBPcHRpb25hbDxMaW5lQnJlYWtlcjo6UmVzdWx0OjpQYXJ0aWFsVHJhaWxp bmdDb250ZW50PiBwYXJ0aWFsVHJhaWxpbmdDb250ZW50KQordm9pZCBMaW5lTGF5b3V0Q29udGV4 dDo6Y29tbWl0UGFydGlhbENvbnRlbnQoTGluZUJ1aWxkZXImIGxpbmUsIGNvbnN0IExpbmVCcmVh a2VyOjpSdW5MaXN0JiBydW5zLCBjb25zdCBMaW5lQnJlYWtlcjo6UmVzdWx0OjpQYXJ0aWFsVHJh aWxpbmdDb250ZW50JiBwYXJ0aWFsVHJhaWxpbmdDb250ZW50KQogewogICAgIGZvciAoc2l6ZV90 IGluZGV4ID0gMDsgaW5kZXggPCBydW5zLnNpemUoKTsgKytpbmRleCkgewogICAgICAgICBhdXRv JiBydW4gPSBydW5zW2luZGV4XTsKLSAgICAgICAgaWYgKHBhcnRpYWxUcmFpbGluZ0NvbnRlbnQg JiYgcGFydGlhbFRyYWlsaW5nQ29udGVudC0+dHJhaWxpbmdSdW5JbmRleCA9PSBpbmRleCkgewor ICAgICAgICBpZiAocGFydGlhbFRyYWlsaW5nQ29udGVudC50cmFpbGluZ1J1bkluZGV4ID09IGlu ZGV4KSB7CiAgICAgICAgICAgICBBU1NFUlQocnVuLmlubGluZUl0ZW0uaXNUZXh0KCkpOwogICAg ICAgICAgICAgLy8gQ3JlYXRlIGFuZCBjb21taXQgcGFydGlhbCB0cmFpbGluZyBpdGVtLgotICAg ICAgICAgICAgaWYgKGF1dG8gcGFydGlhbFJ1biA9IHBhcnRpYWxUcmFpbGluZ0NvbnRlbnQtPnBh cnRpYWxSdW4pIHsKLSAgICAgICAgICAgICAgICBhdXRvJiB0cmFpbGluZ0lubGluZVRleHRJdGVt ID0gZG93bmNhc3Q8SW5saW5lVGV4dEl0ZW0+KHJ1bnNbcGFydGlhbFRyYWlsaW5nQ29udGVudC0+ dHJhaWxpbmdSdW5JbmRleF0uaW5saW5lSXRlbSk7CisgICAgICAgICAgICBpZiAoYXV0byBwYXJ0 aWFsUnVuID0gcGFydGlhbFRyYWlsaW5nQ29udGVudC5wYXJ0aWFsUnVuKSB7CisgICAgICAgICAg ICAgICAgYXV0byYgdHJhaWxpbmdJbmxpbmVUZXh0SXRlbSA9IGRvd25jYXN0PElubGluZVRleHRJ dGVtPihydW5zW3BhcnRpYWxUcmFpbGluZ0NvbnRlbnQudHJhaWxpbmdSdW5JbmRleF0uaW5saW5l SXRlbSk7CiAgICAgICAgICAgICAgICAgLy8gRklYTUU6IExpbmVCdWlsZGVyIHNob3VsZCBub3Qg aG9sZCBvbiB0byB0aGUgSW5saW5lSXRlbS4KICAgICAgICAgICAgICAgICBBU1NFUlQoIW1fcGFy dGlhbFRyYWlsaW5nVGV4dEl0ZW0pOwogICAgICAgICAgICAgICAgIG1fcGFydGlhbFRyYWlsaW5n VGV4dEl0ZW0gPSB0cmFpbGluZ0lubGluZVRleHRJdGVtLmxlZnQocGFydGlhbFJ1bi0+bGVuZ3Ro KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0xp bmVMYXlvdXRDb250ZXh0LmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGlu Zy9MaW5lTGF5b3V0Q29udGV4dC5oCmluZGV4IGQwZGY4ZTYyOGVjYmY3Y2I2YjZhM2U1MjExNGNm OTdlZjM1NzgxN2YuLjljYzY1YTMyZjk0MjRmZjg1NzY4NTYzY2ZlYzIxYzkzYzExNDQ3MmUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0xpbmVMYXlv dXRDb250ZXh0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcv TGluZUxheW91dENvbnRleHQuaApAQCAtNjMsNyArNjMsNyBAQCBwcml2YXRlOgogICAgIH07CiAg ICAgUmVzdWx0IHRyeUFkZGluZ0Zsb2F0SXRlbXMoTGluZUJ1aWxkZXImLCBjb25zdCBGbG9hdExp c3QmKTsKICAgICBSZXN1bHQgdHJ5QWRkaW5nSW5saW5lSXRlbXMoTGluZUJyZWFrZXImLCBMaW5l QnVpbGRlciYsIGNvbnN0IExpbmVDYW5kaWRhdGVDb250ZW50Jik7Ci0gICAgdm9pZCBjb21taXRD b250ZW50KExpbmVCdWlsZGVyJiwgY29uc3QgTGluZUJyZWFrZXI6OlJ1bkxpc3QmLCBPcHRpb25h bDxMaW5lQnJlYWtlcjo6UmVzdWx0OjpQYXJ0aWFsVHJhaWxpbmdDb250ZW50Pik7CisgICAgdm9p ZCBjb21taXRQYXJ0aWFsQ29udGVudChMaW5lQnVpbGRlciYsIGNvbnN0IExpbmVCcmVha2VyOjpS dW5MaXN0JiwgY29uc3QgTGluZUJyZWFrZXI6OlJlc3VsdDo6UGFydGlhbFRyYWlsaW5nQ29udGVu dCYpOwogICAgIExpbmVDb250ZW50IGNsb3NlKExpbmVCdWlsZGVyJiwgdW5zaWduZWQgbGVhZGlu Z0lubGluZUl0ZW1JbmRleCwgdW5zaWduZWQgY29tbWl0dGVkSW5saW5lSXRlbUNvdW50LCBPcHRp b25hbDxMaW5lQ29udGVudDo6UGFydGlhbENvbnRlbnQ+KTsKIAogICAgIElubGluZUxheW91dFVu aXQgaW5saW5lSXRlbVdpZHRoKGNvbnN0IElubGluZUl0ZW0mLCBJbmxpbmVMYXlvdXRVbml0IGNv bnRlbnRMb2dpY2FsTGVmdCkgY29uc3Q7Cg== 388002 2020-01-16 19:04:05 -0800 2020-01-16 20:52:10 -0800 Patch bug-206372-20200116190404.patch text/plain 7921 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjU0NzMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmVlMmEzMTg3Y2VhMWYz MDk4ZmMwMjRkNzM5ZjVjMWVkZTFhNThkNC4uYzNmN2M2ZjYyZWE4OGNhM2M5NzA3YTIzYzg1NDY3 NzM4NzlkZjdhZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIwLTAxLTE2ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBPcHRpbWl6 ZSBMaW5lTGF5b3V0Q29udGV4dDo6dHJ5QWRkaW5nSW5saW5lSXRlbXMgZm9yIHRoZSBtb3N0IGNv bW1vbiBpbmxpbmUgY29udGVudAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjA2MzcyCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81ODY1NzUyNT4KKwor ICAgICAgICBSZXZpZXdlZCBieSBTaW1vbiBGcmFzZXIuCisKKyAgICAgICAgfjQlIHByb2dyZXNz aW9uIG9uIFBlcmZvcm1hbmNlVGVzdHMvTGF5b3V0L2xpbmUtbGF5b3V0LXNpbXBsZS5odG1sLgor CisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvTGluZUxheW91dENvbnRleHQuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjplbmRzV2l0aFNvZnRXcmFwT3Bwb3J0dW5pdHkp OgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0Ojppc0F0U29mdFdyYXBPcHBvcnR1bml0eSk6Cisg ICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6Om5leHRXcmFwT3Bwb3J0dW5pdHkpOgorICAgICAgICAo V2ViQ29yZTo6TGF5b3V0OjpMaW5lQ2FuZGlkYXRlQ29udGVudDo6YXBwZW5kSW5saW5lQ29udGVu dCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVDYW5kaWRhdGVDb250ZW50OjpyZXNl dCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVMYXlvdXRDb250ZXh0Ojp0cnlBZGRp bmdJbmxpbmVJdGVtcyk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVMYXlvdXRDb250 ZXh0Ojpjb21taXRQYXJ0aWFsQ29udGVudCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6Okxp bmVMYXlvdXRDb250ZXh0Ojpjb21taXRDb250ZW50KTogRGVsZXRlZC4KKyAgICAgICAgKiBsYXlv dXQvaW5saW5lZm9ybWF0dGluZy9MaW5lTGF5b3V0Q29udGV4dC5oOgorCiAyMDIwLTAxLTE2ICBG dWppaSBIaXJvbm9yaSAgPEhpcm9ub3JpLkZ1amlpQHNvbnkuY29tPgogCiAgICAgICAgIFVucmV2 aWV3ZWQgcmVtb3ZpbmcgYSBzdGFsZSBGSVhNRSBjb21tZW50CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9MaW5lTGF5b3V0Q29udGV4dC5jcHAgYi9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9MaW5lTGF5b3V0Q29udGV4dC5j cHAKaW5kZXggNjVkNjM2YmFkZjA0MmY1NTA1M2RiZWE4NTI5YzAxMWFlZDgzOWU4OS4uZGZiZjlj YTg3NzY5MzU3ZjlhMTg0NjAzZGM2YWQyMGZmOGQyNjc1YiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvTGluZUxheW91dENvbnRleHQuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0xpbmVMYXlvdXRDb250ZXh0 LmNwcApAQCAtMzUsNyArMzUsNyBAQAogbmFtZXNwYWNlIFdlYkNvcmUgewogbmFtZXNwYWNlIExh eW91dCB7CiAKLXN0YXRpYyBib29sIGVuZHNXaXRoU29mdFdyYXBPcHBvcnR1bml0eShjb25zdCBJ bmxpbmVUZXh0SXRlbSYgY3VycmVudFRleHRJdGVtLCBjb25zdCBJbmxpbmVUZXh0SXRlbSYgbmV4 dElubGluZVRleHRJdGVtKQorc3RhdGljIGlubGluZSBib29sIGVuZHNXaXRoU29mdFdyYXBPcHBv cnR1bml0eShjb25zdCBJbmxpbmVUZXh0SXRlbSYgY3VycmVudFRleHRJdGVtLCBjb25zdCBJbmxp bmVUZXh0SXRlbSYgbmV4dElubGluZVRleHRJdGVtKQogewogICAgIEFTU0VSVCghbmV4dElubGlu ZVRleHRJdGVtLmlzV2hpdGVzcGFjZSgpKTsKICAgICAvLyBXZSBhcmUgYXQgdGhlIHBvc2l0aW9u IGFmdGVyIGEgd2hpdGVzcGFjZS4KQEAgLTYxLDcgKzYxLDcgQEAgc3RhdGljIGJvb2wgZW5kc1dp dGhTb2Z0V3JhcE9wcG9ydHVuaXR5KGNvbnN0IElubGluZVRleHRJdGVtJiBjdXJyZW50VGV4dEl0 ZW0sIGMKICAgICByZXR1cm4gIVRleHRVdGlsOjpmaW5kTmV4dEJyZWFrYWJsZVBvc2l0aW9uKGxp bmVCcmVha0l0ZXJhdG9yLCAwLCBuZXh0SW5saW5lVGV4dEl0ZW0uc3R5bGUoKSk7CiB9CiAKLXN0 YXRpYyBib29sIGlzQXRTb2Z0V3JhcE9wcG9ydHVuaXR5KGNvbnN0IElubGluZUl0ZW0mIGN1cnJl bnQsIGNvbnN0IElubGluZUl0ZW0mIG5leHQpCitzdGF0aWMgaW5saW5lIGJvb2wgaXNBdFNvZnRX cmFwT3Bwb3J0dW5pdHkoY29uc3QgSW5saW5lSXRlbSYgY3VycmVudCwgY29uc3QgSW5saW5lSXRl bSYgbmV4dCkKIHsKICAgICAvLyAiaXMgYXQiIHNpbXBsZSBtZWFucyB0aGF0IHRoZXJlJ3MgYSBz b2Z0IHdyYXAgb3Bwb3J0dW5pdHkgcmlnaHQgYWZ0ZXIgdGhlIFtjdXJyZW50XS4KICAgICAvLyBb dGV4dF1bIF1bdGV4dF1bY29udGFpbmVyIHN0YXJ0XS4uLiAoPGRpdj50ZXh0IGNvbnRlbnQ8c3Bh bj4uLjwvZGl2PikKQEAgLTEwMSw3ICsxMDEsNyBAQCBzdGF0aWMgYm9vbCBpc0F0U29mdFdyYXBP cHBvcnR1bml0eShjb25zdCBJbmxpbmVJdGVtJiBjdXJyZW50LCBjb25zdCBJbmxpbmVJdGVtJgog ICAgIHJldHVybiBlbmRzV2l0aFNvZnRXcmFwT3Bwb3J0dW5pdHkoY3VycmVudElubGluZVRleHRJ dGVtLCBuZXh0SW5saW5lVGV4dEl0ZW0pOwogfQogCi1zdGF0aWMgc2l6ZV90IG5leHRXcmFwT3Bw b3J0dW5pdHkoY29uc3QgSW5saW5lSXRlbXMmIGlubGluZUNvbnRlbnQsIHVuc2lnbmVkIHN0YXJ0 SW5kZXgpCitzdGF0aWMgaW5saW5lIHNpemVfdCBuZXh0V3JhcE9wcG9ydHVuaXR5KGNvbnN0IElu bGluZUl0ZW1zJiBpbmxpbmVDb250ZW50LCB1bnNpZ25lZCBzdGFydEluZGV4KQogewogICAgIC8v IDEuIEZpbmQgdGhlIHN0YXJ0IGNhbmRpZGF0ZSBieSBza2lwcGluZyBsZWFkaW5nIG5vbi1jb250 ZW50IGl0ZW1zIGUuZyA8c3Bhbj48c3Bhbj5zdGFydCA6IHNraXAgIjxzcGFuPjxzcGFuPiIKICAg ICAvLyAyLiBGaW5kIHRoZSBlbmQgY2FuZGlkYXRlIGJ5IHNraXBwaW5nIG5vbi1jb250ZW50IGl0 ZW1zIGluYmV0d2VlbiBlLmcuIDxzcGFuPjxzcGFuPnN0YXJ0PC9zcGFuPmVuZDogc2tpcCAiPC9z cGFuPiIKQEAgLTIwMCwxMyArMjAwLDEzIEBAIHByaXZhdGU6CiAgICAgY29uc3QgSW5saW5lSXRl bSogbV90cmFpbGluZ0xpbmVCcmVhayB7IG51bGxwdHIgfTsKIH07CiAKLXZvaWQgTGluZUNhbmRp ZGF0ZUNvbnRlbnQ6OmFwcGVuZElubGluZUNvbnRlbnQoY29uc3QgSW5saW5lSXRlbSYgaW5saW5l SXRlbSwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgpCitpbmxpbmUgdm9pZCBMaW5lQ2Fu ZGlkYXRlQ29udGVudDo6YXBwZW5kSW5saW5lQ29udGVudChjb25zdCBJbmxpbmVJdGVtJiBpbmxp bmVJdGVtLCBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxXaWR0aCkKIHsKICAgICBtX2lubGluZUNv bnRlbnRMb2dpY2FsV2lkdGggKz0gbG9naWNhbFdpZHRoOwogICAgIG1faW5saW5lUnVucy5hcHBl bmQoeyBpbmxpbmVJdGVtLCBsb2dpY2FsV2lkdGggfSk7CiB9CiAKLXZvaWQgTGluZUNhbmRpZGF0 ZUNvbnRlbnQ6OnJlc2V0KCkKK2lubGluZSB2b2lkIExpbmVDYW5kaWRhdGVDb250ZW50OjpyZXNl dCgpCiB7CiAgICAgbV9pbmxpbmVDb250ZW50TG9naWNhbFdpZHRoID0gMDsKICAgICBtX2lubGlu ZVJ1bnMuY2xlYXIoKTsKQEAgLTQyMyw3ICs0MjMsOCBAQCBMaW5lTGF5b3V0Q29udGV4dDo6UmVz dWx0IExpbmVMYXlvdXRDb250ZXh0Ojp0cnlBZGRpbmdJbmxpbmVJdGVtcyhMaW5lQnJlYWtlciYg bAogICAgIGF1dG8gcmVzdWx0ID0gbGluZUJyZWFrZXIuc2hvdWxkV3JhcElubGluZUNvbnRlbnQo Y2FuZGlkYXRlUnVucywgY2FuZGlkYXRlQ29udGVudC5pbmxpbmVDb250ZW50TG9naWNhbFdpZHRo KCksIGxpbmVTdGF0dXMpOwogICAgIGlmIChyZXN1bHQuYWN0aW9uID09IExpbmVCcmVha2VyOjpS ZXN1bHQ6OkFjdGlvbjo6S2VlcCkgewogICAgICAgICAvLyBUaGlzIGNvbnRpbnVvdXMgY29udGVu dCBjYW4gYmUgZnVsbHkgcGxhY2VkIG9uIHRoZSBjdXJyZW50IGxpbmUuCi0gICAgICAgIGNvbW1p dENvbnRlbnQobGluZSwgY2FuZGlkYXRlUnVucywgeyB9KTsKKyAgICAgICAgZm9yIChhdXRvJiBy dW4gOiBjYW5kaWRhdGVSdW5zKQorICAgICAgICAgICAgbGluZS5hcHBlbmQocnVuLmlubGluZUl0 ZW0sIHJ1bi5sb2dpY2FsV2lkdGgpOwogICAgICAgICAvLyBDb25zdW1lIHRyYWlsaW5nIGxpbmUg YnJlYWsgYXMgd2VsbC4KICAgICAgICAgaWYgKGF1dG8qIGxpbmVCcmVha0l0ZW0gPSBjYW5kaWRh dGVDb250ZW50LnRyYWlsaW5nTGluZUJyZWFrKCkpIHsKICAgICAgICAgICAgIGxpbmUuYXBwZW5k KCpsaW5lQnJlYWtJdGVtLCAwKTsKQEAgLTQ0Miw3ICs0NDMsNyBAQCBMaW5lTGF5b3V0Q29udGV4 dDo6UmVzdWx0IExpbmVMYXlvdXRDb250ZXh0Ojp0cnlBZGRpbmdJbmxpbmVJdGVtcyhMaW5lQnJl YWtlciYgbAogICAgIGlmIChyZXN1bHQuYWN0aW9uID09IExpbmVCcmVha2VyOjpSZXN1bHQ6OkFj dGlvbjo6U3BsaXQpIHsKICAgICAgICAgLy8gQ29tbWl0IHRoZSBjb21iaW5hdGlvbiBvZiBmdWxs IGFuZCBwYXJ0aWFsIGNvbnRlbnQgb24gdGhlIGN1cnJlbnQgbGluZS4KICAgICAgICAgQVNTRVJU KHJlc3VsdC5wYXJ0aWFsVHJhaWxpbmdDb250ZW50KTsKLSAgICAgICAgY29tbWl0Q29udGVudChs aW5lLCBjYW5kaWRhdGVSdW5zLCByZXN1bHQucGFydGlhbFRyYWlsaW5nQ29udGVudCk7CisgICAg ICAgIGNvbW1pdFBhcnRpYWxDb250ZW50KGxpbmUsIGNhbmRpZGF0ZVJ1bnMsICpyZXN1bHQucGFy dGlhbFRyYWlsaW5nQ29udGVudCk7CiAgICAgICAgIC8vIFdoZW4gc3BsaXR0aW5nIG11bHRpcGxl IHJ1bnMgPHNwYW4gc3R5bGU9IndvcmQtYnJlYWs6IGJyZWFrLWFsbCI+dGV4dDwvc3Bhbj48c3Bh bj5jb250ZW50PC9zcGFuPiwgd2UgbWlnaHQgZW5kIHVwIHNwbGl0dGluZyB0aGVtIGF0IHJ1biBi b3VuZGFyeS4KICAgICAgICAgLy8gSXQgc2ltcGx5IG1lYW5zIHdlIGRvbid0IHJlYWxseSBoYXZl IGEgcGFydGlhbCBydW4uIFBhcnRpYWwgY29udGVudCB5ZXMsIGJ1dCBub3QgcGFydGlhbCBydW4u CiAgICAgICAgIGF1dG8gdHJhaWxpbmdSdW5JbmRleCA9IHJlc3VsdC5wYXJ0aWFsVHJhaWxpbmdD b250ZW50LT50cmFpbGluZ1J1bkluZGV4OwpAQCAtNDU5LDE1ICs0NjAsMTUgQEAgTGluZUxheW91 dENvbnRleHQ6OlJlc3VsdCBMaW5lTGF5b3V0Q29udGV4dDo6dHJ5QWRkaW5nSW5saW5lSXRlbXMo TGluZUJyZWFrZXImIGwKICAgICByZXR1cm4geyBMaW5lQnJlYWtlcjo6SXNFbmRPZkxpbmU6Ok5v IH07CiB9CiAKLXZvaWQgTGluZUxheW91dENvbnRleHQ6OmNvbW1pdENvbnRlbnQoTGluZUJ1aWxk ZXImIGxpbmUsIGNvbnN0IExpbmVCcmVha2VyOjpSdW5MaXN0JiBydW5zLCBPcHRpb25hbDxMaW5l QnJlYWtlcjo6UmVzdWx0OjpQYXJ0aWFsVHJhaWxpbmdDb250ZW50PiBwYXJ0aWFsVHJhaWxpbmdD b250ZW50KQordm9pZCBMaW5lTGF5b3V0Q29udGV4dDo6Y29tbWl0UGFydGlhbENvbnRlbnQoTGlu ZUJ1aWxkZXImIGxpbmUsIGNvbnN0IExpbmVCcmVha2VyOjpSdW5MaXN0JiBydW5zLCBjb25zdCBM aW5lQnJlYWtlcjo6UmVzdWx0OjpQYXJ0aWFsVHJhaWxpbmdDb250ZW50JiBwYXJ0aWFsVHJhaWxp bmdDb250ZW50KQogewogICAgIGZvciAoc2l6ZV90IGluZGV4ID0gMDsgaW5kZXggPCBydW5zLnNp emUoKTsgKytpbmRleCkgewogICAgICAgICBhdXRvJiBydW4gPSBydW5zW2luZGV4XTsKLSAgICAg ICAgaWYgKHBhcnRpYWxUcmFpbGluZ0NvbnRlbnQgJiYgcGFydGlhbFRyYWlsaW5nQ29udGVudC0+ dHJhaWxpbmdSdW5JbmRleCA9PSBpbmRleCkgeworICAgICAgICBpZiAocGFydGlhbFRyYWlsaW5n Q29udGVudC50cmFpbGluZ1J1bkluZGV4ID09IGluZGV4KSB7CiAgICAgICAgICAgICBBU1NFUlQo cnVuLmlubGluZUl0ZW0uaXNUZXh0KCkpOwogICAgICAgICAgICAgLy8gQ3JlYXRlIGFuZCBjb21t aXQgcGFydGlhbCB0cmFpbGluZyBpdGVtLgotICAgICAgICAgICAgaWYgKGF1dG8gcGFydGlhbFJ1 biA9IHBhcnRpYWxUcmFpbGluZ0NvbnRlbnQtPnBhcnRpYWxSdW4pIHsKLSAgICAgICAgICAgICAg ICBhdXRvJiB0cmFpbGluZ0lubGluZVRleHRJdGVtID0gZG93bmNhc3Q8SW5saW5lVGV4dEl0ZW0+ KHJ1bnNbcGFydGlhbFRyYWlsaW5nQ29udGVudC0+dHJhaWxpbmdSdW5JbmRleF0uaW5saW5lSXRl bSk7CisgICAgICAgICAgICBpZiAoYXV0byBwYXJ0aWFsUnVuID0gcGFydGlhbFRyYWlsaW5nQ29u dGVudC5wYXJ0aWFsUnVuKSB7CisgICAgICAgICAgICAgICAgYXV0byYgdHJhaWxpbmdJbmxpbmVU ZXh0SXRlbSA9IGRvd25jYXN0PElubGluZVRleHRJdGVtPihydW5zW3BhcnRpYWxUcmFpbGluZ0Nv bnRlbnQudHJhaWxpbmdSdW5JbmRleF0uaW5saW5lSXRlbSk7CiAgICAgICAgICAgICAgICAgLy8g RklYTUU6IExpbmVCdWlsZGVyIHNob3VsZCBub3QgaG9sZCBvbiB0byB0aGUgSW5saW5lSXRlbS4K ICAgICAgICAgICAgICAgICBBU1NFUlQoIW1fcGFydGlhbFRyYWlsaW5nVGV4dEl0ZW0pOwogICAg ICAgICAgICAgICAgIG1fcGFydGlhbFRyYWlsaW5nVGV4dEl0ZW0gPSB0cmFpbGluZ0lubGluZVRl eHRJdGVtLmxlZnQocGFydGlhbFJ1bi0+bGVuZ3RoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0xpbmVMYXlvdXRDb250ZXh0LmggYi9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9MaW5lTGF5b3V0Q29udGV4dC5oCmluZGV4 IGQwZGY4ZTYyOGVjYmY3Y2I2YjZhM2U1MjExNGNmOTdlZjM1NzgxN2YuLjljYzY1YTMyZjk0MjRm Zjg1NzY4NTYzY2ZlYzIxYzkzYzExNDQ3MmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9pbmxpbmVmb3JtYXR0aW5nL0xpbmVMYXlvdXRDb250ZXh0LmgKKysrIGIvU291cmNlL1dl YkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvTGluZUxheW91dENvbnRleHQuaApAQCAtNjMs NyArNjMsNyBAQCBwcml2YXRlOgogICAgIH07CiAgICAgUmVzdWx0IHRyeUFkZGluZ0Zsb2F0SXRl bXMoTGluZUJ1aWxkZXImLCBjb25zdCBGbG9hdExpc3QmKTsKICAgICBSZXN1bHQgdHJ5QWRkaW5n SW5saW5lSXRlbXMoTGluZUJyZWFrZXImLCBMaW5lQnVpbGRlciYsIGNvbnN0IExpbmVDYW5kaWRh dGVDb250ZW50Jik7Ci0gICAgdm9pZCBjb21taXRDb250ZW50KExpbmVCdWlsZGVyJiwgY29uc3Qg TGluZUJyZWFrZXI6OlJ1bkxpc3QmLCBPcHRpb25hbDxMaW5lQnJlYWtlcjo6UmVzdWx0OjpQYXJ0 aWFsVHJhaWxpbmdDb250ZW50Pik7CisgICAgdm9pZCBjb21taXRQYXJ0aWFsQ29udGVudChMaW5l QnVpbGRlciYsIGNvbnN0IExpbmVCcmVha2VyOjpSdW5MaXN0JiwgY29uc3QgTGluZUJyZWFrZXI6 OlJlc3VsdDo6UGFydGlhbFRyYWlsaW5nQ29udGVudCYpOwogICAgIExpbmVDb250ZW50IGNsb3Nl KExpbmVCdWlsZGVyJiwgdW5zaWduZWQgbGVhZGluZ0lubGluZUl0ZW1JbmRleCwgdW5zaWduZWQg Y29tbWl0dGVkSW5saW5lSXRlbUNvdW50LCBPcHRpb25hbDxMaW5lQ29udGVudDo6UGFydGlhbENv bnRlbnQ+KTsKIAogICAgIElubGluZUxheW91dFVuaXQgaW5saW5lSXRlbVdpZHRoKGNvbnN0IElu bGluZUl0ZW0mLCBJbmxpbmVMYXlvdXRVbml0IGNvbnRlbnRMb2dpY2FsTGVmdCkgY29uc3Q7Cg==