228895 2021-08-07 05:48:27 -0700 [IFC][Integration] Do not scan the content for overflowing glyph when line-box-contain is set to glyph 2021-08-21 06:49:42 -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 1782684 0 zalan 2021-08-07 05:48:27 -0700 Blink has removed support long time ago (https://groups.google.com/a/chromium.org/g/blink-dev/c/rKDXtqvgDv4). Scanning the content for something this uncommon is a bit of a waste. 1782685 1 webkit-bug-importer 2021-08-07 05:48:51 -0700 <rdar://problem/81651487> 1782686 2 435127 zalan 2021-08-07 05:54:38 -0700 Created attachment 435127 Patch 1782689 3 435128 zalan 2021-08-07 06:15:35 -0700 Created attachment 435128 Patch 1786086 4 436056 zalan 2021-08-20 20:03:03 -0700 Created attachment 436056 Patch 1786133 5 ews-feeder 2021-08-21 06:49:40 -0700 Committed r281373 (240788@main): <https://commits.webkit.org/240788@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 436056. 435127 2021-08-07 05:54:38 -0700 2021-08-07 06:16:31 -0700 Patch bug-228895-20210807055437.patch text/plain 7309 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwMzgxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDlhNWZlMGY4MGE4MmYw MzE1NTQzNTMyNTJkY2M0NmVjNmJjNTMxNy4uYmI2YjY1ZmVjNjg3Nzk2Y2QxYzdlMDhhNTE5NTgy M2MzMDE3NDA3YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTA4LTA3ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0lGQ11bSW50ZWdyYXRpb25d IERvIG5vdCBzY2FuIHRoZSBjb250ZW50IGZvciBvdmVyZmxvd2luZyBnbHlwaCB3aGVuIGxpbmUt Ym94LWNvbnRhaW4gaXMgc2V0IHRvIGdseXBoCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yMjg4OTUKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzgxNjUx NDg3PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRo aXMgaXMgaW4gcHJlcGFyYXRpb24gZm9yIHJlbW92aW5nIGNvbnRlbnQgc2Nhbm5pbmcgY29tcGxl dGVseS4gCisKKyAgICAgICAgKiBsYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25D b3ZlcmFnZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6cHJpbnRS ZWFzb24pOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246OmNhblVzZUZvclRl eHQpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246OmNhblVzZUZvckZvbnRB bmRUZXh0KToKKyAgICAgICAgKiBsYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25D b3ZlcmFnZS5oOgorCiAyMDIxLTA3LTI4ICBGcsOpZMOpcmljIFdhbmcgIDxmd2FuZ0BpZ2FsaWEu Y29tPgogCiAgICAgICAgIENyYXNoIGluIEFwcGx5U3R5bGVDb21tYW5kOjphcHBseVJlbGF0aXZl Rm9udFN0eWxlQ2hhbmdlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdy YXRpb24vTGF5b3V0SW50ZWdyYXRpb25Db3ZlcmFnZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25Db3ZlcmFnZS5jcHAKaW5kZXggNDAwNzFm MWE3MWZhNGU3MjM3YzU2MjY1ZTZiZmZkYzY5MzliYjc5Mi4uZDU3YWI1MDIyZjNmYmMzZGExYzNi YTMwODRiNDAyMGYzOWM4ZTBhOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lu dGVncmF0aW9uL0xheW91dEludGVncmF0aW9uQ292ZXJhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkNvdmVyYWdlLmNwcApAQCAt MjE2LDggKzIxNiw4IEBAIHN0YXRpYyB2b2lkIHByaW50UmVhc29uKEF2b2lkYW5jZVJlYXNvbiBy ZWFzb24sIFRleHRTdHJlYW0mIHN0cmVhbSkKICAgICBjYXNlIEF2b2lkYW5jZVJlYXNvbjo6Rmxv d0NoaWxkSXNTZWxlY3RlZDoKICAgICAgICAgc3RyZWFtIDw8ICJzZWxlY3RlZCBjb250ZW50IjsK ICAgICAgICAgYnJlYWs7Ci0gICAgY2FzZSBBdm9pZGFuY2VSZWFzb246OkZsb3dGb250SGFzT3Zl cmZsb3dHbHlwaDoKLSAgICAgICAgc3RyZWFtIDw8ICItd2Via2l0LWxpbmUtYm94LWNvbnRhaW46 IGdseXBocyB3aXRoIG92ZXJmbG93aW5nIHRleHQuIjsKKyAgICBjYXNlIEF2b2lkYW5jZVJlYXNv bjo6Rmxvd0hhc0xpbmVCb3hDb250YWluR2x5cGhzOgorICAgICAgICBzdHJlYW0gPDwgIi13ZWJr aXQtbGluZS1ib3gtY29udGFpbjogZ2x5cGhzIjsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBB dm9pZGFuY2VSZWFzb246OkZsb3dUZXh0SGFzU3Vycm9nYXRlUGFpcjoKICAgICAgICAgc3RyZWFt IDw8ICJzdXJyb2dhdGUgcGFpciI7CkBAIC00NjMsMjAgKzQ2MywxMCBAQCB0ZW1wbGF0ZTw+IE9w dGlvblNldDxBdm9pZGFuY2VSZWFzb24+IGNhblVzZUZvckNoYXJhY3RlcihMQ2hhciBjaGFyYWN0 ZXIsIGJvb2wgdAogfQogCiB0ZW1wbGF0ZSA8dHlwZW5hbWUgQ2hhcmFjdGVyVHlwZT4KLXN0YXRp YyBPcHRpb25TZXQ8QXZvaWRhbmNlUmVhc29uPiBjYW5Vc2VGb3JUZXh0KGNvbnN0IENoYXJhY3Rl clR5cGUqIHRleHQsIHVuc2lnbmVkIGxlbmd0aCwgY29uc3QgRm9udENhc2NhZGUmIGZvbnRDYXNj YWRlLCBzdGQ6Om9wdGlvbmFsPGZsb2F0PiBsaW5lSGVpZ2h0Q29uc3RyYWludCwKLSAgICBib29s IHRleHRJc0p1c3RpZmllZCwgSW5jbHVkZVJlYXNvbnMgaW5jbHVkZVJlYXNvbnMpCitzdGF0aWMg T3B0aW9uU2V0PEF2b2lkYW5jZVJlYXNvbj4gY2FuVXNlRm9yVGV4dChjb25zdCBDaGFyYWN0ZXJU eXBlKiB0ZXh0LCB1bnNpZ25lZCBsZW5ndGgsIGNvbnN0IEZvbnRDYXNjYWRlJiBmb250Q2FzY2Fk ZSwgYm9vbCB0ZXh0SXNKdXN0aWZpZWQsIEluY2x1ZGVSZWFzb25zIGluY2x1ZGVSZWFzb25zKQog ewogICAgIE9wdGlvblNldDxBdm9pZGFuY2VSZWFzb24+IHJlYXNvbnM7CiAgICAgYXV0byYgcHJp bWFyeUZvbnQgPSBmb250Q2FzY2FkZS5wcmltYXJ5Rm9udCgpOwotICAgIGF1dG8mIGZvbnRNZXRy aWNzID0gcHJpbWFyeUZvbnQuZm9udE1ldHJpY3MoKTsKLSAgICBhdXRvIGF2YWlsYWJsZVNwYWNl Rm9yR2x5cGhBc2NlbnQgPSBmb250TWV0cmljcy5hc2NlbnQoKTsKLSAgICBhdXRvIGF2YWlsYWJs ZVNwYWNlRm9yR2x5cGhEZXNjZW50ID0gZm9udE1ldHJpY3MuZGVzY2VudCgpOwotICAgIGlmIChs aW5lSGVpZ2h0Q29uc3RyYWludCkgewotICAgICAgICBhdXRvIGxpbmVIZWlnaHRQYWRkaW5nID0g KmxpbmVIZWlnaHRDb25zdHJhaW50IC0gZm9udE1ldHJpY3MuaGVpZ2h0KCk7Ci0gICAgICAgIGF2 YWlsYWJsZVNwYWNlRm9yR2x5cGhBc2NlbnQgKz0gbGluZUhlaWdodFBhZGRpbmcgLyAyOwotICAg ICAgICBhdmFpbGFibGVTcGFjZUZvckdseXBoRGVzY2VudCArPSBsaW5lSGVpZ2h0UGFkZGluZyAv IDI7Ci0gICAgfQotCiAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IGxlbmd0aDsgKytpKSB7 CiAgICAgICAgIGF1dG8gY2hhcmFjdGVyID0gdGV4dFtpXTsKICAgICAgICAgYXV0byBjaGFyYWN0 ZXJSZWFzb25zID0gY2FuVXNlRm9yQ2hhcmFjdGVyKGNoYXJhY3RlciwgdGV4dElzSnVzdGlmaWVk LCBpbmNsdWRlUmVhc29ucyk7CkBAIC00ODYsMjEgKzQ3NiwxNSBAQCBzdGF0aWMgT3B0aW9uU2V0 PEF2b2lkYW5jZVJlYXNvbj4gY2FuVXNlRm9yVGV4dChjb25zdCBDaGFyYWN0ZXJUeXBlKiB0ZXh0 LCB1bnNpZwogICAgICAgICBhdXRvIGdseXBoRGF0YSA9IGZvbnRDYXNjYWRlLmdseXBoRGF0YUZv ckNoYXJhY3RlcihjaGFyYWN0ZXIsIGZhbHNlKTsKICAgICAgICAgaWYgKCFnbHlwaERhdGEuaXNW YWxpZCgpIHx8IGdseXBoRGF0YS5mb250ICE9ICZwcmltYXJ5Rm9udCkKICAgICAgICAgICAgIFNF VF9SRUFTT05fQU5EX1JFVFVSTl9JRl9ORUVERUQoRmxvd1ByaW1hcnlGb250SXNJbnN1ZmZpY2ll bnQsIHJlYXNvbnMsIGluY2x1ZGVSZWFzb25zKTsKLQotICAgICAgICBpZiAobGluZUhlaWdodENv bnN0cmFpbnQpIHsKLSAgICAgICAgICAgIGF1dG8gYm91bmRzID0gcHJpbWFyeUZvbnQuYm91bmRz Rm9yR2x5cGgoZ2x5cGhEYXRhLmdseXBoKTsKLSAgICAgICAgICAgIGlmIChjZWlsZigtYm91bmRz LnkoKSkgPiBhdmFpbGFibGVTcGFjZUZvckdseXBoQXNjZW50IHx8IGNlaWxmKGJvdW5kcy5tYXhZ KCkpID4gYXZhaWxhYmxlU3BhY2VGb3JHbHlwaERlc2NlbnQpCi0gICAgICAgICAgICAgICAgU0VU X1JFQVNPTl9BTkRfUkVUVVJOX0lGX05FRURFRChGbG93Rm9udEhhc092ZXJmbG93R2x5cGgsIHJl YXNvbnMsIGluY2x1ZGVSZWFzb25zKTsKLSAgICAgICAgfQogICAgIH0KICAgICByZXR1cm4gcmVh c29uczsKIH0KIAotc3RhdGljIE9wdGlvblNldDxBdm9pZGFuY2VSZWFzb24+IGNhblVzZUZvclRl eHQoU3RyaW5nVmlldyB0ZXh0LCBjb25zdCBGb250Q2FzY2FkZSYgZm9udENhc2NhZGUsIHN0ZDo6 b3B0aW9uYWw8ZmxvYXQ+IGxpbmVIZWlnaHRDb25zdHJhaW50LCBib29sIHRleHRJc0p1c3RpZmll ZCwgSW5jbHVkZVJlYXNvbnMgaW5jbHVkZVJlYXNvbnMpCitzdGF0aWMgT3B0aW9uU2V0PEF2b2lk YW5jZVJlYXNvbj4gY2FuVXNlRm9yVGV4dChTdHJpbmdWaWV3IHRleHQsIGNvbnN0IEZvbnRDYXNj YWRlJiBmb250Q2FzY2FkZSwgYm9vbCB0ZXh0SXNKdXN0aWZpZWQsIEluY2x1ZGVSZWFzb25zIGlu Y2x1ZGVSZWFzb25zKQogewogICAgIGlmICh0ZXh0LmlzOEJpdCgpKQotICAgICAgICByZXR1cm4g Y2FuVXNlRm9yVGV4dCh0ZXh0LmNoYXJhY3RlcnM4KCksIHRleHQubGVuZ3RoKCksIGZvbnRDYXNj YWRlLCBsaW5lSGVpZ2h0Q29uc3RyYWludCwgdGV4dElzSnVzdGlmaWVkLCBpbmNsdWRlUmVhc29u cyk7Ci0gICAgcmV0dXJuIGNhblVzZUZvclRleHQodGV4dC5jaGFyYWN0ZXJzMTYoKSwgdGV4dC5s ZW5ndGgoKSwgZm9udENhc2NhZGUsIGxpbmVIZWlnaHRDb25zdHJhaW50LCB0ZXh0SXNKdXN0aWZp ZWQsIGluY2x1ZGVSZWFzb25zKTsKKyAgICAgICAgcmV0dXJuIGNhblVzZUZvclRleHQodGV4dC5j aGFyYWN0ZXJzOCgpLCB0ZXh0Lmxlbmd0aCgpLCBmb250Q2FzY2FkZSwgdGV4dElzSnVzdGlmaWVk LCBpbmNsdWRlUmVhc29ucyk7CisgICAgcmV0dXJuIGNhblVzZUZvclRleHQodGV4dC5jaGFyYWN0 ZXJzMTYoKSwgdGV4dC5sZW5ndGgoKSwgZm9udENhc2NhZGUsIHRleHRJc0p1c3RpZmllZCwgaW5j bHVkZVJlYXNvbnMpOwogfQogCiBzdGF0aWMgT3B0aW9uU2V0PEF2b2lkYW5jZVJlYXNvbj4gY2Fu VXNlRm9yRm9udEFuZFRleHQoY29uc3QgUmVuZGVyQm94TW9kZWxPYmplY3QmIGNvbnRhaW5lciwg SW5jbHVkZVJlYXNvbnMgaW5jbHVkZVJlYXNvbnMpCkBAIC01MTEsOSArNDk1LDggQEAgc3RhdGlj IE9wdGlvblNldDxBdm9pZGFuY2VSZWFzb24+IGNhblVzZUZvckZvbnRBbmRUZXh0KGNvbnN0IFJl bmRlckJveE1vZGVsT2JqZWMKICAgICBhdXRvJiBmb250Q2FzY2FkZSA9IHN0eWxlLmZvbnRDYXNj YWRlKCk7CiAgICAgaWYgKGZvbnRDYXNjYWRlLnByaW1hcnlGb250KCkuaXNJbnRlcnN0aXRpYWwo KSkKICAgICAgICAgU0VUX1JFQVNPTl9BTkRfUkVUVVJOX0lGX05FRURFRChGbG93SXNNaXNzaW5n UHJpbWFyeUZvbnQsIHJlYXNvbnMsIGluY2x1ZGVSZWFzb25zKTsKLSAgICBzdGQ6Om9wdGlvbmFs PGZsb2F0PiBsaW5lSGVpZ2h0Q29uc3RyYWludDsKICAgICBpZiAoc3R5bGUubGluZUJveENvbnRh aW4oKS5jb250YWlucyhMaW5lQm94Q29udGFpbjo6R2x5cGhzKSkKLSAgICAgICAgbGluZUhlaWdo dENvbnN0cmFpbnQgPSBjb250YWluZXIubGluZUhlaWdodChmYWxzZSwgSG9yaXpvbnRhbExpbmUs IFBvc2l0aW9uT2ZJbnRlcmlvckxpbmVCb3hlcykudG9GbG9hdCgpOworICAgICAgICBTRVRfUkVB U09OX0FORF9SRVRVUk5fSUZfTkVFREVEKEZsb3dIYXNMaW5lQm94Q29udGFpbkdseXBocywgcmVh c29ucywgaW5jbHVkZVJlYXNvbnMpOwogICAgIGJvb2wgZmxvd0lzSnVzdGlmaWVkID0gc3R5bGUu dGV4dEFsaWduKCkgPT0gVGV4dEFsaWduTW9kZTo6SnVzdGlmeTsKICAgICBmb3IgKGNvbnN0IGF1 dG8mIHRleHRSZW5kZXJlciA6IGNoaWxkcmVuT2ZUeXBlPFJlbmRlclRleHQ+KGNvbnRhaW5lcikp IHsKICAgICAgICAgLy8gRklYTUU6IERvIG5vdCByZXR1cm4gdW50aWwgYWZ0ZXIgY2hlY2tpbmcg YWxsIGNoaWxkcmVuLgpAQCAtNTM3LDcgKzUyMCw3IEBAIHN0YXRpYyBPcHRpb25TZXQ8QXZvaWRh bmNlUmVhc29uPiBjYW5Vc2VGb3JGb250QW5kVGV4dChjb25zdCBSZW5kZXJCb3hNb2RlbE9iamVj CiAgICAgICAgICAgICAgICAgU0VUX1JFQVNPTl9BTkRfUkVUVVJOX0lGX05FRURFRChGbG93SGFz Q29tcGxleEZvbnRDb2RlUGF0aCwgcmVhc29ucywgaW5jbHVkZVJlYXNvbnMpOwogICAgICAgICB9 CiAKLSAgICAgICAgYXV0byB0ZXh0UmVhc29ucyA9IGNhblVzZUZvclRleHQodGV4dFJlbmRlcmVy LnN0cmluZ1ZpZXcoKSwgZm9udENhc2NhZGUsIGxpbmVIZWlnaHRDb25zdHJhaW50LCBmbG93SXNK dXN0aWZpZWQsIGluY2x1ZGVSZWFzb25zKTsKKyAgICAgICAgYXV0byB0ZXh0UmVhc29ucyA9IGNh blVzZUZvclRleHQodGV4dFJlbmRlcmVyLnN0cmluZ1ZpZXcoKSwgZm9udENhc2NhZGUsIGZsb3dJ c0p1c3RpZmllZCwgaW5jbHVkZVJlYXNvbnMpOwogICAgICAgICBpZiAodGV4dFJlYXNvbnMpCiAg ICAgICAgICAgICBBRERfUkVBU09OU19BTkRfUkVUVVJOX0lGX05FRURFRCh0ZXh0UmVhc29ucywg cmVhc29ucywgaW5jbHVkZVJlYXNvbnMpOwogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkNvdmVyYWdlLmggYi9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25Db3ZlcmFnZS5o CmluZGV4IDJhMDQ1ODhhM2FkZTZkOGJjZWMzOTZjY2JlOGM5ZTBlMmM3NWI1M2IuLmRmMGRiMTVi ZDA2ZWFjYTIwMmZjMTJmMjc1NzJiMDIyMGNlZDY1YmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkNvdmVyYWdlLmgKKysrIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uQ292ZXJh Z2UuaApAQCAtODIsNyArODIsNyBAQCBlbnVtIGNsYXNzIEF2b2lkYW5jZVJlYXNvbiA6IHVpbnQ2 NF90IHsKICAgICBGbG93RG9lc05vdEVzdGFibGlzaElubGluZUZvcm1hdHRpbmdDb250ZXh0ICA9 IDFMTFUgIDw8IDQyLAogICAgIEZsb3dDaGlsZElzU2VsZWN0ZWQgICAgICAgICAgICAgICAgICAg ICAgICAgID0gMUxMVSAgPDwgNDMsCiAgICAgRmxvd0hhc0hhbmdpbmdQdW5jdHVhdGlvbiAgICAg ICAgICAgICAgICAgICAgPSAxTExVICA8PCA0NCwKLSAgICBGbG93Rm9udEhhc092ZXJmbG93R2x5 cGggICAgICAgICAgICAgICAgICAgICA9IDFMTFUgIDw8IDQ1LAorICAgIEZsb3dIYXNMaW5lQm94 Q29udGFpbkdseXBocyAgICAgICAgICAgICAgICAgID0gMUxMVSAgPDwgNDUsCiAgICAgRmxvd1Rl eHRIYXNTdXJyb2dhdGVQYWlyICAgICAgICAgICAgICAgICAgICAgPSAxTExVICA8PCA0NiwKICAg ICBNdWx0aUNvbHVtbkZsb3dJc05vdFRvcExldmVsICAgICAgICAgICAgICAgICA9IDFMTFUgIDw8 IDQ3LAogICAgIE11bHRpQ29sdW1uRmxvd0hhc0NvbHVtblNwYW5uZXIgICAgICAgICAgICAgID0g MUxMVSAgPDwgNDgsCg== 435128 2021-08-07 06:15:35 -0700 2021-08-20 20:03:01 -0700 Patch bug-228895-20210807061534.patch text/plain 7946 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwMzgxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDlhNWZlMGY4MGE4MmYw MzE1NTQzNTMyNTJkY2M0NmVjNmJjNTMxNy4uZjFmNTM3MjAyNTFlN2Q2ODM4NTQ5MGI3NmQxNmQ3 MjFmMTE3Njk3ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTA4LTA3ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0lGQ11bSW50ZWdyYXRpb25d IERvIG5vdCBzY2FuIHRoZSBjb250ZW50IGZvciBvdmVyZmxvd2luZyBnbHlwaCB3aGVuIGxpbmUt Ym94LWNvbnRhaW4gaXMgc2V0IHRvIGdseXBoCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yMjg4OTUKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzgxNjUx NDg3PgorCisgICAgICAgIFJldmlld2VkIGJ5IEFudHRpIEtvaXZpc3RvLgorCisgICAgICAgIFRo aXMgaXMgaW4gcHJlcGFyYXRpb24gZm9yIHJlbW92aW5nIGNvbnRlbnQgc2Nhbm5pbmcgY29tcGxl dGVseS4gCisKKyAgICAgICAgKiBsYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25D b3ZlcmFnZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6cHJpbnRS ZWFzb24pOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246OmNhblVzZUZvclRl eHQpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246OmNhblVzZUZvckZvbnRB bmRUZXh0KToKKyAgICAgICAgKiBsYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25D b3ZlcmFnZS5oOgorCiAyMDIxLTA3LTI4ICBGcsOpZMOpcmljIFdhbmcgIDxmd2FuZ0BpZ2FsaWEu Y29tPgogCiAgICAgICAgIENyYXNoIGluIEFwcGx5U3R5bGVDb21tYW5kOjphcHBseVJlbGF0aXZl Rm9udFN0eWxlQ2hhbmdlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdy YXRpb24vTGF5b3V0SW50ZWdyYXRpb25Db3ZlcmFnZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25Db3ZlcmFnZS5jcHAKaW5kZXggNDAwNzFm MWE3MWZhNGU3MjM3YzU2MjY1ZTZiZmZkYzY5MzliYjc5Mi4uNzc3N2ZiZmFkOGFkZGZjN2M4MzRi MGY4ZjkyNzlhNTM0ZmMxYTE5YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lu dGVncmF0aW9uL0xheW91dEludGVncmF0aW9uQ292ZXJhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkNvdmVyYWdlLmNwcApAQCAt MjE2LDggKzIxNiw4IEBAIHN0YXRpYyB2b2lkIHByaW50UmVhc29uKEF2b2lkYW5jZVJlYXNvbiBy ZWFzb24sIFRleHRTdHJlYW0mIHN0cmVhbSkKICAgICBjYXNlIEF2b2lkYW5jZVJlYXNvbjo6Rmxv d0NoaWxkSXNTZWxlY3RlZDoKICAgICAgICAgc3RyZWFtIDw8ICJzZWxlY3RlZCBjb250ZW50IjsK ICAgICAgICAgYnJlYWs7Ci0gICAgY2FzZSBBdm9pZGFuY2VSZWFzb246OkZsb3dGb250SGFzT3Zl cmZsb3dHbHlwaDoKLSAgICAgICAgc3RyZWFtIDw8ICItd2Via2l0LWxpbmUtYm94LWNvbnRhaW46 IGdseXBocyB3aXRoIG92ZXJmbG93aW5nIHRleHQuIjsKKyAgICBjYXNlIEF2b2lkYW5jZVJlYXNv bjo6Rmxvd0hhc0xpbmVCb3hDb250YWluR2x5cGhzOgorICAgICAgICBzdHJlYW0gPDwgIi13ZWJr aXQtbGluZS1ib3gtY29udGFpbjogZ2x5cGhzIjsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBB dm9pZGFuY2VSZWFzb246OkZsb3dUZXh0SGFzU3Vycm9nYXRlUGFpcjoKICAgICAgICAgc3RyZWFt IDw8ICJzdXJyb2dhdGUgcGFpciI7CkBAIC00NjMsMjAgKzQ2MywxMCBAQCB0ZW1wbGF0ZTw+IE9w dGlvblNldDxBdm9pZGFuY2VSZWFzb24+IGNhblVzZUZvckNoYXJhY3RlcihMQ2hhciBjaGFyYWN0 ZXIsIGJvb2wgdAogfQogCiB0ZW1wbGF0ZSA8dHlwZW5hbWUgQ2hhcmFjdGVyVHlwZT4KLXN0YXRp YyBPcHRpb25TZXQ8QXZvaWRhbmNlUmVhc29uPiBjYW5Vc2VGb3JUZXh0KGNvbnN0IENoYXJhY3Rl clR5cGUqIHRleHQsIHVuc2lnbmVkIGxlbmd0aCwgY29uc3QgRm9udENhc2NhZGUmIGZvbnRDYXNj YWRlLCBzdGQ6Om9wdGlvbmFsPGZsb2F0PiBsaW5lSGVpZ2h0Q29uc3RyYWludCwKLSAgICBib29s IHRleHRJc0p1c3RpZmllZCwgSW5jbHVkZVJlYXNvbnMgaW5jbHVkZVJlYXNvbnMpCitzdGF0aWMg T3B0aW9uU2V0PEF2b2lkYW5jZVJlYXNvbj4gY2FuVXNlRm9yVGV4dChjb25zdCBDaGFyYWN0ZXJU eXBlKiB0ZXh0LCB1bnNpZ25lZCBsZW5ndGgsIGNvbnN0IEZvbnRDYXNjYWRlJiBmb250Q2FzY2Fk ZSwgYm9vbCB0ZXh0SXNKdXN0aWZpZWQsIEluY2x1ZGVSZWFzb25zIGluY2x1ZGVSZWFzb25zKQog ewogICAgIE9wdGlvblNldDxBdm9pZGFuY2VSZWFzb24+IHJlYXNvbnM7CiAgICAgYXV0byYgcHJp bWFyeUZvbnQgPSBmb250Q2FzY2FkZS5wcmltYXJ5Rm9udCgpOwotICAgIGF1dG8mIGZvbnRNZXRy aWNzID0gcHJpbWFyeUZvbnQuZm9udE1ldHJpY3MoKTsKLSAgICBhdXRvIGF2YWlsYWJsZVNwYWNl Rm9yR2x5cGhBc2NlbnQgPSBmb250TWV0cmljcy5hc2NlbnQoKTsKLSAgICBhdXRvIGF2YWlsYWJs ZVNwYWNlRm9yR2x5cGhEZXNjZW50ID0gZm9udE1ldHJpY3MuZGVzY2VudCgpOwotICAgIGlmIChs aW5lSGVpZ2h0Q29uc3RyYWludCkgewotICAgICAgICBhdXRvIGxpbmVIZWlnaHRQYWRkaW5nID0g KmxpbmVIZWlnaHRDb25zdHJhaW50IC0gZm9udE1ldHJpY3MuaGVpZ2h0KCk7Ci0gICAgICAgIGF2 YWlsYWJsZVNwYWNlRm9yR2x5cGhBc2NlbnQgKz0gbGluZUhlaWdodFBhZGRpbmcgLyAyOwotICAg ICAgICBhdmFpbGFibGVTcGFjZUZvckdseXBoRGVzY2VudCArPSBsaW5lSGVpZ2h0UGFkZGluZyAv IDI7Ci0gICAgfQotCiAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IGxlbmd0aDsgKytpKSB7 CiAgICAgICAgIGF1dG8gY2hhcmFjdGVyID0gdGV4dFtpXTsKICAgICAgICAgYXV0byBjaGFyYWN0 ZXJSZWFzb25zID0gY2FuVXNlRm9yQ2hhcmFjdGVyKGNoYXJhY3RlciwgdGV4dElzSnVzdGlmaWVk LCBpbmNsdWRlUmVhc29ucyk7CkBAIC00ODYsMjEgKzQ3NiwxNSBAQCBzdGF0aWMgT3B0aW9uU2V0 PEF2b2lkYW5jZVJlYXNvbj4gY2FuVXNlRm9yVGV4dChjb25zdCBDaGFyYWN0ZXJUeXBlKiB0ZXh0 LCB1bnNpZwogICAgICAgICBhdXRvIGdseXBoRGF0YSA9IGZvbnRDYXNjYWRlLmdseXBoRGF0YUZv ckNoYXJhY3RlcihjaGFyYWN0ZXIsIGZhbHNlKTsKICAgICAgICAgaWYgKCFnbHlwaERhdGEuaXNW YWxpZCgpIHx8IGdseXBoRGF0YS5mb250ICE9ICZwcmltYXJ5Rm9udCkKICAgICAgICAgICAgIFNF VF9SRUFTT05fQU5EX1JFVFVSTl9JRl9ORUVERUQoRmxvd1ByaW1hcnlGb250SXNJbnN1ZmZpY2ll bnQsIHJlYXNvbnMsIGluY2x1ZGVSZWFzb25zKTsKLQotICAgICAgICBpZiAobGluZUhlaWdodENv bnN0cmFpbnQpIHsKLSAgICAgICAgICAgIGF1dG8gYm91bmRzID0gcHJpbWFyeUZvbnQuYm91bmRz Rm9yR2x5cGgoZ2x5cGhEYXRhLmdseXBoKTsKLSAgICAgICAgICAgIGlmIChjZWlsZigtYm91bmRz LnkoKSkgPiBhdmFpbGFibGVTcGFjZUZvckdseXBoQXNjZW50IHx8IGNlaWxmKGJvdW5kcy5tYXhZ KCkpID4gYXZhaWxhYmxlU3BhY2VGb3JHbHlwaERlc2NlbnQpCi0gICAgICAgICAgICAgICAgU0VU X1JFQVNPTl9BTkRfUkVUVVJOX0lGX05FRURFRChGbG93Rm9udEhhc092ZXJmbG93R2x5cGgsIHJl YXNvbnMsIGluY2x1ZGVSZWFzb25zKTsKLSAgICAgICAgfQogICAgIH0KICAgICByZXR1cm4gcmVh c29uczsKIH0KIAotc3RhdGljIE9wdGlvblNldDxBdm9pZGFuY2VSZWFzb24+IGNhblVzZUZvclRl eHQoU3RyaW5nVmlldyB0ZXh0LCBjb25zdCBGb250Q2FzY2FkZSYgZm9udENhc2NhZGUsIHN0ZDo6 b3B0aW9uYWw8ZmxvYXQ+IGxpbmVIZWlnaHRDb25zdHJhaW50LCBib29sIHRleHRJc0p1c3RpZmll ZCwgSW5jbHVkZVJlYXNvbnMgaW5jbHVkZVJlYXNvbnMpCitzdGF0aWMgT3B0aW9uU2V0PEF2b2lk YW5jZVJlYXNvbj4gY2FuVXNlRm9yVGV4dChTdHJpbmdWaWV3IHRleHQsIGNvbnN0IEZvbnRDYXNj YWRlJiBmb250Q2FzY2FkZSwgYm9vbCB0ZXh0SXNKdXN0aWZpZWQsIEluY2x1ZGVSZWFzb25zIGlu Y2x1ZGVSZWFzb25zKQogewogICAgIGlmICh0ZXh0LmlzOEJpdCgpKQotICAgICAgICByZXR1cm4g Y2FuVXNlRm9yVGV4dCh0ZXh0LmNoYXJhY3RlcnM4KCksIHRleHQubGVuZ3RoKCksIGZvbnRDYXNj YWRlLCBsaW5lSGVpZ2h0Q29uc3RyYWludCwgdGV4dElzSnVzdGlmaWVkLCBpbmNsdWRlUmVhc29u cyk7Ci0gICAgcmV0dXJuIGNhblVzZUZvclRleHQodGV4dC5jaGFyYWN0ZXJzMTYoKSwgdGV4dC5s ZW5ndGgoKSwgZm9udENhc2NhZGUsIGxpbmVIZWlnaHRDb25zdHJhaW50LCB0ZXh0SXNKdXN0aWZp ZWQsIGluY2x1ZGVSZWFzb25zKTsKKyAgICAgICAgcmV0dXJuIGNhblVzZUZvclRleHQodGV4dC5j aGFyYWN0ZXJzOCgpLCB0ZXh0Lmxlbmd0aCgpLCBmb250Q2FzY2FkZSwgdGV4dElzSnVzdGlmaWVk LCBpbmNsdWRlUmVhc29ucyk7CisgICAgcmV0dXJuIGNhblVzZUZvclRleHQodGV4dC5jaGFyYWN0 ZXJzMTYoKSwgdGV4dC5sZW5ndGgoKSwgZm9udENhc2NhZGUsIHRleHRJc0p1c3RpZmllZCwgaW5j bHVkZVJlYXNvbnMpOwogfQogCiBzdGF0aWMgT3B0aW9uU2V0PEF2b2lkYW5jZVJlYXNvbj4gY2Fu VXNlRm9yRm9udEFuZFRleHQoY29uc3QgUmVuZGVyQm94TW9kZWxPYmplY3QmIGNvbnRhaW5lciwg SW5jbHVkZVJlYXNvbnMgaW5jbHVkZVJlYXNvbnMpCkBAIC01MTEsOSArNDk1LDggQEAgc3RhdGlj IE9wdGlvblNldDxBdm9pZGFuY2VSZWFzb24+IGNhblVzZUZvckZvbnRBbmRUZXh0KGNvbnN0IFJl bmRlckJveE1vZGVsT2JqZWMKICAgICBhdXRvJiBmb250Q2FzY2FkZSA9IHN0eWxlLmZvbnRDYXNj YWRlKCk7CiAgICAgaWYgKGZvbnRDYXNjYWRlLnByaW1hcnlGb250KCkuaXNJbnRlcnN0aXRpYWwo KSkKICAgICAgICAgU0VUX1JFQVNPTl9BTkRfUkVUVVJOX0lGX05FRURFRChGbG93SXNNaXNzaW5n UHJpbWFyeUZvbnQsIHJlYXNvbnMsIGluY2x1ZGVSZWFzb25zKTsKLSAgICBzdGQ6Om9wdGlvbmFs PGZsb2F0PiBsaW5lSGVpZ2h0Q29uc3RyYWludDsKICAgICBpZiAoc3R5bGUubGluZUJveENvbnRh aW4oKS5jb250YWlucyhMaW5lQm94Q29udGFpbjo6R2x5cGhzKSkKLSAgICAgICAgbGluZUhlaWdo dENvbnN0cmFpbnQgPSBjb250YWluZXIubGluZUhlaWdodChmYWxzZSwgSG9yaXpvbnRhbExpbmUs IFBvc2l0aW9uT2ZJbnRlcmlvckxpbmVCb3hlcykudG9GbG9hdCgpOworICAgICAgICBTRVRfUkVB U09OX0FORF9SRVRVUk5fSUZfTkVFREVEKEZsb3dIYXNMaW5lQm94Q29udGFpbkdseXBocywgcmVh c29ucywgaW5jbHVkZVJlYXNvbnMpOwogICAgIGJvb2wgZmxvd0lzSnVzdGlmaWVkID0gc3R5bGUu dGV4dEFsaWduKCkgPT0gVGV4dEFsaWduTW9kZTo6SnVzdGlmeTsKICAgICBmb3IgKGNvbnN0IGF1 dG8mIHRleHRSZW5kZXJlciA6IGNoaWxkcmVuT2ZUeXBlPFJlbmRlclRleHQ+KGNvbnRhaW5lcikp IHsKICAgICAgICAgLy8gRklYTUU6IERvIG5vdCByZXR1cm4gdW50aWwgYWZ0ZXIgY2hlY2tpbmcg YWxsIGNoaWxkcmVuLgpAQCAtNTM3LDcgKzUyMCw3IEBAIHN0YXRpYyBPcHRpb25TZXQ8QXZvaWRh bmNlUmVhc29uPiBjYW5Vc2VGb3JGb250QW5kVGV4dChjb25zdCBSZW5kZXJCb3hNb2RlbE9iamVj CiAgICAgICAgICAgICAgICAgU0VUX1JFQVNPTl9BTkRfUkVUVVJOX0lGX05FRURFRChGbG93SGFz Q29tcGxleEZvbnRDb2RlUGF0aCwgcmVhc29ucywgaW5jbHVkZVJlYXNvbnMpOwogICAgICAgICB9 CiAKLSAgICAgICAgYXV0byB0ZXh0UmVhc29ucyA9IGNhblVzZUZvclRleHQodGV4dFJlbmRlcmVy LnN0cmluZ1ZpZXcoKSwgZm9udENhc2NhZGUsIGxpbmVIZWlnaHRDb25zdHJhaW50LCBmbG93SXNK dXN0aWZpZWQsIGluY2x1ZGVSZWFzb25zKTsKKyAgICAgICAgYXV0byB0ZXh0UmVhc29ucyA9IGNh blVzZUZvclRleHQodGV4dFJlbmRlcmVyLnN0cmluZ1ZpZXcoKSwgZm9udENhc2NhZGUsIGZsb3dJ c0p1c3RpZmllZCwgaW5jbHVkZVJlYXNvbnMpOwogICAgICAgICBpZiAodGV4dFJlYXNvbnMpCiAg ICAgICAgICAgICBBRERfUkVBU09OU19BTkRfUkVUVVJOX0lGX05FRURFRCh0ZXh0UmVhc29ucywg cmVhc29ucywgaW5jbHVkZVJlYXNvbnMpOwogICAgIH0KQEAgLTU5MSw3ICs1NzQsNyBAQCBzdGF0 aWMgT3B0aW9uU2V0PEF2b2lkYW5jZVJlYXNvbj4gY2FuVXNlRm9yU3R5bGUoY29uc3QgUmVuZGVy U3R5bGUmIHN0eWxlLCBJbmNsdQogICAgIGlmIChzdHlsZS50ZXh0U2VjdXJpdHkoKSAhPSBUZXh0 U2VjdXJpdHk6Ok5vbmUpCiAgICAgICAgIFNFVF9SRUFTT05fQU5EX1JFVFVSTl9JRl9ORUVERUQo Rmxvd0hhc1RleHRTZWN1cml0eSwgcmVhc29ucywgaW5jbHVkZVJlYXNvbnMpOwogICAgIGlmIChz dHlsZS5oeXBoZW5zKCkgPT0gSHlwaGVuczo6QXV0bykgewotICAgICAgICBhdXRvIHRleHRSZWFz b25zID0gY2FuVXNlRm9yVGV4dChzdHlsZS5oeXBoZW5TdHJpbmcoKSwgc3R5bGUuZm9udENhc2Nh ZGUoKSwgc3RkOjpudWxsb3B0LCBmYWxzZSwgaW5jbHVkZVJlYXNvbnMpOworICAgICAgICBhdXRv IHRleHRSZWFzb25zID0gY2FuVXNlRm9yVGV4dChzdHlsZS5oeXBoZW5TdHJpbmcoKSwgc3R5bGUu Zm9udENhc2NhZGUoKSwgZmFsc2UsIGluY2x1ZGVSZWFzb25zKTsKICAgICAgICAgaWYgKHRleHRS ZWFzb25zKQogICAgICAgICAgICAgQUREX1JFQVNPTlNfQU5EX1JFVFVSTl9JRl9ORUVERUQodGV4 dFJlYXNvbnMsIHJlYXNvbnMsIGluY2x1ZGVSZWFzb25zKTsKICAgICB9CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25Db3ZlcmFn ZS5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9u Q292ZXJhZ2UuaAppbmRleCAyYTA0NTg4YTNhZGU2ZDhiY2VjMzk2Y2NiZThjOWUwZTJjNzViNTNi Li5kZjBkYjE1YmQwNmVhY2EyMDJmYzEyZjI3NTcyYjAyMjBjZWQ2NWJhIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25Db3ZlcmFn ZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3Jh dGlvbkNvdmVyYWdlLmgKQEAgLTgyLDcgKzgyLDcgQEAgZW51bSBjbGFzcyBBdm9pZGFuY2VSZWFz b24gOiB1aW50NjRfdCB7CiAgICAgRmxvd0RvZXNOb3RFc3RhYmxpc2hJbmxpbmVGb3JtYXR0aW5n Q29udGV4dCAgPSAxTExVICA8PCA0MiwKICAgICBGbG93Q2hpbGRJc1NlbGVjdGVkICAgICAgICAg ICAgICAgICAgICAgICAgICA9IDFMTFUgIDw8IDQzLAogICAgIEZsb3dIYXNIYW5naW5nUHVuY3R1 YXRpb24gICAgICAgICAgICAgICAgICAgID0gMUxMVSAgPDwgNDQsCi0gICAgRmxvd0ZvbnRIYXNP dmVyZmxvd0dseXBoICAgICAgICAgICAgICAgICAgICAgPSAxTExVICA8PCA0NSwKKyAgICBGbG93 SGFzTGluZUJveENvbnRhaW5HbHlwaHMgICAgICAgICAgICAgICAgICA9IDFMTFUgIDw8IDQ1LAog ICAgIEZsb3dUZXh0SGFzU3Vycm9nYXRlUGFpciAgICAgICAgICAgICAgICAgICAgID0gMUxMVSAg PDwgNDYsCiAgICAgTXVsdGlDb2x1bW5GbG93SXNOb3RUb3BMZXZlbCAgICAgICAgICAgICAgICAg PSAxTExVICA8PCA0NywKICAgICBNdWx0aUNvbHVtbkZsb3dIYXNDb2x1bW5TcGFubmVyICAgICAg ICAgICAgICA9IDFMTFUgIDw8IDQ4LAo= 436056 2021-08-20 20:03:03 -0700 2021-08-21 06:49:41 -0700 Patch bug-228895-20210820200303.patch text/plain 6991 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxMzU5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2I1MjE4ZGZmMWVhOTIy N2FhY2Q0YWI1ZDZlYzAxMTA3ZWY4NzA1Ny4uMDkxZTE1NmNhZWMxMzQ2MThhOGU1MDY4ZTJiZjQ0 N2Q5Nzg3ZTljZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTA4LTIwICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0lGQ11bSW50ZWdyYXRpb25d IERvIG5vdCBzY2FuIHRoZSBjb250ZW50IGZvciBvdmVyZmxvd2luZyBnbHlwaCB3aGVuIGxpbmUt Ym94LWNvbnRhaW4gaXMgc2V0IHRvIGdseXBoCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yMjg4OTUKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzgxNjUx NDg3PgorCisgICAgICAgIFJldmlld2VkIGJ5IEFudHRpIEtvaXZpc3RvLgorCisgICAgICAgIFRo aXMgaXMgaW4gcHJlcGFyYXRpb24gZm9yIHJlbW92aW5nIGNvbnRlbnQgc2Nhbm5pbmcgY29tcGxl dGVseS4gCisKKyAgICAgICAgKiBsYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25D b3ZlcmFnZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6cHJpbnRS ZWFzb24pOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246OmNhblVzZUZvclRl eHQpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246OmNhblVzZUZvckZvbnRB bmRUZXh0KToKKyAgICAgICAgKiBsYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25D b3ZlcmFnZS5oOgorCiAyMDIxLTA4LTIwICBBbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4K IAogICAgICAgICBbTEZDXVtJbnRlZ3JhdGlvbl0gSW5pdGlhbGl6ZSByb290IGJveCdzIGJvcmRl ciBhbmQgcGFkZGluZyB2YWx1ZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9p bnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkNvdmVyYWdlLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkNvdmVyYWdlLmNwcAppbmRleCBj N2Y4Yzc0OTJhNmRkZTMzNThjYzdhMWIzZDI2MDY3NjVjMjdmZjIyLi4zNDZhMDA2MWZiNTIwMTE2 ZGQwYTI1MjE5MzZkOTM3Y2IwMzFhNzhkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25Db3ZlcmFnZS5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uQ292ZXJhZ2UuY3Bw CkBAIC0yMDQsOCArMjA0LDggQEAgc3RhdGljIHZvaWQgcHJpbnRSZWFzb24oQXZvaWRhbmNlUmVh c29uIHJlYXNvbiwgVGV4dFN0cmVhbSYgc3RyZWFtKQogICAgIGNhc2UgQXZvaWRhbmNlUmVhc29u OjpGbG93Q2hpbGRJc1NlbGVjdGVkOgogICAgICAgICBzdHJlYW0gPDwgInNlbGVjdGVkIGNvbnRl bnQiOwogICAgICAgICBicmVhazsKLSAgICBjYXNlIEF2b2lkYW5jZVJlYXNvbjo6Rmxvd0ZvbnRI YXNPdmVyZmxvd0dseXBoOgotICAgICAgICBzdHJlYW0gPDwgIi13ZWJraXQtbGluZS1ib3gtY29u dGFpbjogZ2x5cGhzIHdpdGggb3ZlcmZsb3dpbmcgdGV4dC4iOworICAgIGNhc2UgQXZvaWRhbmNl UmVhc29uOjpGbG93SGFzTGluZUJveENvbnRhaW5HbHlwaHM6CisgICAgICAgIHN0cmVhbSA8PCAi LXdlYmtpdC1saW5lLWJveC1jb250YWluOiBnbHlwaHMiOwogICAgICAgICBicmVhazsKICAgICBj YXNlIEF2b2lkYW5jZVJlYXNvbjo6Rmxvd1RleHRIYXNTdXJyb2dhdGVQYWlyOgogICAgICAgICBz dHJlYW0gPDwgInN1cnJvZ2F0ZSBwYWlyIjsKQEAgLTQzNiwxOCArNDM2LDEwIEBAIHRlbXBsYXRl PD4gT3B0aW9uU2V0PEF2b2lkYW5jZVJlYXNvbj4gY2FuVXNlRm9yQ2hhcmFjdGVyKExDaGFyLCBJ bmNsdWRlUmVhc29ucykKIH0KIAogdGVtcGxhdGUgPHR5cGVuYW1lIENoYXJhY3RlclR5cGU+Ci1z dGF0aWMgT3B0aW9uU2V0PEF2b2lkYW5jZVJlYXNvbj4gY2FuVXNlRm9yVGV4dChjb25zdCBDaGFy YWN0ZXJUeXBlKiB0ZXh0LCB1bnNpZ25lZCBsZW5ndGgsIGNvbnN0IEZvbnRDYXNjYWRlJiBmb250 Q2FzY2FkZSwgc3RkOjpvcHRpb25hbDxmbG9hdD4gbGluZUhlaWdodENvbnN0cmFpbnQsIEluY2x1 ZGVSZWFzb25zIGluY2x1ZGVSZWFzb25zKQorc3RhdGljIE9wdGlvblNldDxBdm9pZGFuY2VSZWFz b24+IGNhblVzZUZvclRleHQoY29uc3QgQ2hhcmFjdGVyVHlwZSogdGV4dCwgdW5zaWduZWQgbGVu Z3RoLCBjb25zdCBGb250Q2FzY2FkZSYgZm9udENhc2NhZGUsIEluY2x1ZGVSZWFzb25zIGluY2x1 ZGVSZWFzb25zKQogewogICAgIE9wdGlvblNldDxBdm9pZGFuY2VSZWFzb24+IHJlYXNvbnM7CiAg ICAgYXV0byYgcHJpbWFyeUZvbnQgPSBmb250Q2FzY2FkZS5wcmltYXJ5Rm9udCgpOwotICAgIGF1 dG8mIGZvbnRNZXRyaWNzID0gcHJpbWFyeUZvbnQuZm9udE1ldHJpY3MoKTsKLSAgICBhdXRvIGF2 YWlsYWJsZVNwYWNlRm9yR2x5cGhBc2NlbnQgPSBmb250TWV0cmljcy5hc2NlbnQoKTsKLSAgICBh dXRvIGF2YWlsYWJsZVNwYWNlRm9yR2x5cGhEZXNjZW50ID0gZm9udE1ldHJpY3MuZGVzY2VudCgp OwotICAgIGlmIChsaW5lSGVpZ2h0Q29uc3RyYWludCkgewotICAgICAgICBhdXRvIGxpbmVIZWln aHRQYWRkaW5nID0gKmxpbmVIZWlnaHRDb25zdHJhaW50IC0gZm9udE1ldHJpY3MuaGVpZ2h0KCk7 Ci0gICAgICAgIGF2YWlsYWJsZVNwYWNlRm9yR2x5cGhBc2NlbnQgKz0gbGluZUhlaWdodFBhZGRp bmcgLyAyOwotICAgICAgICBhdmFpbGFibGVTcGFjZUZvckdseXBoRGVzY2VudCArPSBsaW5lSGVp Z2h0UGFkZGluZyAvIDI7Ci0gICAgfQogCiAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IGxl bmd0aDsgKytpKSB7CiAgICAgICAgIGF1dG8gY2hhcmFjdGVyID0gdGV4dFtpXTsKQEAgLTQ1OCwy MSArNDUwLDE1IEBAIHN0YXRpYyBPcHRpb25TZXQ8QXZvaWRhbmNlUmVhc29uPiBjYW5Vc2VGb3JU ZXh0KGNvbnN0IENoYXJhY3RlclR5cGUqIHRleHQsIHVuc2lnCiAgICAgICAgIGF1dG8gZ2x5cGhE YXRhID0gZm9udENhc2NhZGUuZ2x5cGhEYXRhRm9yQ2hhcmFjdGVyKGNoYXJhY3RlciwgZmFsc2Up OwogICAgICAgICBpZiAoIWdseXBoRGF0YS5pc1ZhbGlkKCkgfHwgZ2x5cGhEYXRhLmZvbnQgIT0g JnByaW1hcnlGb250KQogICAgICAgICAgICAgU0VUX1JFQVNPTl9BTkRfUkVUVVJOX0lGX05FRURF RChGbG93UHJpbWFyeUZvbnRJc0luc3VmZmljaWVudCwgcmVhc29ucywgaW5jbHVkZVJlYXNvbnMp OwotCi0gICAgICAgIGlmIChsaW5lSGVpZ2h0Q29uc3RyYWludCkgewotICAgICAgICAgICAgYXV0 byBib3VuZHMgPSBwcmltYXJ5Rm9udC5ib3VuZHNGb3JHbHlwaChnbHlwaERhdGEuZ2x5cGgpOwot ICAgICAgICAgICAgaWYgKGNlaWxmKC1ib3VuZHMueSgpKSA+IGF2YWlsYWJsZVNwYWNlRm9yR2x5 cGhBc2NlbnQgfHwgY2VpbGYoYm91bmRzLm1heFkoKSkgPiBhdmFpbGFibGVTcGFjZUZvckdseXBo RGVzY2VudCkKLSAgICAgICAgICAgICAgICBTRVRfUkVBU09OX0FORF9SRVRVUk5fSUZfTkVFREVE KEZsb3dGb250SGFzT3ZlcmZsb3dHbHlwaCwgcmVhc29ucywgaW5jbHVkZVJlYXNvbnMpOwotICAg ICAgICB9CiAgICAgfQogICAgIHJldHVybiByZWFzb25zOwogfQogCi1zdGF0aWMgT3B0aW9uU2V0 PEF2b2lkYW5jZVJlYXNvbj4gY2FuVXNlRm9yVGV4dChTdHJpbmdWaWV3IHRleHQsIGNvbnN0IEZv bnRDYXNjYWRlJiBmb250Q2FzY2FkZSwgc3RkOjpvcHRpb25hbDxmbG9hdD4gbGluZUhlaWdodENv bnN0cmFpbnQsIEluY2x1ZGVSZWFzb25zIGluY2x1ZGVSZWFzb25zKQorc3RhdGljIE9wdGlvblNl dDxBdm9pZGFuY2VSZWFzb24+IGNhblVzZUZvclRleHQoU3RyaW5nVmlldyB0ZXh0LCBjb25zdCBG b250Q2FzY2FkZSYgZm9udENhc2NhZGUsIEluY2x1ZGVSZWFzb25zIGluY2x1ZGVSZWFzb25zKQog ewogICAgIGlmICh0ZXh0LmlzOEJpdCgpKQotICAgICAgICByZXR1cm4gY2FuVXNlRm9yVGV4dCh0 ZXh0LmNoYXJhY3RlcnM4KCksIHRleHQubGVuZ3RoKCksIGZvbnRDYXNjYWRlLCBsaW5lSGVpZ2h0 Q29uc3RyYWludCwgaW5jbHVkZVJlYXNvbnMpOwotICAgIHJldHVybiBjYW5Vc2VGb3JUZXh0KHRl eHQuY2hhcmFjdGVyczE2KCksIHRleHQubGVuZ3RoKCksIGZvbnRDYXNjYWRlLCBsaW5lSGVpZ2h0 Q29uc3RyYWludCwgaW5jbHVkZVJlYXNvbnMpOworICAgICAgICByZXR1cm4gY2FuVXNlRm9yVGV4 dCh0ZXh0LmNoYXJhY3RlcnM4KCksIHRleHQubGVuZ3RoKCksIGZvbnRDYXNjYWRlLCBpbmNsdWRl UmVhc29ucyk7CisgICAgcmV0dXJuIGNhblVzZUZvclRleHQodGV4dC5jaGFyYWN0ZXJzMTYoKSwg dGV4dC5sZW5ndGgoKSwgZm9udENhc2NhZGUsIGluY2x1ZGVSZWFzb25zKTsKIH0KIAogc3RhdGlj IE9wdGlvblNldDxBdm9pZGFuY2VSZWFzb24+IGNhblVzZUZvckZvbnRBbmRUZXh0KGNvbnN0IFJl bmRlckJveE1vZGVsT2JqZWN0JiBjb250YWluZXIsIEluY2x1ZGVSZWFzb25zIGluY2x1ZGVSZWFz b25zKQpAQCAtNDgzLDkgKzQ2OSw4IEBAIHN0YXRpYyBPcHRpb25TZXQ8QXZvaWRhbmNlUmVhc29u PiBjYW5Vc2VGb3JGb250QW5kVGV4dChjb25zdCBSZW5kZXJCb3hNb2RlbE9iamVjCiAgICAgYXV0 byYgZm9udENhc2NhZGUgPSBzdHlsZS5mb250Q2FzY2FkZSgpOwogICAgIGlmIChmb250Q2FzY2Fk ZS5wcmltYXJ5Rm9udCgpLmlzSW50ZXJzdGl0aWFsKCkpCiAgICAgICAgIFNFVF9SRUFTT05fQU5E X1JFVFVSTl9JRl9ORUVERUQoRmxvd0lzTWlzc2luZ1ByaW1hcnlGb250LCByZWFzb25zLCBpbmNs dWRlUmVhc29ucyk7Ci0gICAgc3RkOjpvcHRpb25hbDxmbG9hdD4gbGluZUhlaWdodENvbnN0cmFp bnQ7CiAgICAgaWYgKHN0eWxlLmxpbmVCb3hDb250YWluKCkuY29udGFpbnMoTGluZUJveENvbnRh aW46OkdseXBocykpCi0gICAgICAgIGxpbmVIZWlnaHRDb25zdHJhaW50ID0gY29udGFpbmVyLmxp bmVIZWlnaHQoZmFsc2UsIEhvcml6b250YWxMaW5lLCBQb3NpdGlvbk9mSW50ZXJpb3JMaW5lQm94 ZXMpLnRvRmxvYXQoKTsKKyAgICAgICAgU0VUX1JFQVNPTl9BTkRfUkVUVVJOX0lGX05FRURFRChG bG93SGFzTGluZUJveENvbnRhaW5HbHlwaHMsIHJlYXNvbnMsIGluY2x1ZGVSZWFzb25zKTsKICAg ICBmb3IgKGNvbnN0IGF1dG8mIHRleHRSZW5kZXJlciA6IGNoaWxkcmVuT2ZUeXBlPFJlbmRlclRl eHQ+KGNvbnRhaW5lcikpIHsKICAgICAgICAgLy8gRklYTUU6IERvIG5vdCByZXR1cm4gdW50aWwg YWZ0ZXIgY2hlY2tpbmcgYWxsIGNoaWxkcmVuLgogICAgICAgICBpZiAodGV4dFJlbmRlcmVyLmlz Q29tYmluZVRleHQoKSkKQEAgLTUwOCw3ICs0OTMsNyBAQCBzdGF0aWMgT3B0aW9uU2V0PEF2b2lk YW5jZVJlYXNvbj4gY2FuVXNlRm9yRm9udEFuZFRleHQoY29uc3QgUmVuZGVyQm94TW9kZWxPYmpl YwogICAgICAgICAgICAgICAgIFNFVF9SRUFTT05fQU5EX1JFVFVSTl9JRl9ORUVERUQoRmxvd0hh c0NvbXBsZXhGb250Q29kZVBhdGgsIHJlYXNvbnMsIGluY2x1ZGVSZWFzb25zKTsKICAgICAgICAg fQogCi0gICAgICAgIGF1dG8gdGV4dFJlYXNvbnMgPSBjYW5Vc2VGb3JUZXh0KHRleHRSZW5kZXJl ci5zdHJpbmdWaWV3KCksIGZvbnRDYXNjYWRlLCBsaW5lSGVpZ2h0Q29uc3RyYWludCwgaW5jbHVk ZVJlYXNvbnMpOworICAgICAgICBhdXRvIHRleHRSZWFzb25zID0gY2FuVXNlRm9yVGV4dCh0ZXh0 UmVuZGVyZXIuc3RyaW5nVmlldygpLCBmb250Q2FzY2FkZSwgaW5jbHVkZVJlYXNvbnMpOwogICAg ICAgICBpZiAodGV4dFJlYXNvbnMpCiAgICAgICAgICAgICBBRERfUkVBU09OU19BTkRfUkVUVVJO X0lGX05FRURFRCh0ZXh0UmVhc29ucywgcmVhc29ucywgaW5jbHVkZVJlYXNvbnMpOwogICAgIH0K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRl Z3JhdGlvbkNvdmVyYWdlLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5 b3V0SW50ZWdyYXRpb25Db3ZlcmFnZS5oCmluZGV4IGI4OTUzODhhMDI0MjAyZjRjNTM0YmQwNjFm M2UxYjVlZTBmNjJjOGIuLmVhZjMxMjI2ZWZiMTk4ODZjNTljMGYwOTQwZmZlMTExZjk1ODk2YjYg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRl Z3JhdGlvbkNvdmVyYWdlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9u L0xheW91dEludGVncmF0aW9uQ292ZXJhZ2UuaApAQCAtODIsNyArODIsNyBAQCBlbnVtIGNsYXNz IEF2b2lkYW5jZVJlYXNvbiA6IHVpbnQ2NF90IHsKICAgICBGbG93RG9lc05vdEVzdGFibGlzaElu bGluZUZvcm1hdHRpbmdDb250ZXh0ICA9IDFMTFUgIDw8IDQyLAogICAgIEZsb3dDaGlsZElzU2Vs ZWN0ZWQgICAgICAgICAgICAgICAgICAgICAgICAgID0gMUxMVSAgPDwgNDMsCiAgICAgRmxvd0hh c0hhbmdpbmdQdW5jdHVhdGlvbiAgICAgICAgICAgICAgICAgICAgPSAxTExVICA8PCA0NCwKLSAg ICBGbG93Rm9udEhhc092ZXJmbG93R2x5cGggICAgICAgICAgICAgICAgICAgICA9IDFMTFUgIDw8 IDQ1LAorICAgIEZsb3dIYXNMaW5lQm94Q29udGFpbkdseXBocyAgICAgICAgICAgICAgICAgID0g MUxMVSAgPDwgNDUsCiAgICAgRmxvd1RleHRIYXNTdXJyb2dhdGVQYWlyICAgICAgICAgICAgICAg ICAgICAgPSAxTExVICA8PCA0NiwKICAgICBNdWx0aUNvbHVtbkZsb3dJc05vdFRvcExldmVsICAg ICAgICAgICAgICAgICA9IDFMTFUgIDw8IDQ3LAogICAgIE11bHRpQ29sdW1uRmxvd0hhc0NvbHVt blNwYW5uZXIgICAgICAgICAgICAgID0gMUxMVSAgPDwgNDgsCg==