205024 2019-12-09 13:29:18 -0800 [LFC][IFC] Add support for word-break: break-word (and overflow-wrap) 2019-12-09 14:19:10 -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 1596931 0 zalan 2019-12-09 13:29:18 -0800 and (partially)fix /fast/text//word-break.html 1596932 1 webkit-bug-importer 2019-12-09 13:29:47 -0800 <rdar://problem/57766087> 1596933 2 385182 zalan 2019-12-09 13:32:57 -0800 Created attachment 385182 Patch 1596953 3 385182 commit-queue 2019-12-09 14:19:08 -0800 Comment on attachment 385182 Patch Clearing flags on attachment: 385182 Committed r253301: <https://trac.webkit.org/changeset/253301> 1596954 4 commit-queue 2019-12-09 14:19:10 -0800 All reviewed patches have been landed. Closing bug. 385182 2019-12-09 13:32:57 -0800 2019-12-09 14:19:08 -0800 Patch bug-205024-20191209133256.patch text/plain 11198 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjUzMjk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTM5MGE2ZjIzNTkxMGNj YzcxMTE4MjQ2NTgxZmFlMzU5ZjBjYTI3NS4uMTVlZjRlZDM3YzNmYTNiZTYwYTNhMWNhOGVkYjdj NDdmMTkzMjQ1MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDE5LTEyLTA5ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBBZGQgc3Vw cG9ydCBmb3Igd29yZC1icmVhazogYnJlYWstd29yZCAoYW5kIG92ZXJmbG93LXdyYXApCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDUwMjQKKyAgICAg ICAgPHJkYXI6Ly9wcm9ibGVtLzU3NzY2MDg3PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIGlzVGV4dFNwbGl0QXRBcmJpdHJhcnlQb3NpdGlvbkFsbG93 ZWQoKSByZXR1cm5zIHRydWUgaWYgdGhlIHRleHQgY29udGVudCBjYW4ganVzdCBzcGxpdCBhbnl3 aGVyZS4KKyAgICAgICAgd29yZC1icmVhazogYnJlYWstd29yZCBiZWhhdmVzIGxpa2UgdGhhdCB1 bmxlc3MgdGhlIGxpbmUgYWxyZWFkeSBoYXMgYnJlYWtpbmcgb3Bwb3J0dW5pdHkuCisgICAgICAg IFNlZSBodHRwczovL3d3dy53My5vcmcvVFIvY3NzLXRleHQtMy8jd29yZC1icmVhay1wcm9wZXJ0 eQorCisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJyZWFrZXIu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0Ojppc1RleHRDb250ZW50V3JhcHBpbmdBbGxv d2VkKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6aXNDb250ZW50U3BsaXRBbGxvd2VkKToK KyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6aXNUZXh0U3BsaXRBdEFyYml0cmFyeVBvc2l0aW9u QWxsb3dlZCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCcmVha2VyOjpicmVha2lu Z0NvbnRleHRGb3JJbmxpbmVDb250ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGlu ZUJyZWFrZXI6OndvcmRCcmVha2luZ0JlaGF2aW9yIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6 OkxheW91dDo6TGluZUJyZWFrZXI6OnRyeUJyZWFraW5nVGV4dFJ1biBjb25zdCk6CisgICAgICAg IChXZWJDb3JlOjpMYXlvdXQ6OmlzQ29udGVudFdyYXBwaW5nQWxsb3dlZCk6IERlbGV0ZWQuCisg ICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJyZWFrZXIuaDoKKwog MjAxOS0xMi0wOSAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtM RkNdW0lGQ10gZml4IGZhc3QvdGV4dC9zaW1wbGUtbGluZXMtbXVsdGlwbGUtcmVuZGVyZXJzLWJy ZWFrLmh0bWwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0 aW5nL0lubGluZUxpbmVCcmVha2VyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVm b3JtYXR0aW5nL0lubGluZUxpbmVCcmVha2VyLmNwcAppbmRleCA5YjMzYzMzZThjYzgxYTE5Yjhk OWM4ZjA5Nzg3ZDExZGY2ZGZjYzQ1Li5iZjg1NmEwZmQzMzQ0ZGQzZTkyMWZkNWIxYmI1NDE5YzRl NjViMTAxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGlu Zy9JbmxpbmVMaW5lQnJlYWtlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGlu ZWZvcm1hdHRpbmcvSW5saW5lTGluZUJyZWFrZXIuY3BwCkBAIC0zNywxNiArMzcsMzUgQEAKIG5h bWVzcGFjZSBXZWJDb3JlIHsKIG5hbWVzcGFjZSBMYXlvdXQgewogCi1zdGF0aWMgaW5saW5lIGJv b2wgaXNDb250ZW50V3JhcHBpbmdBbGxvd2VkKGNvbnN0IExpbmVCcmVha2VyOjpDb250ZW50OjpS dW4mIHJ1bikKK3N0YXRpYyBpbmxpbmUgYm9vbCBpc1RleHRDb250ZW50V3JhcHBpbmdBbGxvd2Vk KGNvbnN0IFJlbmRlclN0eWxlJiBzdHlsZSkKIHsKKyAgICAvLyBEbyBub3QgdHJ5IHRvIHB1c2gg b3ZlcmZsb3duICdwcmUnIGFuZCAnbm8td3JhcCcgY29udGVudCB0byBuZXh0IGxpbmUuCisgICAg cmV0dXJuIHN0eWxlLndoaXRlU3BhY2UoKSAhPSBXaGl0ZVNwYWNlOjpQcmUgJiYgc3R5bGUud2hp dGVTcGFjZSgpICE9IFdoaXRlU3BhY2U6Ok5vV3JhcDsKK30KKworc3RhdGljIGlubGluZSBib29s IGlzQ29udGVudFNwbGl0QWxsb3dlZChjb25zdCBMaW5lQnJlYWtlcjo6Q29udGVudDo6UnVuJiBy dW4pCit7CisgICAgQVNTRVJUKHJ1bi5pbmxpbmVJdGVtLmlzVGV4dCgpIHx8IHJ1bi5pbmxpbmVJ dGVtLmlzQ29udGFpbmVyU3RhcnQoKSB8fCBydW4uaW5saW5lSXRlbS5pc0NvbnRhaW5lckVuZCgp KTsKICAgICBpZiAoIXJ1bi5pbmxpbmVJdGVtLmlzVGV4dCgpKSB7CiAgICAgICAgIC8vIENhbid0 IHNwbGl0IGhvcml6b250YWwgc3BhY2luZyAtPiBlLmcuIDxzcGFuIHN0eWxlPSJwYWRkaW5nLXJp Z2h0OiAxMDBweDsiPnRleHRjb250ZW50PC9zcGFuPiwgaWYgdGhlIFtjb250YWluZXIgZW5kXSBp cyB0aGUgb3ZlcmZsb3duIGlubGluZSBpdGVtCiAgICAgICAgIC8vIHdlIG5lZWQgdG8gY2hlY2sg aWYgdGhlcmUncyBhbm90aGVyIGlubGluZSBpdGVtIGJleW9uZCB0aGUgW2NvbnRhaW5lciBlbmRd IHRvIHNwbGl0LgogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQotICAgIGF1dG8mIHN0eWxl ID0gcnVuLmlubGluZUl0ZW0uc3R5bGUoKTsKLSAgICAvLyBEbyBub3QgdHJ5IHRvIHNwbGl0ICdw cmUnIGFuZCAnbm8td3JhcCcgY29udGVudC4KLSAgICByZXR1cm4gc3R5bGUud2hpdGVTcGFjZSgp ICE9IFdoaXRlU3BhY2U6OlByZSAmJiBzdHlsZS53aGl0ZVNwYWNlKCkgIT0gV2hpdGVTcGFjZTo6 Tm9XcmFwOworICAgIHJldHVybiBpc1RleHRDb250ZW50V3JhcHBpbmdBbGxvd2VkKHJ1bi5pbmxp bmVJdGVtLnN0eWxlKCkpOworfQorCitzdGF0aWMgaW5saW5lIGJvb2wgaXNUZXh0U3BsaXRBdEFy Yml0cmFyeVBvc2l0aW9uQWxsb3dlZChjb25zdCBSZW5kZXJTdHlsZSYgc3R5bGUsIGJvb2wgbGlu ZUlzRW1wdHkpCit7CisgICAgaWYgKHN0eWxlLndvcmRCcmVhaygpID09IFdvcmRCcmVhazo6QnJl YWtBbGwpCisgICAgICAgIHJldHVybiB0cnVlOworICAgIC8vIEZvciBjb21wYXRpYmlsaXR5IHdp dGggbGVnYWN5IGNvbnRlbnQsIHRoZSB3b3JkLWJyZWFrIHByb3BlcnR5IGFsc28gc3VwcG9ydHMg YSBkZXByZWNhdGVkIGJyZWFrLXdvcmQga2V5d29yZC4KKyAgICAvLyBXaGVuIHNwZWNpZmllZCwg dGhpcyBoYXMgdGhlIHNhbWUgZWZmZWN0IGFzIHdvcmQtYnJlYWs6IG5vcm1hbCBhbmQgb3ZlcmZs b3ctd3JhcDogYW55d2hlcmUsIHJlZ2FyZGxlc3Mgb2YgdGhlIGFjdHVhbCB2YWx1ZSBvZiB0aGUg b3ZlcmZsb3ctd3JhcCBwcm9wZXJ0eS4KKyAgICBpZiAoc3R5bGUud29yZEJyZWFrKCkgPT0gV29y ZEJyZWFrOjpCcmVha1dvcmQgJiYgbGluZUlzRW1wdHkpCisgICAgICAgIHJldHVybiB0cnVlOwor ICAgIC8vIE92ZXJmbG93V3JhcDo6QnJlYWsgLT4gQW4gb3RoZXJ3aXNlIHVuYnJlYWthYmxlIHNl cXVlbmNlIG9mIGNoYXJhY3RlcnMgbWF5IGJlIGJyb2tlbiBhdCBhbiBhcmJpdHJhcnkgcG9pbnQg aWYgdGhlcmUgYXJlIG5vIG90aGVyd2lzZS1hY2NlcHRhYmxlIGJyZWFrIHBvaW50cyBpbiB0aGUg bGluZS4KKyAgICBpZiAoc3R5bGUub3ZlcmZsb3dXcmFwKCkgPT0gT3ZlcmZsb3dXcmFwOjpCcmVh ayAmJiBsaW5lSXNFbXB0eSkKKyAgICAgICAgcmV0dXJuIHRydWU7CisgICAgcmV0dXJuIGZhbHNl OwogfQogCiBzdGF0aWMgaW5saW5lIGJvb2wgaXNUcmFpbGluZ1doaXRlc3BhY2VXaXRoUHJlV3Jh cChjb25zdCBJbmxpbmVJdGVtJiB0cmFpbGluZ0lubGluZUl0ZW0pCkBAIC03OSw3ICs5OCw3IEBA IExpbmVCcmVha2VyOjpCcmVha2luZ0NvbnRleHQgTGluZUJyZWFrZXI6OmJyZWFraW5nQ29udGV4 dEZvcklubGluZUNvbnRlbnQoY29uc3QKIAogICAgIGlmIChjYW5kaWRhdGVSdW5zLmhhc1RleHRD b250ZW50T25seSgpKSB7CiAgICAgICAgIGF1dG8mIHJ1bnMgPSBjYW5kaWRhdGVSdW5zLnJ1bnMo KTsKLSAgICAgICAgaWYgKGF1dG8gcGFydGlhbFRyYWlsaW5nQ29udGVudCA9IHdvcmRCcmVha2lu Z0JlaGF2aW9yKHJ1bnMsIGxpbmVTdGF0dXMuYXZhaWxhYmxlV2lkdGgpKSB7CisgICAgICAgIGlm IChhdXRvIHBhcnRpYWxUcmFpbGluZ0NvbnRlbnQgPSB3b3JkQnJlYWtpbmdCZWhhdmlvcihydW5z LCBsaW5lU3RhdHVzKSkgewogICAgICAgICAgICAgLy8gV2UgdHJpZWQgdG8gc3BsaXQgdGhlIGNv bnRlbnQgYnV0IHRoZSBhdmFpbGFibGUgc3BhY2UgY2FuJ3QgZXZlbiBhY2NvbW1vZGF0ZSB0aGUg Zmlyc3QgY2hhcmFjdGVyLgogICAgICAgICAgICAgaWYgKCFwYXJ0aWFsVHJhaWxpbmdDb250ZW50 LT5sZW5ndGgpIHsKICAgICAgICAgICAgICAgICAvLyAxLiBQdXNoIHRoZSBjb250ZW50IG92ZXIg dG8gdGhlIG5leHQgbGluZSB3aGVuIHdlJ3ZlIGdvdCBjb250ZW50IG9uIHRoZSBsaW5lIGFscmVh ZHkuCkBAIC05Nyw3ICsxMTYsNyBAQCBMaW5lQnJlYWtlcjo6QnJlYWtpbmdDb250ZXh0IExpbmVC cmVha2VyOjpicmVha2luZ0NvbnRleHRGb3JJbmxpbmVDb250ZW50KGNvbnN0CiAgICAgICAgICAg ICByZXR1cm4geyBCcmVha2luZ0NvbnRleHQ6OkNvbnRlbnRXcmFwcGluZ1J1bGU6OlNwbGl0LCBw YXJ0aWFsVHJhaWxpbmdDb250ZW50IH07CiAgICAgICAgIH0KICAgICAgICAgLy8gSWYgd2UgYXJl IG5vdCBhbGxvd2VkIHRvIGJyZWFrIHRoaXMgY29udGVudCwgd2Ugc3RpbGwgbmVlZCB0byBkZWNp ZGUgd2hldGhlciBrZWVwIGl0IG9yIHB1c2ggaXQgdG8gdGhlIG5leHQgbGluZS4KLSAgICAgICAg YXV0byBjb250ZW50U2hvdWxkT3ZlcmZsb3cgPSBsaW5lU3RhdHVzLmxpbmVJc0VtcHR5IHx8ICFp c0NvbnRlbnRXcmFwcGluZ0FsbG93ZWQocnVuc1swXSk7CisgICAgICAgIGF1dG8gY29udGVudFNo b3VsZE92ZXJmbG93ID0gbGluZVN0YXR1cy5saW5lSXNFbXB0eSB8fCAhaXNUZXh0Q29udGVudFdy YXBwaW5nQWxsb3dlZChydW5zWzBdLmlubGluZUl0ZW0uc3R5bGUoKSk7CiAgICAgICAgIC8vIEZJ WE1FOiB3aGl0ZS1zcGFjZTogcHJlLXdyYXAgbmVlZHMgY2xhcmlmaWNhdGlvbi4gQWNjb3JkaW5n IHRvIENTUyBUZXh0IE1vZHVsZSBMZXZlbCAzLCBjb250ZW50IHdyYXBwaW5nIGlzIGFzICdub3Jt YWwnIGJ1dCBhcHBhcmVudGx5CiAgICAgICAgIC8vIHdlIG5lZWQgdG8ga2VlcCB0aGUgb3Zlcmxh cHBpbmcgd2hpdGVzcGFjZSBvbiB0aGUgbGluZSAoYW5kIGhhbmcgaXQgSSdkIGFzc3VtZSkuCiAg ICAgICAgIGlmIChpc1RyYWlsaW5nV2hpdGVzcGFjZVdpdGhQcmVXcmFwKHJ1bnMubGFzdCgpLmlu bGluZUl0ZW0pKQpAQCAtMTEzLDcgKzEzMiw3IEBAIGJvb2wgTGluZUJyZWFrZXI6OnNob3VsZFdy YXBGbG9hdEJveChJbmxpbmVMYXlvdXRVbml0IGZsb2F0TG9naWNhbFdpZHRoLCBJbmxpbmVMCiAg ICAgcmV0dXJuICFsaW5lSXNFbXB0eSAmJiBmbG9hdExvZ2ljYWxXaWR0aCA+IGF2YWlsYWJsZVdp ZHRoOwogfQogCi1PcHRpb25hbDxMaW5lQnJlYWtlcjo6QnJlYWtpbmdDb250ZXh0OjpQYXJ0aWFs VHJhaWxpbmdDb250ZW50PiBMaW5lQnJlYWtlcjo6d29yZEJyZWFraW5nQmVoYXZpb3IoY29uc3Qg Q29udGVudDo6UnVuTGlzdCYgcnVucywgSW5saW5lTGF5b3V0VW5pdCBhdmFpbGFibGVXaWR0aCkg Y29uc3QKK09wdGlvbmFsPExpbmVCcmVha2VyOjpCcmVha2luZ0NvbnRleHQ6OlBhcnRpYWxUcmFp bGluZ0NvbnRlbnQ+IExpbmVCcmVha2VyOjp3b3JkQnJlYWtpbmdCZWhhdmlvcihjb25zdCBDb250 ZW50OjpSdW5MaXN0JiBydW5zLCBjb25zdCBMaW5lU3RhdHVzJiBsaW5lU3RhdHVzKSBjb25zdAog ewogICAgIC8vIENoZWNrIHdoZXJlIHRoZSBvdmVyZmxvdyBvY2N1cnMgYW5kIHVzZSB0aGUgY29y cmVzcG9uZGluZyBzdHlsZSB0byBmaWd1cmUgb3V0IHRoZSBicmVha2luZyBiZWhhdmlvdXIuCiAg ICAgLy8gPHNwYW4gc3R5bGU9IndvcmQtYnJlYWs6IG5vcm1hbCI+Zmlyc3Q8L3NwYW4+PHNwYW4g c3R5bGU9IndvcmQtYnJlYWs6IGJyZWFrLWFsbCI+c2Vjb25kPC9zcGFuPjxzcGFuIHN0eWxlPSJ3 b3JkLWJyZWFrOiBub3JtYWwiPnRoaXJkPC9zcGFuPgpAQCAtMTIyLDEyICsxNDEsMTIgQEAgT3B0 aW9uYWw8TGluZUJyZWFrZXI6OkJyZWFraW5nQ29udGV4dDo6UGFydGlhbFRyYWlsaW5nQ29udGVu dD4gTGluZUJyZWFrZXI6OndvcmQKICAgICB3aGlsZSAoaW5kZXggPCBydW5zLnNpemUoKSkgewog ICAgICAgICBhdXRvJiBydW4gPSBydW5zW2luZGV4XTsKICAgICAgICAgQVNTRVJUKHJ1bi5pbmxp bmVJdGVtLmlzVGV4dCgpIHx8IHJ1bi5pbmxpbmVJdGVtLmlzQ29udGFpbmVyU3RhcnQoKSB8fCBy dW4uaW5saW5lSXRlbS5pc0NvbnRhaW5lckVuZCgpKTsKLSAgICAgICAgaWYgKGFjY3VtdWxhdGVk UnVuV2lkdGggKyBydW4ubG9naWNhbFdpZHRoID4gYXZhaWxhYmxlV2lkdGggJiYgaXNDb250ZW50 V3JhcHBpbmdBbGxvd2VkKHJ1bikpIHsKKyAgICAgICAgaWYgKGFjY3VtdWxhdGVkUnVuV2lkdGgg KyBydW4ubG9naWNhbFdpZHRoID4gbGluZVN0YXR1cy5hdmFpbGFibGVXaWR0aCAmJiBpc0NvbnRl bnRTcGxpdEFsbG93ZWQocnVuKSkgewogICAgICAgICAgICAgLy8gQXQgdGhpcyBwb2ludCB0aGUg YXZhaWxhYmxlIHdpZHRoIGNhbiB2ZXJ5IHdlbGwgYmUgbmVnYXRpdmUgZS5nLiB3aGVuIHNvbWUg cGFydCBvZiB0aGUgY29udGludW91cyB0ZXh0IGNvbnRlbnQgY2FuIG5vdCBiZSBicm9rZW4gaW50 byBwYXJ0cyAtPgogICAgICAgICAgICAgLy8gPHNwYW4gc3R5bGU9IndvcmQtYnJlYWs6IGtlZXAt YWxsIj50ZXh0Y29udGVudHdpdGhub2JyZWFrPC9zcGFuPjxzcGFuPnRleHRjb250ZW50d2l0aHll c2JyZWFrPC9zcGFuPgogICAgICAgICAgICAgLy8gV2hlbiB0aGUgZmlyc3Qgc3BhbiBjb21wdXRl cyBsb25nZXIgdGhhbiB0aGUgYXZhaWxhYmxlIHNwYWNlLCBieSB0aGUgdGltZSB3ZSBnZXQgdG8g dGhlIHNlY29uZCBzcGFuLCB0aGUgYWRqdXN0ZWQgYXZhaWxhYmxlIHNwYWNlIGJlY29tZXMgbmVn YXRpdmUuCi0gICAgICAgICAgICBhdXRvIGFkanVzdGVkQXZhaWxhYmxlV2lkdGggPSBzdGQ6Om1h eDxJbmxpbmVMYXlvdXRVbml0PigwLCBhdmFpbGFibGVXaWR0aCAtIGFjY3VtdWxhdGVkUnVuV2lk dGgpOwotICAgICAgICAgICAgaWYgKGF1dG8gbGVmdFNpZGUgPSB0cnlCcmVha2luZ1RleHRSdW4o cnVuLCBhZGp1c3RlZEF2YWlsYWJsZVdpZHRoKSkKKyAgICAgICAgICAgIGF1dG8gYWRqdXN0ZWRB dmFpbGFibGVXaWR0aCA9IHN0ZDo6bWF4PElubGluZUxheW91dFVuaXQ+KDAsIGxpbmVTdGF0dXMu YXZhaWxhYmxlV2lkdGggLSBhY2N1bXVsYXRlZFJ1bldpZHRoKTsKKyAgICAgICAgICAgIGlmIChh dXRvIGxlZnRTaWRlID0gdHJ5QnJlYWtpbmdUZXh0UnVuKHJ1biwgYWRqdXN0ZWRBdmFpbGFibGVX aWR0aCwgbGluZVN0YXR1cy5saW5lSXNFbXB0eSkpCiAgICAgICAgICAgICAgICAgcmV0dXJuIEJy ZWFraW5nQ29udGV4dDo6UGFydGlhbFRyYWlsaW5nQ29udGVudCB7IGluZGV4LCBsZWZ0U2lkZS0+ bGVuZ3RoLCBsZWZ0U2lkZS0+bG9naWNhbFdpZHRoLCBsZWZ0U2lkZS0+bmVlZHNIeXBoZW4gfTsK ICAgICAgICAgICAgIC8vIElmIHRoaXMgcnVuIGlzIG5vdCBicmVha2FibGUsIHdlIG5lZWQgdG8g Y2hlY2sgaWYgYW55IHByZXZpb3VzIHJ1biBpcyBicmVha2FibGUKICAgICAgICAgICAgIGJyZWFr OwpAQCAtMTM5LDkgKzE1OCw5IEBAIE9wdGlvbmFsPExpbmVCcmVha2VyOjpCcmVha2luZ0NvbnRl eHQ6OlBhcnRpYWxUcmFpbGluZ0NvbnRlbnQ+IExpbmVCcmVha2VyOjp3b3JkCiAgICAgLy8gTGV0 J3MgdHJ5IHRvIGZpbmQgdGhlIGZpcnN0IGJyZWFrYWJsZSBydW4gYW5kIHdyYXAgaXQgYXQgdGhl IGNvbnRlbnQgYm91bmRhcnkgKGFzIGl0IHN1cmVseSBmaXRzKS4KICAgICB3aGlsZSAoaW5kZXgt LSkgewogICAgICAgICBhdXRvJiBydW4gPSBydW5zW2luZGV4XTsKLSAgICAgICAgaWYgKGlzQ29u dGVudFdyYXBwaW5nQWxsb3dlZChydW4pKSB7CisgICAgICAgIGlmIChpc0NvbnRlbnRTcGxpdEFs bG93ZWQocnVuKSkgewogICAgICAgICAgICAgQVNTRVJUKHJ1bi5pbmxpbmVJdGVtLmlzVGV4dCgp KTsKLSAgICAgICAgICAgIGlmIChhdXRvIGxlZnRTaWRlID0gdHJ5QnJlYWtpbmdUZXh0UnVuKHJ1 biwgbWF4SW5saW5lTGF5b3V0VW5pdCgpKSkgeworICAgICAgICAgICAgaWYgKGF1dG8gbGVmdFNp ZGUgPSB0cnlCcmVha2luZ1RleHRSdW4ocnVuLCBtYXhJbmxpbmVMYXlvdXRVbml0KCksIGxpbmVT dGF0dXMubGluZUlzRW1wdHkpKSB7CiAgICAgICAgICAgICAgICAgLy8gVGhpcyBydW4gaXRzZWxm IG1pZ2h0IG5vdCBiZSBwYXJ0aWFsIGJ1dCB0aGUgY29udGVudCAoc2VyaWVzIG9mIHJ1bnMpIGRl ZmluaXRlbHkgaXMuCiAgICAgICAgICAgICAgICAgcmV0dXJuIEJyZWFraW5nQ29udGV4dDo6UGFy dGlhbFRyYWlsaW5nQ29udGVudCB7IGluZGV4LCBsZWZ0U2lkZS0+bGVuZ3RoLCBsZWZ0U2lkZS0+ bG9naWNhbFdpZHRoLCBsZWZ0U2lkZS0+bmVlZHNIeXBoZW4gfTsKICAgICAgICAgICAgIH0KQEAg LTE1MSwxNiArMTcwLDE2IEBAIE9wdGlvbmFsPExpbmVCcmVha2VyOjpCcmVha2luZ0NvbnRleHQ6 OlBhcnRpYWxUcmFpbGluZ0NvbnRlbnQ+IExpbmVCcmVha2VyOjp3b3JkCiAgICAgcmV0dXJuIHsg fTsKIH0KIAotT3B0aW9uYWw8TGluZUJyZWFrZXI6OkxlZnRTaWRlPiBMaW5lQnJlYWtlcjo6dHJ5 QnJlYWtpbmdUZXh0UnVuKGNvbnN0IENvbnRlbnQ6OlJ1biYgb3ZlcmZsb3dSdW4sIElubGluZUxh eW91dFVuaXQgYXZhaWxhYmxlV2lkdGgpIGNvbnN0CitPcHRpb25hbDxMaW5lQnJlYWtlcjo6TGVm dFNpZGU+IExpbmVCcmVha2VyOjp0cnlCcmVha2luZ1RleHRSdW4oY29uc3QgQ29udGVudDo6UnVu JiBvdmVyZmxvd1J1biwgSW5saW5lTGF5b3V0VW5pdCBhdmFpbGFibGVXaWR0aCwgYm9vbCBsaW5l SXNFbXB0eSkgY29uc3QKIHsKICAgICBBU1NFUlQob3ZlcmZsb3dSdW4uaW5saW5lSXRlbS5pc1Rl eHQoKSk7CiAgICAgYXV0byYgc3R5bGUgPSBvdmVyZmxvd1J1bi5pbmxpbmVJdGVtLnN0eWxlKCk7 Ci0gICAgYXV0byBmaW5kTGFzdEJyZWFrYWJsZVBvc2l0aW9uID0gYXZhaWxhYmxlV2lkdGggPT0g bWF4SW5saW5lTGF5b3V0VW5pdCgpOwotICAgIGF1dG8gYnJlYWtXb3JkcyA9IHN0eWxlLndvcmRC cmVhaygpOwotICAgIGlmIChicmVha1dvcmRzID09IFdvcmRCcmVhazo6S2VlcEFsbCkKKyAgICBp ZiAoc3R5bGUud29yZEJyZWFrKCkgPT0gV29yZEJyZWFrOjpLZWVwQWxsKQogICAgICAgICByZXR1 cm4geyB9OworCisgICAgYXV0byBmaW5kTGFzdEJyZWFrYWJsZVBvc2l0aW9uID0gYXZhaWxhYmxl V2lkdGggPT0gbWF4SW5saW5lTGF5b3V0VW5pdCgpOwogICAgIGF1dG8mIGlubGluZVRleHRJdGVt ID0gZG93bmNhc3Q8SW5saW5lVGV4dEl0ZW0+KG92ZXJmbG93UnVuLmlubGluZUl0ZW0pOwotICAg IGlmIChicmVha1dvcmRzID09IFdvcmRCcmVhazo6QnJlYWtBbGwpIHsKKyAgICBpZiAoaXNUZXh0 U3BsaXRBdEFyYml0cmFyeVBvc2l0aW9uQWxsb3dlZChzdHlsZSwgbGluZUlzRW1wdHkpKSB7CiAg ICAgICAgIC8vIFdoZW4gdGhlIHJ1biBjYW4gYmUgc3BsaXQgYXQgYXJiaXRyYXJ5IHBvc2l0aW9u cywgbGV0J3MganVzdCByZXR1cm4gdGhlIGVudGlyZSBydW4gd2hlbiBpdCBpcyBpbnRlbmRlZCB0 byBmaXQgb24gdGhlIGxpbmUuCiAgICAgICAgIGlmIChmaW5kTGFzdEJyZWFrYWJsZVBvc2l0aW9u KQogICAgICAgICAgICAgcmV0dXJuIExlZnRTaWRlIHsgaW5saW5lVGV4dEl0ZW0ubGVuZ3RoKCks IG92ZXJmbG93UnVuLmxvZ2ljYWxXaWR0aCwgZmFsc2UgfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCcmVha2VyLmggYi9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnJlYWtlci5oCmlu ZGV4IGJlN2VhMjQ0Mzg1ZTA3ZGJmYjI5ZGU4YzBhNjA1ZWNiMmNlMDliYzguLmRmZDExODU5YTY3 NDAyZmViOTMyMzkyM2U5MjAzYmUzODBhMTIzMzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCcmVha2VyLmgKKysrIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJyZWFrZXIuaApAQCAt MTEzLDEzICsxMTMsMTMgQEAgcHVibGljOgogICAgIHZvaWQgc2V0SHlwaGVuYXRpb25EaXNhYmxl ZCgpIHsgbl9oeXBoZW5hdGlvbklzRGlzYWJsZWQgPSB0cnVlOyB9CiAKIHByaXZhdGU6Ci0gICAg T3B0aW9uYWw8QnJlYWtpbmdDb250ZXh0OjpQYXJ0aWFsVHJhaWxpbmdDb250ZW50PiB3b3JkQnJl YWtpbmdCZWhhdmlvcihjb25zdCBDb250ZW50OjpSdW5MaXN0JiwgSW5saW5lTGF5b3V0VW5pdCBh dmFpbGFibGVXaWR0aCkgY29uc3Q7CisgICAgT3B0aW9uYWw8QnJlYWtpbmdDb250ZXh0OjpQYXJ0 aWFsVHJhaWxpbmdDb250ZW50PiB3b3JkQnJlYWtpbmdCZWhhdmlvcihjb25zdCBDb250ZW50OjpS dW5MaXN0JiwgY29uc3QgTGluZVN0YXR1cyYpIGNvbnN0OwogICAgIHN0cnVjdCBMZWZ0U2lkZSB7 CiAgICAgICAgIHVuc2lnbmVkIGxlbmd0aCB7IDAgfTsKICAgICAgICAgSW5saW5lTGF5b3V0VW5p dCBsb2dpY2FsV2lkdGggeyAwIH07CiAgICAgICAgIGJvb2wgbmVlZHNIeXBoZW4geyBmYWxzZSB9 OwogICAgIH07Ci0gICAgT3B0aW9uYWw8TGVmdFNpZGU+IHRyeUJyZWFraW5nVGV4dFJ1bihjb25z dCBDb250ZW50OjpSdW4mIG92ZXJmbG93UnVuLCBJbmxpbmVMYXlvdXRVbml0IGF2YWlsYWJsZVdp ZHRoKSBjb25zdDsKKyAgICBPcHRpb25hbDxMZWZ0U2lkZT4gdHJ5QnJlYWtpbmdUZXh0UnVuKGNv bnN0IENvbnRlbnQ6OlJ1biYgb3ZlcmZsb3dSdW4sIElubGluZUxheW91dFVuaXQgYXZhaWxhYmxl V2lkdGgsIGJvb2wgbGluZUlzRW1wdHkpIGNvbnN0OwogCiAgICAgYm9vbCBuX2h5cGhlbmF0aW9u SXNEaXNhYmxlZCB7IGZhbHNlIH07CiB9Owo=