219784 2020-12-11 08:10:15 -0800 [LFC][IFC] tabCharacter and newlineCharacter are also word separators when not preserved 2021-02-23 19:24:22 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 219706 1 zalan zalan bfulgham darin koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1713910 0 zalan 2020-12-11 08:10:15 -0800 I can't find it here though https://drafts.csswg.org/css-text-3/#propdef-word-spacing 1713911 1 415998 zalan 2020-12-11 08:15:17 -0800 Created attachment 415998 Patch 1713912 2 415998 koivisto 2020-12-11 08:18:20 -0800 Comment on attachment 415998 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=415998&action=review > Source/WebCore/layout/inlineformatting/InlineTextItem.cpp:109 > isWordSeparator = text[startPosition] == space > + || text[startPosition] == tabCharacter > || text[startPosition] == noBreakSpace > || text[startPosition] == ethiopicWordspace > || text[startPosition] == aegeanWordSeparatorLine lambda? 1713923 3 zalan 2020-12-11 09:15:48 -0800 Apparently I confused it with the case when the tab character is resolved to a single space character (non-preserve case). 1714110 4 zalan 2020-12-11 15:22:56 -0800 let's repurpose this bug 1714118 5 416055 zalan 2020-12-11 15:34:20 -0800 Created attachment 416055 Patch 1714243 6 416055 koivisto 2020-12-12 02:13:57 -0800 Comment on attachment 416055 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=416055&action=review > Source/WebCore/layout/inlineformatting/InlineTextItem.cpp:120 > + return text[startPosition] == space > || text[startPosition] == noBreakSpace > || text[startPosition] == ethiopicWordspace > || text[startPosition] == aegeanWordSeparatorLine > || text[startPosition] == aegeanWordSeparatorDot > || text[startPosition] == ugariticWordDivider; maybe just put the text[startPosition] into a local? 1714263 7 416101 zalan 2020-12-12 11:31:18 -0800 Created attachment 416101 Patch 1714302 8 ews-feeder 2020-12-12 23:03:31 -0800 Committed r270747: <https://trac.webkit.org/changeset/270747> All reviewed patches have been landed. Closing bug and clearing flags on attachment 416101. 1714303 9 webkit-bug-importer 2020-12-12 23:04:16 -0800 <rdar://problem/72265348> 1715628 10 416055 darin 2020-12-17 17:55:55 -0800 Comment on attachment 416055 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=416055&action=review >> Source/WebCore/layout/inlineformatting/InlineTextItem.cpp:120 >> || text[startPosition] == ugariticWordDivider; > > maybe just put the text[startPosition] into a local? Or make another isWordSeparator function/overload that just takes a character? 1732768 11 zalan 2021-02-23 19:24:22 -0800 (In reply to Darin Adler from comment #10) > Comment on attachment 416055 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=416055&action=review > > >> Source/WebCore/layout/inlineformatting/InlineTextItem.cpp:120 > >> || text[startPosition] == ugariticWordDivider; > > > > maybe just put the text[startPosition] into a local? > > Or make another isWordSeparator function/overload that just takes a > character? I was just about to make this change but this code got moved over to "moveToNextNonWhitespacePosition" where I actually introduced a function for this ... auto isWhitespaceCharacter = [&](auto character) { // white space processing in CSS affects only the document white space characters: spaces (U+0020), tabs (U+0009), and segment breaks. ... 415998 2020-12-11 08:15:17 -0800 2020-12-11 09:13:49 -0800 Patch bug-219784-20201211081516.patch text/plain 2649 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjcwNjU5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGU4ZDBjZTdhZDM1MmQ5 OWRmMTc0MGU5OWU0YzRjYmQ2MGRjZTkxZi4uZWFmZjk3YzJiYzFjNzhkMDJkNGJmNDllNDllNWI1 ZjVlMjNhZTg0MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIwLTEyLTExICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSB0YWJDaGFy YWN0ZXIgaXMgYWxzbyBhIHdvcmQgc2VwYXJhdG9yCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTk3ODQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZVRl eHRJdGVtLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6aXNXaGl0ZXNwYWNlQ2hhcmFj dGVyKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lVGV4dEl0ZW06OmNyZWF0ZUFu ZEFwcGVuZFRleHRJdGVtcyk6CisKIDIwMjAtMTItMTEgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFw cGxlLmNvbT4KIAogICAgICAgICBbTEZDXVtJRkNdIExpbmUgc2hvdWxkIHJlcG9ydCB0aGUgY29y cmVjdCB2YWx1ZSBmb3IgImNvbnRlbnQgbG9naWNhbCByaWdodCIKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZVRleHRJdGVtLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZVRleHRJdGVtLmNwcApp bmRleCAyZjhjOGNiZmE1OGRmYjRkY2UyMmU2NTMxY2FhYjU0MjQwYzhkNjc3Li5hNzdmOWE1MWY2 MmJhYzgxZDJlMDZiNTAzOTA3YjYwNmNjZGQzZjc5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVUZXh0SXRlbS5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lVGV4dEl0ZW0uY3BwCkBAIC00 MCw3ICs0MCw3IEBAIHN0YXRpY19hc3NlcnQoc2l6ZW9mKElubGluZUl0ZW0pID09IHNpemVvZihJ bmxpbmVUZXh0SXRlbSksICIiKTsKIAogc3RhdGljIGlubGluZSBib29sIGlzV2hpdGVzcGFjZUNo YXJhY3RlcihVQ2hhciBjaGFyYWN0ZXIsIGJvb2wgcHJlc2VydmVOZXdsaW5lKQogewotICAgIHJl dHVybiBjaGFyYWN0ZXIgPT0gJyAnIHx8IGNoYXJhY3RlciA9PSAnXHQnIHx8IChjaGFyYWN0ZXIg PT0gJ1xuJyAmJiAhcHJlc2VydmVOZXdsaW5lKTsKKyAgICByZXR1cm4gY2hhcmFjdGVyID09IHNw YWNlIHx8IGNoYXJhY3RlciA9PSB0YWJDaGFyYWN0ZXIgfHwgKGNoYXJhY3RlciA9PSBuZXdsaW5l Q2hhcmFjdGVyICYmICFwcmVzZXJ2ZU5ld2xpbmUpOwogfQogCiBzdGF0aWMgdW5zaWduZWQgbW92 ZVRvTmV4dE5vbldoaXRlc3BhY2VQb3NpdGlvbihjb25zdCBTdHJpbmdWaWV3JiB0ZXh0Q29udGVu dCwgdW5zaWduZWQgc3RhcnRQb3NpdGlvbiwgYm9vbCBwcmVzZXJ2ZU5ld2xpbmUpCkBAIC0xMDAs OCArMTAwLDEwIEBAIHZvaWQgSW5saW5lVGV4dEl0ZW06OmNyZWF0ZUFuZEFwcGVuZFRleHRJdGVt cyhJbmxpbmVJdGVtcyYgaW5saW5lQ29udGVudCwgY29uc3QKICAgICAgICAgICAgICAgICBhdXRv IHdpZHRoID0gc2ltcGxlU2luZ2xlV2hpdGVzcGFjZUNvbnRlbnQgPyBtYWtlT3B0aW9uYWwoSW5s aW5lTGF5b3V0VW5pdCB7IGZvbnQuc3BhY2VXaWR0aCgpIH0pIDogaW5saW5lSXRlbVdpZHRoKHN0 YXJ0UG9zaXRpb24sIGl0ZW1MZW5ndGgpOwogICAgICAgICAgICAgICAgIGF1dG8gaXNXb3JkU2Vw YXJhdG9yID0gdHJ1ZTsKICAgICAgICAgICAgICAgICBpZiAoaXRlbUxlbmd0aCA9PSAxKSB7Ci0g ICAgICAgICAgICAgICAgICAgIC8vIEZJWE1FOiBDaGVjayBpZiB0aGUgY29sbGFwc2libGUgY29u dGVudCAobXVsdGlwbGUgd2hpdGVzcGFjZSkgaXMgbm90IGFsd2F5cyBhIHdvcmQgc2VwYXJhdG9y LgorICAgICAgICAgICAgICAgICAgICAvLyBGSVhNRTogQ2hlY2sgaWYgdGhlIGNvbGxhcHNpYmxl IGNvbnRlbnQgKG11bHRpcGxlIHdoaXRlc3BhY2UpIGlzIG5vdCBhbHdheXMgYSB3b3JkIHNlcGFy YXRvciBhbmQKKyAgICAgICAgICAgICAgICAgICAgLy8gc3luY2hyb25pemUgaXQgd2l0aCB0aGUg aXNXaGl0ZXNwYWNlQ2hhcmFjdGVyIGxvZ2ljLgogICAgICAgICAgICAgICAgICAgICBpc1dvcmRT ZXBhcmF0b3IgPSB0ZXh0W3N0YXJ0UG9zaXRpb25dID09IHNwYWNlCisgICAgICAgICAgICAgICAg ICAgICAgICB8fCB0ZXh0W3N0YXJ0UG9zaXRpb25dID09IHRhYkNoYXJhY3RlcgogICAgICAgICAg ICAgICAgICAgICAgICAgfHwgdGV4dFtzdGFydFBvc2l0aW9uXSA9PSBub0JyZWFrU3BhY2UKICAg ICAgICAgICAgICAgICAgICAgICAgIHx8IHRleHRbc3RhcnRQb3NpdGlvbl0gPT0gZXRoaW9waWNX b3Jkc3BhY2UKICAgICAgICAgICAgICAgICAgICAgICAgIHx8IHRleHRbc3RhcnRQb3NpdGlvbl0g PT0gYWVnZWFuV29yZFNlcGFyYXRvckxpbmUK 416055 2020-12-11 15:34:20 -0800 2020-12-12 11:31:14 -0800 Patch bug-219784-20201211153420.patch text/plain 4974 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjcwNjU5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTk1MWQzMDNlZWJhOWQw Y2QwZjBkNWUwNWUwZTZlODgwMThlY2FjMy4uMjk2NWY4MTU3YWU4OTgyNDk2M2FjOWViODAyOGJh NDg2YjlhMjg0NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIwLTEyLTExICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSB0YWJDaGFy YWN0ZXIgYW5kIG5ld2xpbmVDaGFyYWN0ZXIgYXJlIGFsc28gd29yZCBzZXBhcmF0b3JzIHdoZW4g bm90IHByZXNlcnZlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjE5Nzg0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVUZXh0SXRlbS5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpMYXlvdXQ6OmlzV2hpdGVzcGFjZUNoYXJhY3Rlcik6CisgICAgICAgIChX ZWJDb3JlOjpMYXlvdXQ6OnNob3VsZFByZXNlcnZlU3BhY2VzQW5kVGFicyk6CisgICAgICAgIChX ZWJDb3JlOjpMYXlvdXQ6OklubGluZVRleHRJdGVtOjpjcmVhdGVBbmRBcHBlbmRUZXh0SXRlbXMp OgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVUZXh0SXRlbTo6c2hvdWxkUHJlc2Vy dmVTcGFjZXNBbmRUYWJzKToKKwogMjAyMC0xMi0xMSAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBw bGUuY29tPgogCiAgICAgICAgIFtMRkNdW0lGQ10gVXNlIElubGluZVRleHRJdGVtOjpzaG91bGRQ cmVzZXJ2ZVNwYWNlc0FuZFRhYnMgdGhyb3VnaG91dCB0aGUgaW5saW5lIGxpbmUgbGF5b3V0IGNv ZGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lu bGluZVRleHRJdGVtLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5n L0lubGluZVRleHRJdGVtLmNwcAppbmRleCA0OWJkMDVkZjBhZDkwODA2NjBlYmU3MzllZjUxYTVj MTIxMDI3OTVjLi4zZjI4ZGJiZGE3YjRlMjMxMGQ3YzhmODhlNjYyM2YyOWYyZmIyNmUyIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVUZXh0 SXRlbS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5s aW5lVGV4dEl0ZW0uY3BwCkBAIC00MCw3ICs0MCwxMyBAQCBzdGF0aWNfYXNzZXJ0KHNpemVvZihJ bmxpbmVJdGVtKSA9PSBzaXplb2YoSW5saW5lVGV4dEl0ZW0pLCAiIik7CiAKIHN0YXRpYyBpbmxp bmUgYm9vbCBpc1doaXRlc3BhY2VDaGFyYWN0ZXIoVUNoYXIgY2hhcmFjdGVyLCBib29sIHByZXNl cnZlTmV3bGluZSkKIHsKLSAgICByZXR1cm4gY2hhcmFjdGVyID09ICcgJyB8fCBjaGFyYWN0ZXIg PT0gJ1x0JyB8fCAoY2hhcmFjdGVyID09ICdcbicgJiYgIXByZXNlcnZlTmV3bGluZSk7CisgICAg cmV0dXJuIGNoYXJhY3RlciA9PSBzcGFjZSB8fCBjaGFyYWN0ZXIgPT0gdGFiQ2hhcmFjdGVyIHx8 IChjaGFyYWN0ZXIgPT0gbmV3bGluZUNoYXJhY3RlciAmJiAhcHJlc2VydmVOZXdsaW5lKTsKK30K Kworc3RhdGljIGlubGluZSBib29sIHNob3VsZFByZXNlcnZlU3BhY2VzQW5kVGFicyhjb25zdCBS ZW5kZXJTdHlsZSYgc3R5bGUpCit7CisgICAgYXV0byB3aGl0ZXNwYWNlID0gc3R5bGUud2hpdGVT cGFjZSgpOworICAgIHJldHVybiB3aGl0ZXNwYWNlID09IFdoaXRlU3BhY2U6OlByZSB8fCB3aGl0 ZXNwYWNlID09IFdoaXRlU3BhY2U6OlByZVdyYXAgfHwgd2hpdGVzcGFjZSA9PSBXaGl0ZVNwYWNl OjpCcmVha1NwYWNlczsKIH0KIAogc3RhdGljIHVuc2lnbmVkIG1vdmVUb05leHROb25XaGl0ZXNw YWNlUG9zaXRpb24oY29uc3QgU3RyaW5nVmlldyYgdGV4dENvbnRlbnQsIHVuc2lnbmVkIHN0YXJ0 UG9zaXRpb24sIGJvb2wgcHJlc2VydmVOZXdsaW5lKQpAQCAtNzMsNiArNzksNyBAQCB2b2lkIElu bGluZVRleHRJdGVtOjpjcmVhdGVBbmRBcHBlbmRUZXh0SXRlbXMoSW5saW5lSXRlbXMmIGlubGlu ZUNvbnRlbnQsIGNvbnN0CiAKICAgICBhdXRvJiBzdHlsZSA9IGlubGluZVRleHRCb3guc3R5bGUo KTsKICAgICBhdXRvJiBmb250ID0gc3R5bGUuZm9udENhc2NhZGUoKTsKKyAgICBhdXRvIHdoaXRl c3BhY2VDb250ZW50SXNUcmVhdGVkQXNTaW5nbGVTcGFjZSA9ICFXZWJDb3JlOjpMYXlvdXQ6OnNo b3VsZFByZXNlcnZlU3BhY2VzQW5kVGFicyhzdHlsZSk7CiAgICAgTGF6eUxpbmVCcmVha0l0ZXJh dG9yIGxpbmVCcmVha0l0ZXJhdG9yKHRleHQpOwogICAgIHVuc2lnbmVkIGN1cnJlbnRQb3NpdGlv biA9IDA7CiAKQEAgLTk2LDE4ICsxMDMsMjIgQEAgdm9pZCBJbmxpbmVUZXh0SXRlbTo6Y3JlYXRl QW5kQXBwZW5kVGV4dEl0ZW1zKElubGluZUl0ZW1zJiBpbmxpbmVDb250ZW50LCBjb25zdAogCiAg ICAgICAgIGlmIChpc1doaXRlc3BhY2VDaGFyYWN0ZXIodGV4dFtjdXJyZW50UG9zaXRpb25dLCBz dHlsZS5wcmVzZXJ2ZU5ld2xpbmUoKSkpIHsKICAgICAgICAgICAgIGF1dG8gYXBwZW5kV2hpdGVz cGFjZUl0ZW0gPSBbJl0gKGF1dG8gc3RhcnRQb3NpdGlvbiwgYXV0byBpdGVtTGVuZ3RoKSB7Ci0g ICAgICAgICAgICAgICAgYXV0byBzaW1wbGVTaW5nbGVXaGl0ZXNwYWNlQ29udGVudCA9IGlubGlu ZVRleHRCb3guY2FuVXNlU2ltcGxpZmllZENvbnRlbnRNZWFzdXJpbmcoKSAmJiAoaXRlbUxlbmd0 aCA9PSAxIHx8IHN0eWxlLmNvbGxhcHNlV2hpdGVTcGFjZSgpKTsKKyAgICAgICAgICAgICAgICBh dXRvIHNpbXBsZVNpbmdsZVdoaXRlc3BhY2VDb250ZW50ID0gaW5saW5lVGV4dEJveC5jYW5Vc2VT aW1wbGlmaWVkQ29udGVudE1lYXN1cmluZygpICYmIChpdGVtTGVuZ3RoID09IDEgfHwgd2hpdGVz cGFjZUNvbnRlbnRJc1RyZWF0ZWRBc1NpbmdsZVNwYWNlKTsKICAgICAgICAgICAgICAgICBhdXRv IHdpZHRoID0gc2ltcGxlU2luZ2xlV2hpdGVzcGFjZUNvbnRlbnQgPyBtYWtlT3B0aW9uYWwoSW5s aW5lTGF5b3V0VW5pdCB7IGZvbnQuc3BhY2VXaWR0aCgpIH0pIDogaW5saW5lSXRlbVdpZHRoKHN0 YXJ0UG9zaXRpb24sIGl0ZW1MZW5ndGgpOwotICAgICAgICAgICAgICAgIGF1dG8gaXNXb3JkU2Vw YXJhdG9yID0gdHJ1ZTsKLSAgICAgICAgICAgICAgICBpZiAoaXRlbUxlbmd0aCA9PSAxKSB7Ci0g ICAgICAgICAgICAgICAgICAgIC8vIEZJWE1FOiBDaGVjayBpZiB0aGUgY29sbGFwc2libGUgY29u dGVudCAobXVsdGlwbGUgd2hpdGVzcGFjZSkgaXMgbm90IGFsd2F5cyBhIHdvcmQgc2VwYXJhdG9y LgotICAgICAgICAgICAgICAgICAgICBpc1dvcmRTZXBhcmF0b3IgPSB0ZXh0W3N0YXJ0UG9zaXRp b25dID09IHNwYWNlCisgICAgICAgICAgICAgICAgYXV0byBpc1dvcmRTZXBhcmF0b3IgPSBbJl0g eworICAgICAgICAgICAgICAgICAgICBpZiAod2hpdGVzcGFjZUNvbnRlbnRJc1RyZWF0ZWRBc1Np bmdsZVNwYWNlKQorICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAg ICAgICAgICAgICAgIGlmIChpdGVtTGVuZ3RoICE9IDEpIHsKKyAgICAgICAgICAgICAgICAgICAg ICAgIC8vIEZJWE1FOiBBZGQgc3VwcG9ydCBmb3IgY2FzZXMgd2hlcmUgdGhlIHdoaXRlc3BhY2Ug Y29udGVudCBjb250YWlucyBkaWZmZXJlbnQgdHlwZSBvZiBjaGFyYWN0ZXJzIChlLmcgICJcdCAg XHQgIFx0IikuCisgICAgICAgICAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAg ICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICAgICAgcmV0dXJuIHRleHRbc3RhcnRQb3Np dGlvbl0gPT0gc3BhY2UKICAgICAgICAgICAgICAgICAgICAgICAgIHx8IHRleHRbc3RhcnRQb3Np dGlvbl0gPT0gbm9CcmVha1NwYWNlCiAgICAgICAgICAgICAgICAgICAgICAgICB8fCB0ZXh0W3N0 YXJ0UG9zaXRpb25dID09IGV0aGlvcGljV29yZHNwYWNlCiAgICAgICAgICAgICAgICAgICAgICAg ICB8fCB0ZXh0W3N0YXJ0UG9zaXRpb25dID09IGFlZ2VhbldvcmRTZXBhcmF0b3JMaW5lCiAgICAg ICAgICAgICAgICAgICAgICAgICB8fCB0ZXh0W3N0YXJ0UG9zaXRpb25dID09IGFlZ2VhbldvcmRT ZXBhcmF0b3JEb3QKICAgICAgICAgICAgICAgICAgICAgICAgIHx8IHRleHRbc3RhcnRQb3NpdGlv bl0gPT0gdWdhcml0aWNXb3JkRGl2aWRlcjsKLSAgICAgICAgICAgICAgICB9CisgICAgICAgICAg ICAgICAgfSgpOwogICAgICAgICAgICAgICAgIGlubGluZUNvbnRlbnQuYXBwZW5kKElubGluZVRl eHRJdGVtOjpjcmVhdGVXaGl0ZXNwYWNlSXRlbShpbmxpbmVUZXh0Qm94LCBzdGFydFBvc2l0aW9u LCBpdGVtTGVuZ3RoLCBpc1dvcmRTZXBhcmF0b3IsIHdpZHRoKSk7CiAgICAgICAgICAgICB9Owog CkBAIC0xNjAsOCArMTcxLDcgQEAgYm9vbCBJbmxpbmVUZXh0SXRlbTo6aXNFbXB0eUNvbnRlbnQo KSBjb25zdAogYm9vbCBJbmxpbmVUZXh0SXRlbTo6c2hvdWxkUHJlc2VydmVTcGFjZXNBbmRUYWJz KGNvbnN0IElubGluZVRleHRJdGVtJiBpbmxpbmVUZXh0SXRlbSkKIHsKICAgICBBU1NFUlQoaW5s aW5lVGV4dEl0ZW0uaXNXaGl0ZXNwYWNlKCkpOwotICAgIGF1dG8gd2hpdGVzcGFjZSA9IGlubGlu ZVRleHRJdGVtLnN0eWxlKCkud2hpdGVTcGFjZSgpOwotICAgIHJldHVybiB3aGl0ZXNwYWNlID09 IFdoaXRlU3BhY2U6OlByZSB8fCB3aGl0ZXNwYWNlID09IFdoaXRlU3BhY2U6OlByZVdyYXAgfHwg d2hpdGVzcGFjZSA9PSBXaGl0ZVNwYWNlOjpCcmVha1NwYWNlczsKKyAgICByZXR1cm4gV2ViQ29y ZTo6TGF5b3V0OjpzaG91bGRQcmVzZXJ2ZVNwYWNlc0FuZFRhYnMoaW5saW5lVGV4dEl0ZW0uc3R5 bGUoKSk7CiB9CiAKIH0K 416101 2020-12-12 11:31:18 -0800 2020-12-12 23:03:32 -0800 Patch bug-219784-20201212113117.patch text/plain 4689 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjcwNjU5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjBjZDAwMmFiZThlOWMy MTA5NGE3NjhkMTIxZTVmOWI4ZTI5NGU0Zi4uOTJmNmVhODUyZWM2N2NhYjIyZDg3NTZkZjcxNTAz NDUwM2ViYmZmNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIwLTEyLTEyICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSB0YWJDaGFy YWN0ZXIgYW5kIG5ld2xpbmVDaGFyYWN0ZXIgYXJlIGFsc28gd29yZCBzZXBhcmF0b3JzIHdoZW4g bm90IHByZXNlcnZlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjE5Nzg0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQW50dGkgS29pdmlzdG8uCisKKyAg ICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVUZXh0SXRlbS5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpMYXlvdXQ6OmlzV2hpdGVzcGFjZUNoYXJhY3Rlcik6CisgICAgICAgIChX ZWJDb3JlOjpMYXlvdXQ6OnNob3VsZFByZXNlcnZlU3BhY2VzQW5kVGFicyk6CisgICAgICAgIChX ZWJDb3JlOjpMYXlvdXQ6OklubGluZVRleHRJdGVtOjpjcmVhdGVBbmRBcHBlbmRUZXh0SXRlbXMp OgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVUZXh0SXRlbTo6c2hvdWxkUHJlc2Vy dmVTcGFjZXNBbmRUYWJzKToKKwogMjAyMC0xMi0xMiAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBw bGUuY29tPgogCiAgICAgICAgIFJFR1JFU1NJT04ocjI3MDcxNSkgW0xGQ11bSUZDXSBXaGl0ZXNw YWNlIGFzIGV4cGFuc2lvbiBvcHBvcnR1bml0eSBzaG91bGQgbm90IGNoYW5nZSBhcyB3ZSBleHBh bmQgdGhlIHJ1bnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3Jt YXR0aW5nL0lubGluZVRleHRJdGVtLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVm b3JtYXR0aW5nL0lubGluZVRleHRJdGVtLmNwcAppbmRleCBhYjgwOTE3YTUzMGIwMjEzNzk2ZGM4 ZTUwMDc5YjZiYzQ3OWNmY2JjLi5jMzAwM2IzYTdjMTZkNTZhMjk2ZTViNGI1OGNhNjcxNmI1Njc2 YjI0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9J bmxpbmVUZXh0SXRlbS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1h dHRpbmcvSW5saW5lVGV4dEl0ZW0uY3BwCkBAIC00MCw3ICs0MCw3IEBAIHN0YXRpY19hc3NlcnQo c2l6ZW9mKElubGluZUl0ZW0pID09IHNpemVvZihJbmxpbmVUZXh0SXRlbSksICIiKTsKIAogc3Rh dGljIGlubGluZSBib29sIGlzV2hpdGVzcGFjZUNoYXJhY3RlcihVQ2hhciBjaGFyYWN0ZXIsIGJv b2wgcHJlc2VydmVOZXdsaW5lKQogewotICAgIHJldHVybiBjaGFyYWN0ZXIgPT0gJyAnIHx8IGNo YXJhY3RlciA9PSAnXHQnIHx8IChjaGFyYWN0ZXIgPT0gJ1xuJyAmJiAhcHJlc2VydmVOZXdsaW5l KTsKKyAgICByZXR1cm4gY2hhcmFjdGVyID09IHNwYWNlIHx8IGNoYXJhY3RlciA9PSB0YWJDaGFy YWN0ZXIgfHwgKGNoYXJhY3RlciA9PSBuZXdsaW5lQ2hhcmFjdGVyICYmICFwcmVzZXJ2ZU5ld2xp bmUpOwogfQogCiBzdGF0aWMgdW5zaWduZWQgbW92ZVRvTmV4dE5vbldoaXRlc3BhY2VQb3NpdGlv bihjb25zdCBTdHJpbmdWaWV3JiB0ZXh0Q29udGVudCwgdW5zaWduZWQgc3RhcnRQb3NpdGlvbiwg Ym9vbCBwcmVzZXJ2ZU5ld2xpbmUpCkBAIC03Myw2ICs3Myw3IEBAIHZvaWQgSW5saW5lVGV4dEl0 ZW06OmNyZWF0ZUFuZEFwcGVuZFRleHRJdGVtcyhJbmxpbmVJdGVtcyYgaW5saW5lQ29udGVudCwg Y29uc3QKIAogICAgIGF1dG8mIHN0eWxlID0gaW5saW5lVGV4dEJveC5zdHlsZSgpOwogICAgIGF1 dG8mIGZvbnQgPSBzdHlsZS5mb250Q2FzY2FkZSgpOworICAgIGF1dG8gd2hpdGVzcGFjZUNvbnRl bnRJc1RyZWF0ZWRBc1NpbmdsZVNwYWNlID0gIVRleHRVdGlsOjpzaG91bGRQcmVzZXJ2ZVNwYWNl c0FuZFRhYnMoaW5saW5lVGV4dEJveCk7CiAgICAgTGF6eUxpbmVCcmVha0l0ZXJhdG9yIGxpbmVC cmVha0l0ZXJhdG9yKHRleHQpOwogICAgIHVuc2lnbmVkIGN1cnJlbnRQb3NpdGlvbiA9IDA7CiAK QEAgLTk2LDE4ICs5NywyMyBAQCB2b2lkIElubGluZVRleHRJdGVtOjpjcmVhdGVBbmRBcHBlbmRU ZXh0SXRlbXMoSW5saW5lSXRlbXMmIGlubGluZUNvbnRlbnQsIGNvbnN0CiAKICAgICAgICAgaWYg KGlzV2hpdGVzcGFjZUNoYXJhY3Rlcih0ZXh0W2N1cnJlbnRQb3NpdGlvbl0sIHN0eWxlLnByZXNl cnZlTmV3bGluZSgpKSkgewogICAgICAgICAgICAgYXV0byBhcHBlbmRXaGl0ZXNwYWNlSXRlbSA9 IFsmXSAoYXV0byBzdGFydFBvc2l0aW9uLCBhdXRvIGl0ZW1MZW5ndGgpIHsKLSAgICAgICAgICAg ICAgICBhdXRvIHNpbXBsZVNpbmdsZVdoaXRlc3BhY2VDb250ZW50ID0gaW5saW5lVGV4dEJveC5j YW5Vc2VTaW1wbGlmaWVkQ29udGVudE1lYXN1cmluZygpICYmIChpdGVtTGVuZ3RoID09IDEgfHwg c3R5bGUuY29sbGFwc2VXaGl0ZVNwYWNlKCkpOworICAgICAgICAgICAgICAgIGF1dG8gc2ltcGxl U2luZ2xlV2hpdGVzcGFjZUNvbnRlbnQgPSBpbmxpbmVUZXh0Qm94LmNhblVzZVNpbXBsaWZpZWRD b250ZW50TWVhc3VyaW5nKCkgJiYgKGl0ZW1MZW5ndGggPT0gMSB8fCB3aGl0ZXNwYWNlQ29udGVu dElzVHJlYXRlZEFzU2luZ2xlU3BhY2UpOwogICAgICAgICAgICAgICAgIGF1dG8gd2lkdGggPSBz aW1wbGVTaW5nbGVXaGl0ZXNwYWNlQ29udGVudCA/IG1ha2VPcHRpb25hbChJbmxpbmVMYXlvdXRV bml0IHsgZm9udC5zcGFjZVdpZHRoKCkgfSkgOiBpbmxpbmVJdGVtV2lkdGgoc3RhcnRQb3NpdGlv biwgaXRlbUxlbmd0aCk7Ci0gICAgICAgICAgICAgICAgYXV0byBpc1dvcmRTZXBhcmF0b3IgPSB0 cnVlOwotICAgICAgICAgICAgICAgIGlmIChpdGVtTGVuZ3RoID09IDEpIHsKLSAgICAgICAgICAg ICAgICAgICAgLy8gRklYTUU6IENoZWNrIGlmIHRoZSBjb2xsYXBzaWJsZSBjb250ZW50IChtdWx0 aXBsZSB3aGl0ZXNwYWNlKSBpcyBub3QgYWx3YXlzIGEgd29yZCBzZXBhcmF0b3IuCi0gICAgICAg ICAgICAgICAgICAgIGlzV29yZFNlcGFyYXRvciA9IHRleHRbc3RhcnRQb3NpdGlvbl0gPT0gc3Bh Y2UKLSAgICAgICAgICAgICAgICAgICAgICAgIHx8IHRleHRbc3RhcnRQb3NpdGlvbl0gPT0gbm9C cmVha1NwYWNlCi0gICAgICAgICAgICAgICAgICAgICAgICB8fCB0ZXh0W3N0YXJ0UG9zaXRpb25d ID09IGV0aGlvcGljV29yZHNwYWNlCi0gICAgICAgICAgICAgICAgICAgICAgICB8fCB0ZXh0W3N0 YXJ0UG9zaXRpb25dID09IGFlZ2VhbldvcmRTZXBhcmF0b3JMaW5lCi0gICAgICAgICAgICAgICAg ICAgICAgICB8fCB0ZXh0W3N0YXJ0UG9zaXRpb25dID09IGFlZ2VhbldvcmRTZXBhcmF0b3JEb3QK LSAgICAgICAgICAgICAgICAgICAgICAgIHx8IHRleHRbc3RhcnRQb3NpdGlvbl0gPT0gdWdhcml0 aWNXb3JkRGl2aWRlcjsKLSAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgYXV0byBp c1dvcmRTZXBhcmF0b3IgPSBbJl0geworICAgICAgICAgICAgICAgICAgICBpZiAod2hpdGVzcGFj ZUNvbnRlbnRJc1RyZWF0ZWRBc1NpbmdsZVNwYWNlKQorICAgICAgICAgICAgICAgICAgICAgICAg cmV0dXJuIHRydWU7CisgICAgICAgICAgICAgICAgICAgIGlmIChpdGVtTGVuZ3RoICE9IDEpIHsK KyAgICAgICAgICAgICAgICAgICAgICAgIC8vIEZJWE1FOiBBZGQgc3VwcG9ydCBmb3IgY2FzZXMg d2hlcmUgdGhlIHdoaXRlc3BhY2UgY29udGVudCBjb250YWlucyBkaWZmZXJlbnQgdHlwZSBvZiBj aGFyYWN0ZXJzIChlLmcgICJcdCAgXHQgIFx0IikuCisgICAgICAgICAgICAgICAgICAgICAgICBy ZXR1cm4gZmFsc2U7CisgICAgICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICAgICAg YXV0byB3aGl0ZXNwYWNlQ2hhcmFjdGVyID0gdGV4dFtzdGFydFBvc2l0aW9uXTsKKyAgICAgICAg ICAgICAgICAgICAgcmV0dXJuIHdoaXRlc3BhY2VDaGFyYWN0ZXIgPT0gc3BhY2UKKyAgICAgICAg ICAgICAgICAgICAgICAgIHx8IHdoaXRlc3BhY2VDaGFyYWN0ZXIgPT0gbm9CcmVha1NwYWNlCisg ICAgICAgICAgICAgICAgICAgICAgICB8fCB3aGl0ZXNwYWNlQ2hhcmFjdGVyID09IGV0aGlvcGlj V29yZHNwYWNlCisgICAgICAgICAgICAgICAgICAgICAgICB8fCB3aGl0ZXNwYWNlQ2hhcmFjdGVy ID09IGFlZ2VhbldvcmRTZXBhcmF0b3JMaW5lCisgICAgICAgICAgICAgICAgICAgICAgICB8fCB3 aGl0ZXNwYWNlQ2hhcmFjdGVyID09IGFlZ2VhbldvcmRTZXBhcmF0b3JEb3QKKyAgICAgICAgICAg ICAgICAgICAgICAgIHx8IHdoaXRlc3BhY2VDaGFyYWN0ZXIgPT0gdWdhcml0aWNXb3JkRGl2aWRl cjsKKyAgICAgICAgICAgICAgICB9KCk7CiAgICAgICAgICAgICAgICAgaW5saW5lQ29udGVudC5h cHBlbmQoSW5saW5lVGV4dEl0ZW06OmNyZWF0ZVdoaXRlc3BhY2VJdGVtKGlubGluZVRleHRCb3gs IHN0YXJ0UG9zaXRpb24sIGl0ZW1MZW5ndGgsIGlzV29yZFNlcGFyYXRvciwgd2lkdGgpKTsKICAg ICAgICAgICAgIH07CiAK