205245 2019-12-14 21:29:44 -0800 [LFC][IFC] Fix imported/w3c/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-break-word-006.html 2019-12-15 06:03:20 -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 1598697 0 zalan 2019-12-14 21:29:44 -0800 ssia 1598698 1 webkit-bug-importer 2019-12-14 21:30:15 -0800 <rdar://problem/57943885> 1598699 2 385708 zalan 2019-12-14 21:45:36 -0800 Created attachment 385708 Patch 1598705 3 385708 koivisto 2019-12-15 00:03:24 -0800 Comment on attachment 385708 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=385708&action=review > Source/WebCore/layout/inlineformatting/InlineLineBreaker.cpp:109 > + if (auto partialTrailingContent = wrapTextContent(runs, lineStatus)) { Here the returned variable is called "content". > Source/WebCore/layout/inlineformatting/InlineLineBreaker.h:125 > + struct TextWrappingContext { > + unsigned trailingRunIndex { 0 }; > + bool contentOverflows { false }; > + Optional<PartialRun> partialTrailingRun; > + }; > + Optional<TextWrappingContext> wrapTextContent(const Content::RunList&, const LineStatus&) const; Not sure I understand how this type is a "context". context noun 1 the historical context out of which the novel arose: circumstances, conditions, surroundings, factors, state of affairs; situation, environment, milieu, setting, background, backdrop, scene; climate, atmosphere, ambience, mood, feel. It is also confusing that it is returned by function called "content". Based on your variable naming above, maybe the type should be "PartialTrailingContent"? Or based on the function naming "WrappedTextContent"? In this case you might want to rename the variables too. 1598727 4 zalan 2019-12-15 05:50:08 -0800 Committed r253533: <https://trac.webkit.org/changeset/253533> 1598728 5 zalan 2019-12-15 05:51:18 -0800 (In reply to zalan from comment #4) > Committed r253533: <https://trac.webkit.org/changeset/253533> Oh no, I didn't mean to land it without the renaming :( 1598729 6 zalan 2019-12-15 06:03:20 -0800 (In reply to zalan from comment #5) > (In reply to zalan from comment #4) > > Committed r253533: <https://trac.webkit.org/changeset/253533> > > Oh no, I didn't mean to land it without the renaming :( Addressed in r253534. 385708 2019-12-14 21:45:36 -0800 2019-12-15 00:03:24 -0800 Patch bug-205245-20191214214535.patch text/plain 9449 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjUzNTI2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTkxNGZiOTMzMzljYTc3 ZDc5OTRlZTRlMmVmMzVjY2Y4OGY1ODJlZi4uODYyZjNjZjViNDUxNzIzNjQzY2QxODg1OGM1MDM0 Zjc5ZjRkNDc4MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE5LTEyLTE0ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBGaXggaW1w b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXRleHQvb3ZlcmZsb3ctd3JhcC9v dmVyZmxvdy13cmFwLWJyZWFrLXdvcmQtMDA2Lmh0bWwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwNTI0NQorICAgICAgICA8cmRhcjovL3Byb2JsZW0v NTc5NDM4ODU+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgTGluZSBicmVha2luZyBzaG91bGQgYmUgYWJsZSB0byBkaWZmZXJlbnRpYXRlIAorICAgICAg ICAxLiB0aGUgY2FzZSB3aGVuIHRoZSBjYW5kaWRhdGUgY29udGVudCdzIGZpcnN0IGNoYXJhY3Rl ciBkb2VzIG5vdCBmaXQgdGhlIGxpbmUKKyAgICAgICAgMi4gYW5kIHdoZW4gdGhlIGNhbmRpZGF0 ZSBjb250ZW50IGhhcyBtdWx0aXBsZSBydW5zIGFuZCAKKyAgICAgICAgICAoYSkgdGhlIG92ZXJm bG93IHJ1biBpcyBub3QgdGhlIGZpcnN0IG9uZQorICAgICAgICAgIChiKSBpdCBjYW4ndCBiZSB3 cmFwcGVkIGFuZCB3ZSBmYWxsIGJhY2sgdG8gdGhlIGZpcnN0IHJ1biBpbiB0aGUgbGlzdAorICAg ICAgICBJbiBib3RoIGNhc2VzIHdvcmRCcmVha2luZ0JlaGF2aW9yIHJldHVybnMgeyAwLCB7IH0g fSwgd2hlcmUgMCBpcyB0aGUgdHJhaWxpbmcgcnVuIGluZGV4IChmaXJzdCBydW4pIGFuZCB0aGUg bnVsbG9wdCBpbmRpY2F0ZXMKKyAgICAgICAgdGhhdCB0aGVyZSdzIG5vIHBhcnRpYWwgY29udGVu dC4KKworICAgICAgICBJbnRyb2R1Y2UgVGV4dFdyYXBwaW5nQ29udGV4dCB0byBiZSBhYmxlIHRv IHRlbGwgdGhlc2UgY2FzZXMgYXBhcnQuIAorCisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1h dHRpbmcvSW5saW5lTGluZUJyZWFrZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpM aW5lQnJlYWtlcjo6YnJlYWtpbmdDb250ZXh0Rm9ySW5saW5lQ29udGVudCk6CisgICAgICAgIChX ZWJDb3JlOjpMYXlvdXQ6OkxpbmVCcmVha2VyOjp3cmFwVGV4dENvbnRlbnQgY29uc3QpOgorICAg ICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQnJlYWtlcjo6dHJ5QnJlYWtpbmdUZXh0UnVuIGNv bnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJyZWFrZXI6OndvcmRCcmVha2lu Z0JlaGF2aW9yIGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0 dGluZy9JbmxpbmVMaW5lQnJlYWtlci5oOgorCiAyMDE5LTEyLTE0ICBaYWxhbiBCdWp0YXMgIDx6 YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xGQ11bSUZDXSBJbnRyb2R1Y2UgTGluZUJyZWFr ZXI6OlBhcnRpYWxSdW4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVm b3JtYXR0aW5nL0lubGluZUxpbmVCcmVha2VyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9p bmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCcmVha2VyLmNwcAppbmRleCBhZjNmZTc4YzE0Njg4 NGI5OTU4Mzk1ZGQzYTVlOTkyMDM4ODM2NjdmLi4wNTczZmY4MzM2NDI0NDc1NDU5YWRiZGExNWFk N2NlMDhhYzg5NjIyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9y bWF0dGluZy9JbmxpbmVMaW5lQnJlYWtlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJyZWFrZXIuY3BwCkBAIC0xMDYsOCArMTA2LDgg QEAgTGluZUJyZWFrZXI6OkJyZWFraW5nQ29udGV4dCBMaW5lQnJlYWtlcjo6YnJlYWtpbmdDb250 ZXh0Rm9ySW5saW5lQ29udGVudChjb25zdAogCiAgICAgaWYgKGNhbmRpZGF0ZVJ1bnMuaGFzVGV4 dENvbnRlbnRPbmx5KCkpIHsKICAgICAgICAgYXV0byYgcnVucyA9IGNhbmRpZGF0ZVJ1bnMucnVu cygpOwotICAgICAgICBpZiAoYXV0byBwYXJ0aWFsVHJhaWxpbmdDb250ZW50ID0gd29yZEJyZWFr aW5nQmVoYXZpb3IocnVucywgbGluZVN0YXR1cykpIHsKLSAgICAgICAgICAgIGlmICghcGFydGlh bFRyYWlsaW5nQ29udGVudC0+cGFydGlhbFJ1bikgeworICAgICAgICBpZiAoYXV0byBwYXJ0aWFs VHJhaWxpbmdDb250ZW50ID0gd3JhcFRleHRDb250ZW50KHJ1bnMsIGxpbmVTdGF0dXMpKSB7Cisg ICAgICAgICAgICBpZiAoIXBhcnRpYWxUcmFpbGluZ0NvbnRlbnQtPnRyYWlsaW5nUnVuSW5kZXgg JiYgcGFydGlhbFRyYWlsaW5nQ29udGVudC0+Y29udGVudE92ZXJmbG93cykgewogICAgICAgICAg ICAgICAgIC8vIFdlIHRyaWVkIHRvIHNwbGl0IHRoZSBjb250ZW50IGJ1dCB0aGUgYXZhaWxhYmxl IHNwYWNlIGNhbid0IGV2ZW4gYWNjb21tb2RhdGUgdGhlIGZpcnN0IGNoYXJhY3Rlci4KICAgICAg ICAgICAgICAgICAvLyAxLiBQdXNoIHRoZSBjb250ZW50IG92ZXIgdG8gdGhlIG5leHQgbGluZSB3 aGVuIHdlJ3ZlIGdvdCBjb250ZW50IG9uIHRoZSBsaW5lIGFscmVhZHkuCiAgICAgICAgICAgICAg ICAgLy8gMi4gS2VlcCB0aGUgZmlyc3QgY2hhcmFjdGVyIG9uIHRoZSBlbXB0eSBsaW5lIChvciBr ZWVwIHRoZSB3aG9sZSBydW4gaWYgaXQgaGFzIG9ubHkgb25lIGNoYXJhY3RlcikuCkBAIC0xMTks MTAgKzExOSwxMSBAQCBMaW5lQnJlYWtlcjo6QnJlYWtpbmdDb250ZXh0IExpbmVCcmVha2VyOjpi cmVha2luZ0NvbnRleHRGb3JJbmxpbmVDb250ZW50KGNvbnN0CiAgICAgICAgICAgICAgICAgaWYg KGlubGluZVRleHRJdGVtLmxlbmd0aCgpID09IDEpCiAgICAgICAgICAgICAgICAgICAgIHJldHVy biB7IEJyZWFraW5nQ29udGV4dDo6Q29udGVudFdyYXBwaW5nUnVsZTo6S2VlcCwgeyB9IH07CiAg ICAgICAgICAgICAgICAgYXV0byBmaXJzdENoYXJhY3RlcldpZHRoID0gVGV4dFV0aWw6OndpZHRo KGlubGluZVRleHRJdGVtLCBpbmxpbmVUZXh0SXRlbS5zdGFydCgpLCBpbmxpbmVUZXh0SXRlbS5z dGFydCgpICsgMSk7Ci0gICAgICAgICAgICAgICAgYXV0byBzcGxpdENvbnRlbnQgPSBCcmVha2lu Z0NvbnRleHQ6OlBhcnRpYWxUcmFpbGluZ0NvbnRlbnQgeyBmaXJzdFRleHRSdW5JbmRleCwgUGFy dGlhbFJ1biB7IDEsIGZpcnN0Q2hhcmFjdGVyV2lkdGgsIGZhbHNlIH0gfTsKLSAgICAgICAgICAg ICAgICByZXR1cm4geyBCcmVha2luZ0NvbnRleHQ6OkNvbnRlbnRXcmFwcGluZ1J1bGU6OlNwbGl0 LCBzcGxpdENvbnRlbnQgfTsKKyAgICAgICAgICAgICAgICBhdXRvIGZpcnN0Q2hhcmFjdGVyUnVu ID0gUGFydGlhbFJ1biB7IDEsIGZpcnN0Q2hhcmFjdGVyV2lkdGgsIGZhbHNlIH07CisgICAgICAg ICAgICAgICAgcmV0dXJuIHsgQnJlYWtpbmdDb250ZXh0OjpDb250ZW50V3JhcHBpbmdSdWxlOjpT cGxpdCwgQnJlYWtpbmdDb250ZXh0OjpQYXJ0aWFsVHJhaWxpbmdDb250ZW50IHsgZmlyc3RUZXh0 UnVuSW5kZXgsIGZpcnN0Q2hhcmFjdGVyUnVuIH0gfTsKICAgICAgICAgICAgIH0KLSAgICAgICAg ICAgIHJldHVybiB7IEJyZWFraW5nQ29udGV4dDo6Q29udGVudFdyYXBwaW5nUnVsZTo6U3BsaXQs IHBhcnRpYWxUcmFpbGluZ0NvbnRlbnQgfTsKKyAgICAgICAgICAgIGF1dG8gc3BsaXRDb250ZW50 ID0gQnJlYWtpbmdDb250ZXh0OjpQYXJ0aWFsVHJhaWxpbmdDb250ZW50IHsgcGFydGlhbFRyYWls aW5nQ29udGVudC0+dHJhaWxpbmdSdW5JbmRleCwgcGFydGlhbFRyYWlsaW5nQ29udGVudC0+cGFy dGlhbFRyYWlsaW5nUnVuIH07CisgICAgICAgICAgICByZXR1cm4geyBCcmVha2luZ0NvbnRleHQ6 OkNvbnRlbnRXcmFwcGluZ1J1bGU6OlNwbGl0LCBzcGxpdENvbnRlbnQgfTsKICAgICAgICAgfQog ICAgICAgICAvLyBJZiB3ZSBhcmUgbm90IGFsbG93ZWQgdG8gYnJlYWsgdGhpcyBjb250ZW50LCB3 ZSBzdGlsbCBuZWVkIHRvIGRlY2lkZSB3aGV0aGVyIGtlZXAgaXQgb3IgcHVzaCBpdCB0byB0aGUg bmV4dCBsaW5lLgogICAgICAgICBhdXRvIGNvbnRlbnRTaG91bGRPdmVyZmxvdyA9IGxpbmVTdGF0 dXMubGluZUlzRW1wdHkgfHwgIWlzVGV4dENvbnRlbnRXcmFwcGluZ0FsbG93ZWQocnVuc1swXS5p bmxpbmVJdGVtLnN0eWxlKCkpOwpAQCAtMTM3LDcgKzEzOCw3IEBAIGJvb2wgTGluZUJyZWFrZXI6 OnNob3VsZFdyYXBGbG9hdEJveChJbmxpbmVMYXlvdXRVbml0IGZsb2F0TG9naWNhbFdpZHRoLCBJ bmxpbmVMCiAgICAgcmV0dXJuICFsaW5lSXNFbXB0eSAmJiBmbG9hdExvZ2ljYWxXaWR0aCA+IGF2 YWlsYWJsZVdpZHRoOwogfQogCi1PcHRpb25hbDxMaW5lQnJlYWtlcjo6QnJlYWtpbmdDb250ZXh0 OjpQYXJ0aWFsVHJhaWxpbmdDb250ZW50PiBMaW5lQnJlYWtlcjo6d29yZEJyZWFraW5nQmVoYXZp b3IoY29uc3QgQ29udGVudDo6UnVuTGlzdCYgcnVucywgY29uc3QgTGluZVN0YXR1cyYgbGluZVN0 YXR1cykgY29uc3QKK09wdGlvbmFsPExpbmVCcmVha2VyOjpUZXh0V3JhcHBpbmdDb250ZXh0PiBM aW5lQnJlYWtlcjo6d3JhcFRleHRDb250ZW50KGNvbnN0IENvbnRlbnQ6OlJ1bkxpc3QmIHJ1bnMs IGNvbnN0IExpbmVTdGF0dXMmIGxpbmVTdGF0dXMpIGNvbnN0CiB7CiAgICAgLy8gQ2hlY2sgd2hl cmUgdGhlIG92ZXJmbG93IG9jY3VycyBhbmQgdXNlIHRoZSBjb3JyZXNwb25kaW5nIHN0eWxlIHRv IGZpZ3VyZSBvdXQgdGhlIGJyZWFraW5nIGJlaGF2aW91ci4KICAgICAvLyA8c3BhbiBzdHlsZT0i d29yZC1icmVhazogbm9ybWFsIj5maXJzdDwvc3Bhbj48c3BhbiBzdHlsZT0id29yZC1icmVhazog YnJlYWstYWxsIj5zZWNvbmQ8L3NwYW4+PHNwYW4gc3R5bGU9IndvcmQtYnJlYWs6IG5vcm1hbCI+ dGhpcmQ8L3NwYW4+CkBAIC0xNTEsOCArMTUyLDE1IEBAIE9wdGlvbmFsPExpbmVCcmVha2VyOjpC cmVha2luZ0NvbnRleHQ6OlBhcnRpYWxUcmFpbGluZ0NvbnRlbnQ+IExpbmVCcmVha2VyOjp3b3Jk CiAgICAgICAgICAgICAvLyA8c3BhbiBzdHlsZT0id29yZC1icmVhazoga2VlcC1hbGwiPnRleHRj b250ZW50d2l0aG5vYnJlYWs8L3NwYW4+PHNwYW4+dGV4dGNvbnRlbnR3aXRoeWVzYnJlYWs8L3Nw YW4+CiAgICAgICAgICAgICAvLyBXaGVuIHRoZSBmaXJzdCBzcGFuIGNvbXB1dGVzIGxvbmdlciB0 aGFuIHRoZSBhdmFpbGFibGUgc3BhY2UsIGJ5IHRoZSB0aW1lIHdlIGdldCB0byB0aGUgc2Vjb25k IHNwYW4sIHRoZSBhZGp1c3RlZCBhdmFpbGFibGUgc3BhY2UgYmVjb21lcyBuZWdhdGl2ZS4KICAg ICAgICAgICAgIGF1dG8gYWRqdXN0ZWRBdmFpbGFibGVXaWR0aCA9IHN0ZDo6bWF4PElubGluZUxh eW91dFVuaXQ+KDAsIGxpbmVTdGF0dXMuYXZhaWxhYmxlV2lkdGggLSBhY2N1bXVsYXRlZFJ1bldp ZHRoKTsKLSAgICAgICAgICAgIGlmIChhdXRvIGxlZnRTaWRlID0gdHJ5QnJlYWtpbmdUZXh0UnVu KHJ1biwgYWRqdXN0ZWRBdmFpbGFibGVXaWR0aCwgbGluZVN0YXR1cy5saW5lSXNFbXB0eSkpCi0g ICAgICAgICAgICAgICAgcmV0dXJuIEJyZWFraW5nQ29udGV4dDo6UGFydGlhbFRyYWlsaW5nQ29u dGVudCB7IGluZGV4LCBsZWZ0U2lkZSB9OworICAgICAgICAgICAgaWYgKGF1dG8gbGVmdFNpZGUg PSB0cnlCcmVha2luZ1RleHRSdW4ocnVuLCBhZGp1c3RlZEF2YWlsYWJsZVdpZHRoLCBsaW5lU3Rh dHVzLmxpbmVJc0VtcHR5KSkgeworICAgICAgICAgICAgICAgIGlmIChsZWZ0U2lkZS0+bGVuZ3Ro KQorICAgICAgICAgICAgICAgICAgICByZXR1cm4gVGV4dFdyYXBwaW5nQ29udGV4dCB7IGluZGV4 LCBmYWxzZSwgbGVmdFNpZGUgfTsKKyAgICAgICAgICAgICAgICAvLyBXaGVuIHRoZSBjb250ZW50 IGlzIHdyYXBwZWQgYXQgdGhlIHJ1biBib3VuZGFyeSwgdGhlIHRyYWlsaW5nIHJ1biBpcyB0aGUg cHJldmlvdXMgcnVuLgorICAgICAgICAgICAgICAgIGlmIChpbmRleCkKKyAgICAgICAgICAgICAg ICAgICAgcmV0dXJuIFRleHRXcmFwcGluZ0NvbnRleHQgeyBpbmRleCAtIDEsIGZhbHNlLCB7IH0g fTsKKyAgICAgICAgICAgICAgICAvLyBTb21ldGltZXMgd2UgY2FuJ3QgYWNjb21tb2RhdGUgZXZl biB0aGUgdmVyeSBmaXJzdCBjaGFyYWN0ZXIuCisgICAgICAgICAgICAgICAgcmV0dXJuIFRleHRX cmFwcGluZ0NvbnRleHQgeyAwLCB0cnVlLCB7IH0gfTsKKyAgICAgICAgICAgIH0KICAgICAgICAg ICAgIC8vIElmIHRoaXMgcnVuIGlzIG5vdCBicmVha2FibGUsIHdlIG5lZWQgdG8gY2hlY2sgaWYg YW55IHByZXZpb3VzIHJ1biBpcyBicmVha2FibGUKICAgICAgICAgICAgIGJyZWFrOwogICAgICAg ICB9CkBAIC0xNjYsOCArMTc0LDkgQEAgT3B0aW9uYWw8TGluZUJyZWFrZXI6OkJyZWFraW5nQ29u dGV4dDo6UGFydGlhbFRyYWlsaW5nQ29udGVudD4gTGluZUJyZWFrZXI6OndvcmQKICAgICAgICAg aWYgKGlzQ29udGVudFNwbGl0QWxsb3dlZChydW4pKSB7CiAgICAgICAgICAgICBBU1NFUlQocnVu LmlubGluZUl0ZW0uaXNUZXh0KCkpOwogICAgICAgICAgICAgaWYgKGF1dG8gbGVmdFNpZGUgPSB0 cnlCcmVha2luZ1RleHRSdW4ocnVuLCBtYXhJbmxpbmVMYXlvdXRVbml0KCksIGxpbmVTdGF0dXMu bGluZUlzRW1wdHkpKSB7Ci0gICAgICAgICAgICAgICAgLy8gVGhpcyBydW4gaXRzZWxmIG1pZ2h0 IG5vdCBiZSBwYXJ0aWFsIGJ1dCB0aGUgY29udGVudCAoc2VyaWVzIG9mIHJ1bnMpIGRlZmluaXRl bHkgaXMuCi0gICAgICAgICAgICAgICAgcmV0dXJuIEJyZWFraW5nQ29udGV4dDo6UGFydGlhbFRy YWlsaW5nQ29udGVudCB7IGluZGV4LCBsZWZ0U2lkZSB9OworICAgICAgICAgICAgICAgIC8vIFdl IGtub3cgdGhpcyBydW4gZml0cywgc28gaWYgd3JhcHBpbmcgaXMgYWxsb3dlZCBvbiB0aGUgcnVu LCBpdCBzaG91bGQgcmV0dXJuIGEgbm9uLWVtcHR5IGxlZnQtc2lkZS4KKyAgICAgICAgICAgICAg ICBBU1NFUlQobGVmdFNpZGUtPmxlbmd0aCk7CisgICAgICAgICAgICAgICAgcmV0dXJuIFRleHRX cmFwcGluZ0NvbnRleHQgeyBpbmRleCwgZmFsc2UsIGxlZnRTaWRlIH07CiAgICAgICAgICAgICB9 CiAgICAgICAgIH0KICAgICB9CkBAIC0xODUsOSArMTk0LDExIEBAIE9wdGlvbmFsPExpbmVCcmVh a2VyOjpQYXJ0aWFsUnVuPiBMaW5lQnJlYWtlcjo6dHJ5QnJlYWtpbmdUZXh0UnVuKGNvbnN0IENv bnRlbnQ6CiAgICAgYXV0byBmaW5kTGFzdEJyZWFrYWJsZVBvc2l0aW9uID0gYXZhaWxhYmxlV2lk dGggPT0gbWF4SW5saW5lTGF5b3V0VW5pdCgpOwogICAgIGF1dG8mIGlubGluZVRleHRJdGVtID0g ZG93bmNhc3Q8SW5saW5lVGV4dEl0ZW0+KG92ZXJmbG93UnVuLmlubGluZUl0ZW0pOwogICAgIGlm IChpc1RleHRTcGxpdEF0QXJiaXRyYXJ5UG9zaXRpb25BbGxvd2VkKHN0eWxlLCBsaW5lSXNFbXB0 eSkpIHsKLSAgICAgICAgLy8gV2hlbiB0aGUgcnVuIGNhbiBiZSBzcGxpdCBhdCBhcmJpdHJhcnkg cG9zaXRpb25zLCBsZXQncyBqdXN0IHJldHVybiB0aGUgZW50aXJlIHJ1biB3aGVuIGl0IGlzIGlu dGVuZGVkIHRvIGZpdCBvbiB0aGUgbGluZS4KLSAgICAgICAgaWYgKGZpbmRMYXN0QnJlYWthYmxl UG9zaXRpb24pCisgICAgICAgIGlmIChmaW5kTGFzdEJyZWFrYWJsZVBvc2l0aW9uKSB7CisgICAg ICAgICAgICAvLyBXaGVuIHRoZSBydW4gY2FuIGJlIHNwbGl0IGF0IGFyYml0cmFyeSBwb3NpdGlv bnMsCisgICAgICAgICAgICAvLyBsZXQncyBqdXN0IHJldHVybiB0aGUgZW50aXJlIHJ1biB3aGVu IGl0IGlzIGludGVuZGVkIHRvIGZpdCBvbiB0aGUgbGluZS4KICAgICAgICAgICAgIHJldHVybiBQ YXJ0aWFsUnVuIHsgaW5saW5lVGV4dEl0ZW0ubGVuZ3RoKCksIG92ZXJmbG93UnVuLmxvZ2ljYWxX aWR0aCwgZmFsc2UgfTsKKyAgICAgICAgfQogICAgICAgICAvLyBGSVhNRTogUGFzcyBpbiB0aGUg Y29udGVudCBsb2dpY2FsIGxlZnQgdG8gYmUgYWJsZSB0byBtZWFzdXJlIHRhYnMuCiAgICAgICAg IGF1dG8gc3BsaXREYXRhID0gVGV4dFV0aWw6OnNwbGl0KGlubGluZVRleHRJdGVtLmxheW91dEJv eCgpLCBpbmxpbmVUZXh0SXRlbS5zdGFydCgpLCBpbmxpbmVUZXh0SXRlbS5sZW5ndGgoKSwgb3Zl cmZsb3dSdW4ubG9naWNhbFdpZHRoLCBhdmFpbGFibGVXaWR0aCwgeyB9KTsKICAgICAgICAgcmV0 dXJuIFBhcnRpYWxSdW4geyBzcGxpdERhdGEubGVuZ3RoLCBzcGxpdERhdGEubG9naWNhbFdpZHRo LCBmYWxzZSB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1h dHRpbmcvSW5saW5lTGluZUJyZWFrZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVm b3JtYXR0aW5nL0lubGluZUxpbmVCcmVha2VyLmgKaW5kZXggNzZiYTgzZWI0Mjc4MDI2MGZjMmFj YmMzNmM0ZDczYjA0ZTM3NzJhOS4uNTgxODA0MmExMzY5OWFmOWEwOGY3YmE3Nzk1ZWI1MjU5YzVh MzY1MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcv SW5saW5lTGluZUJyZWFrZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9y bWF0dGluZy9JbmxpbmVMaW5lQnJlYWtlci5oCkBAIC0xMTcsNyArMTE3LDEyIEBAIHB1YmxpYzoK ICAgICB2b2lkIHNldEh5cGhlbmF0aW9uRGlzYWJsZWQoKSB7IG5faHlwaGVuYXRpb25Jc0Rpc2Fi bGVkID0gdHJ1ZTsgfQogCiBwcml2YXRlOgotICAgIE9wdGlvbmFsPEJyZWFraW5nQ29udGV4dDo6 UGFydGlhbFRyYWlsaW5nQ29udGVudD4gd29yZEJyZWFraW5nQmVoYXZpb3IoY29uc3QgQ29udGVu dDo6UnVuTGlzdCYsIGNvbnN0IExpbmVTdGF0dXMmKSBjb25zdDsKKyAgICBzdHJ1Y3QgVGV4dFdy YXBwaW5nQ29udGV4dCB7CisgICAgICAgIHVuc2lnbmVkIHRyYWlsaW5nUnVuSW5kZXggeyAwIH07 CisgICAgICAgIGJvb2wgY29udGVudE92ZXJmbG93cyB7IGZhbHNlIH07CisgICAgICAgIE9wdGlv bmFsPFBhcnRpYWxSdW4+IHBhcnRpYWxUcmFpbGluZ1J1bjsKKyAgICB9OworICAgIE9wdGlvbmFs PFRleHRXcmFwcGluZ0NvbnRleHQ+IHdyYXBUZXh0Q29udGVudChjb25zdCBDb250ZW50OjpSdW5M aXN0JiwgY29uc3QgTGluZVN0YXR1cyYpIGNvbnN0OwogICAgIE9wdGlvbmFsPFBhcnRpYWxSdW4+ IHRyeUJyZWFraW5nVGV4dFJ1bihjb25zdCBDb250ZW50OjpSdW4mIG92ZXJmbG93UnVuLCBJbmxp bmVMYXlvdXRVbml0IGF2YWlsYWJsZVdpZHRoLCBib29sIGxpbmVJc0VtcHR5KSBjb25zdDsKIAog ICAgIGJvb2wgbl9oeXBoZW5hdGlvbklzRGlzYWJsZWQgeyBmYWxzZSB9Owo=