234380 2021-12-15 19:36:41 -0800 [LFC][IFC] Simple RTL content may need visual reordering 2021-12-17 07:19:17 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham darin koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1824660 0 zalan 2021-12-15 19:36:41 -0800 as it turns out there are certain unicode categories that could make the simple (8bit) content visually reordered. 1824661 1 447318 zalan 2021-12-15 19:40:09 -0800 Created attachment 447318 Patch 1824733 2 447318 koivisto 2021-12-16 06:20:45 -0800 Comment on attachment 447318 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=447318&action=review > Source/WebCore/layout/formattingContexts/inline/InlineItemsBuilder.cpp:279 > + , paragraphContentBuilder.is8Bit() ? StringView(paragraphContentBuilder).upconvertedCharacters() : paragraphContentBuilder.characters16() I think you can just call upconvertedCharacters unconditionally. It handles all cases efficiently. I'd keep this call as a single and use variables if needed. 1824759 3 447355 zalan 2021-12-16 07:56:46 -0800 Created attachment 447355 Patch 1824786 4 ews-feeder 2021-12-16 09:37:49 -0800 Committed r287142 (245326@main): <https://commits.webkit.org/245326@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 447355. 1824787 5 webkit-bug-importer 2021-12-16 09:38:17 -0800 <rdar://problem/86580841> 1824862 6 447355 darin 2021-12-16 13:24:49 -0800 Comment on attachment 447355 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=447355&action=review > Source/WebCore/layout/formattingContexts/inline/InlineItemsBuilder.cpp:279 > + , StringView(paragraphContentBuilder).upconvertedCharacters() Is the lifetime OK here? I think it might not be. As soon as the ubidi_setPara function is done, the temporary buffer containing the unconverted characters will be deallocated. Also worried about the performance implications; the upconvertedCharacters code path is not necessarily the most efficient way to get 16-bit characters for a purpose like this. 1824867 7 zalan 2021-12-16 13:37:40 -0800 (In reply to Darin Adler from comment #6) > Comment on attachment 447355 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=447355&action=review > > > Source/WebCore/layout/formattingContexts/inline/InlineItemsBuilder.cpp:279 > > + , StringView(paragraphContentBuilder).upconvertedCharacters() > > Is the lifetime OK here? I think it might not be. As soon as the > ubidi_setPara function is done, the temporary buffer containing the > unconverted characters will be deallocated. You are right. According to the documentation "...a pointer to the text that the Bidi algorithm will be performed on. This pointer is stored in the UBiDi object and can be retrieved with ubidi_getText()." Will fix. Thanks! > > Also worried about the performance implications; the upconvertedCharacters > code path is not necessarily the most efficient way to get 16-bit characters > for a purpose like this. Do you have any suggestion? In most cases we already have a 16bit content here, only a very simple, 8bit content with RTL direction needs upconverting. 1824868 8 darin 2021-12-16 13:42:46 -0800 (In reply to zalan from comment #7) > Will fix. Thanks! Can fix it by putting the upconvertedCharacters result into a local variable, but it needs to be of type UpconvertedCharacters (likely done with "auto"), not a const UChar*. > > Also worried about the performance implications; the upconvertedCharacters > > code path is not necessarily the most efficient way to get 16-bit characters > > for a purpose like this. > > Do you have any suggestion? In most cases we already have a 16bit content > here, only a very simple, 8bit content with RTL direction needs upconverting. Oh, I didn’t realize that. If we’ll skip this code path in the common case and not do it for all cases of 8-bit characters, then I withdraw my objection. One example of how this is not necessarily best optimized for heavier uses is that UpconvertedCharacters puts the characters on the stack rather than doing a malloc/free pair if there are <= 32 characters. Explicitly-written code could set a different threshold, which would be valuable if longer strings are common, and the malloc/free cost is a significant part of the total cost. 1824870 9 zalan 2021-12-16 13:54:01 -0800 (In reply to Darin Adler from comment #8) > (In reply to zalan from comment #7) > > Will fix. Thanks! > > Can fix it by putting the upconvertedCharacters result into a local > variable, but it needs to be of type UpconvertedCharacters (likely done with > "auto"), not a const UChar*. Thanks. > > > > Also worried about the performance implications; the upconvertedCharacters > > > code path is not necessarily the most efficient way to get 16-bit characters > > > for a purpose like this. > > > > Do you have any suggestion? In most cases we already have a 16bit content > > here, only a very simple, 8bit content with RTL direction needs upconverting. > > Oh, I didn’t realize that. If we’ll skip this code path in the common case > and not do it for all cases of 8-bit characters, then I withdraw my > objection. > > One example of how this is not necessarily best optimized for heavier uses > is that UpconvertedCharacters puts the characters on the stack rather than > doing a malloc/free pair if there are <= 32 characters. Explicitly-written > code could set a different threshold, which would be valuable if longer > strings are common, and the malloc/free cost is a significant part of the > total cost. Makes sense. For the common codepath this would certainly need an explicitly-written code (luckily this is not the case here -also, on ToT we always land with a 16bit content here (RTL is not yet enabled)). 1824955 10 zalan 2021-12-16 19:16:03 -0800 Reopening to attach new patch. 1824956 11 447411 zalan 2021-12-16 19:16:05 -0800 Created attachment 447411 Patch 1824982 12 447411 darin 2021-12-16 21:37:13 -0800 Comment on attachment 447411 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=447411&action=review > Source/WebCore/layout/formattingContexts/inline/InlineItemsBuilder.cpp:281 > + , bidiContent.get() Should work without the explicit call to get() 1825061 13 447452 zalan 2021-12-17 06:17:58 -0800 Created attachment 447452 Patch 1825074 14 ews-feeder 2021-12-17 07:19:14 -0800 Committed r287184 (245351@main): <https://commits.webkit.org/245351@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 447452. 447318 2021-12-15 19:40:09 -0800 2021-12-16 07:56:43 -0800 Patch bug-234380-20211215194008.patch text/plain 3777 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3MDg2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjVjMDZhZDAyNTdlZjVm MmIzZDFhMGYyNDA2ZWQ5MzExNzI0MjYyZC4uZmM0NWQ3ZGQ4ZGI3ZTE2ZDUwMDVlMTk5MTM1MzY1 OTk0Njg4ZjFlYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIxLTEyLTE1ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIFNpbXBsZSBS VEwgY29udGVudCBtYXkgbmVlZCB2aXN1YWwgcmVvcmRlcmluZworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM0MzgwCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSXQgdHVybnMgb3V0IHRoYXQgY2VydGFpbiB1 bmljb2RlIGNhdGVnb3JpZXMgKGUuZy4gcHVuY3R1YXRpb24pIGNvdWxkIHJlcXVpcmUgcmVvcmRl cmluZyBldmVuIHdoZW4KKyAgICAgICAgdGhlIGNvbnRlbnQgaXMgInNpbXBsZSIgKDhiaXQpLgor CisgICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lSXRlbXNC dWlsZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lSXRlbXNCdWlsZGVy OjpicmVha0FuZENvbXB1dGVCaWRpTGV2ZWxzKToKKwogMjAyMS0xMi0xNSAgQWxleCBDaHJpc3Rl bnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgogCiAgICAgICAgIEF2b2lkIHVubmVjZXNz YXJ5IGFsbG9jYXRpb24gYW5kIFVURi04IGNvbnZlcnNpb24gd2hlbiBjYWxsaW5nIERGQUJ5dGVj b2RlSW50ZXJwcmV0ZXI6OmludGVycHJldApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lSXRlbXNCdWlsZGVyLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUl0ZW1z QnVpbGRlci5jcHAKaW5kZXggOGNhOWU5ZTFjMWUyMmM0MTlkOTNhODc0MTRhNzg4ZTEwYWI5MTk1 My4uMmFiMmM2YWY4NGI4MmQ4ZGY5ZWYzNmU5OGI4NGNhNWEyMjdkZWRlNCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lSXRl bXNCdWlsZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRl eHRzL2lubGluZS9JbmxpbmVJdGVtc0J1aWxkZXIuY3BwCkBAIC0yNTgsMTQgKzI1OCw2IEBAIHZv aWQgSW5saW5lSXRlbXNCdWlsZGVyOjpicmVha0FuZENvbXB1dGVCaWRpTGV2ZWxzKElubGluZUl0 ZW1zJiBpbmxpbmVJdGVtcykKICAgICBpbmxpbmVJdGVtT2Zmc2V0cy5yZXNlcnZlSW5pdGlhbENh cGFjaXR5KGlubGluZUl0ZW1zLnNpemUoKSk7CiAgICAgYnVpbGRCaWRpUGFyYWdyYXBoKHJvb3Qo KS5zdHlsZSgpLCBpbmxpbmVJdGVtcywgcGFyYWdyYXBoQ29udGVudEJ1aWxkZXIsIGlubGluZUl0 ZW1PZmZzZXRzKTsKICAgICBBU1NFUlQoaW5saW5lSXRlbU9mZnNldHMuc2l6ZSgpID09IGlubGlu ZUl0ZW1zLnNpemUoKSk7Ci0gICAgaWYgKHBhcmFncmFwaENvbnRlbnRCdWlsZGVyLmlzOEJpdCgp KSB7Ci0gICAgICAgIC8vIFNpbXBsZSBjb250ZW50IHdpdGggUlRMIGlubGluZSBiYXNlIGRpcmVj dGlvbiBjb3VsZCBqdXN0IGZvbGxvdyB0aGUgbG9naWNhbCBvcmRlci4KLSAgICAgICAgLy8gTm90 ZSB0aGF0IGlubGluZSBsZXZlbCBlbGVtZW50cyBwcm9kdWNlIDE2Yml0IHBhcmFncmFwaCBjb250 ZW50IGJ5IGFwcGVuZGluZyBvYmplY3RSZXBsYWNlbWVudENoYXJhY3Rlci4KLSAgICAgICAgLy8g ZS5nLiA8ZGl2IGRpcj1ydGw+dGhpcyBpbml0aWF0ZXMgOGJpdCBwYXJhZ3JhcGggYnVpbGRlcjwv ZGl2PiB3aGlsZQotICAgICAgICAvLyAgICAgIDxkaXYgZGlyPXJ0bD48aW1nPiA8LSB0dXJucyB0 aGUgcGFyYWdyYXBoIGJ1aWxkZXIgdG8gMTZiaXQ8L2Rpdj4gCi0gICAgICAgIHJldHVybjsKLSAg ICB9Ci0KICAgICAvLyAxLiBTZXR1cCB0aGUgYmlkaSBib3VuZGFyeSBsb29wIGJ5IGNhbGxpbmcg dWJpZGlfc2V0UGFyYSB3aXRoIHRoZSBwYXJhZ3JhcGggdGV4dC4KICAgICAvLyAyLiBDYWxsIHVi aWRpX2dldExvZ2ljYWxSdW4gdG8gYWR2YW5jZSB0byB0aGUgbmV4dCBiaWRpIGJvdW5kYXJ5IHVu dGlsIHdlIGhpdCB0aGUgZW5kIG9mIHRoZSBjb250ZW50LgogICAgIC8vIDMuIFNldCB0aGUgY29t cHV0ZWQgYmlkaSBsZXZlbCBvbiB0aGUgYXNzb2NpYXRlZCBpbmxpbmUgaXRlbXMuIFNwbGl0IHRo ZW0gYXMgbmVlZGVkLgpAQCAtMjgxLDggKzI3MywxNSBAQCB2b2lkIElubGluZUl0ZW1zQnVpbGRl cjo6YnJlYWtBbmRDb21wdXRlQmlkaUxldmVscyhJbmxpbmVJdGVtcyYgaW5saW5lSXRlbXMpCiAg ICAgICAgIHJvb3RCaWRpTGV2ZWwgPSByb290KCkuc3R5bGUoKS5pc0xlZnRUb1JpZ2h0RGlyZWN0 aW9uKCkgPyBVQklESV9MVFIgOiBVQklESV9SVEw7CiAKICAgICBVRXJyb3JDb2RlIGVycm9yID0g VV9aRVJPX0VSUk9SOwotICAgIEFTU0VSVCghcGFyYWdyYXBoQ29udGVudEJ1aWxkZXIuaXNFbXB0 eSgpKTsKLSAgICB1YmlkaV9zZXRQYXJhKHViaWRpLCBwYXJhZ3JhcGhDb250ZW50QnVpbGRlci5j aGFyYWN0ZXJzMTYoKSwgcGFyYWdyYXBoQ29udGVudEJ1aWxkZXIubGVuZ3RoKCksIHJvb3RCaWRp TGV2ZWwsIG51bGxwdHIsICZlcnJvcik7CisgICAgYXV0byBwYXJhZ3JhcGhDb250ZW50TGVuZ3Ro ID0gcGFyYWdyYXBoQ29udGVudEJ1aWxkZXIubGVuZ3RoKCk7CisgICAgQVNTRVJUKHBhcmFncmFw aENvbnRlbnRMZW5ndGgpOworICAgIHViaWRpX3NldFBhcmEodWJpZGkKKyAgICAgICAgLCBwYXJh Z3JhcGhDb250ZW50QnVpbGRlci5pczhCaXQoKSA/IFN0cmluZ1ZpZXcocGFyYWdyYXBoQ29udGVu dEJ1aWxkZXIpLnVwY29udmVydGVkQ2hhcmFjdGVycygpIDogcGFyYWdyYXBoQ29udGVudEJ1aWxk ZXIuY2hhcmFjdGVyczE2KCkKKyAgICAgICAgLCBwYXJhZ3JhcGhDb250ZW50TGVuZ3RoCisgICAg ICAgICwgcm9vdEJpZGlMZXZlbAorICAgICAgICAsIG51bGxwdHIKKyAgICAgICAgLCAmZXJyb3Ip OworCiAgICAgaWYgKFVfRkFJTFVSRShlcnJvcikpIHsKICAgICAgICAgQVNTRVJUX05PVF9SRUFD SEVEKCk7CiAgICAgICAgIHJldHVybjsKQEAgLTI5MCw3ICsyODksNyBAQCB2b2lkIElubGluZUl0 ZW1zQnVpbGRlcjo6YnJlYWtBbmRDb21wdXRlQmlkaUxldmVscyhJbmxpbmVJdGVtcyYgaW5saW5l SXRlbXMpCiAKICAgICBzaXplX3QgaW5saW5lSXRlbUluZGV4ID0gMDsKICAgICBhdXRvIGhhc1Nl ZW5PcGFxdWVJdGVtID0gZmFsc2U7Ci0gICAgZm9yIChzaXplX3QgY3VycmVudFBvc2l0aW9uID0g MDsgY3VycmVudFBvc2l0aW9uIDwgcGFyYWdyYXBoQ29udGVudEJ1aWxkZXIubGVuZ3RoKCk7KSB7 CisgICAgZm9yIChzaXplX3QgY3VycmVudFBvc2l0aW9uID0gMDsgY3VycmVudFBvc2l0aW9uIDwg cGFyYWdyYXBoQ29udGVudExlbmd0aDspIHsKICAgICAgICAgVUJpRGlMZXZlbCBiaWRpTGV2ZWw7 CiAgICAgICAgIGludDMyX3QgZW5kUG9zaXRpb24gPSBjdXJyZW50UG9zaXRpb247CiAgICAgICAg IHViaWRpX2dldExvZ2ljYWxSdW4odWJpZGksIGN1cnJlbnRQb3NpdGlvbiwgJmVuZFBvc2l0aW9u LCAmYmlkaUxldmVsKTsK 447355 2021-12-16 07:56:46 -0800 2021-12-16 19:16:00 -0800 Patch bug-234380-20211216075645.patch text/plain 2950 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3MTM0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjEzYjBhYmM4NGJmYmFk ZGRmM2EyY2M4M2JiNDEzNzRhODQzOWZlMC4uYmY3NmFhOTQwNzAxYTI2ZGRiNDk1NzE0ZmIwNWUx NGEwODMyM2U2NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIxLTEyLTE2ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIFNpbXBsZSBS VEwgY29udGVudCBtYXkgbmVlZCB2aXN1YWwgcmVvcmRlcmluZworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM0MzgwCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgQW50dGkgS29pdmlzdG8uCisKKyAgICAgICAgSXQgdHVybnMgb3V0IHRoYXQgY2VydGFpbiB1 bmljb2RlIGNhdGVnb3JpZXMgKGUuZy4gcHVuY3R1YXRpb24pIGNvdWxkIHJlcXVpcmUgcmVvcmRl cmluZyBldmVuIHdoZW4KKyAgICAgICAgdGhlIGNvbnRlbnQgaXMgInNpbXBsZSIgKDhiaXQpLgor CisgICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lSXRlbXNC dWlsZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lSXRlbXNCdWlsZGVy OjpicmVha0FuZENvbXB1dGVCaWRpTGV2ZWxzKToKKwogMjAyMS0xMi0xNiAgQWxhbiBCdWp0YXMg IDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xGQ11bSUZDXSBBZGQgc3VwcG9ydCBmb3Ig bWl4ZWQgbHRyL3J0bCBjb250ZW50CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv Zm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVJdGVtc0J1aWxkZXIuY3BwIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lSXRlbXNCdWls ZGVyLmNwcAppbmRleCBmNWM5NWFhODJhMDY4OWRmNGEyNDg3YmZlNmM3MTZhNTk0NTlhYTU0Li4y MTAwMzQ2ZmU5OTZkZTk0NDkxZDE2ZmNhODJjZjhjNGM3MmJkNGE1IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVJdGVtc0J1 aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMv aW5saW5lL0lubGluZUl0ZW1zQnVpbGRlci5jcHAKQEAgLTI1OSwxNCArMjU5LDYgQEAgdm9pZCBJ bmxpbmVJdGVtc0J1aWxkZXI6OmJyZWFrQW5kQ29tcHV0ZUJpZGlMZXZlbHMoSW5saW5lSXRlbXMm IGlubGluZUl0ZW1zKQogICAgIGlubGluZUl0ZW1PZmZzZXRzLnJlc2VydmVJbml0aWFsQ2FwYWNp dHkoaW5saW5lSXRlbXMuc2l6ZSgpKTsKICAgICBidWlsZEJpZGlQYXJhZ3JhcGgocm9vdCgpLnN0 eWxlKCksIGlubGluZUl0ZW1zLCBwYXJhZ3JhcGhDb250ZW50QnVpbGRlciwgaW5saW5lSXRlbU9m ZnNldHMpOwogICAgIEFTU0VSVChpbmxpbmVJdGVtT2Zmc2V0cy5zaXplKCkgPT0gaW5saW5lSXRl bXMuc2l6ZSgpKTsKLSAgICBpZiAocGFyYWdyYXBoQ29udGVudEJ1aWxkZXIuaXM4Qml0KCkpIHsK LSAgICAgICAgLy8gU2ltcGxlIGNvbnRlbnQgd2l0aCBSVEwgaW5saW5lIGJhc2UgZGlyZWN0aW9u IGNvdWxkIGp1c3QgZm9sbG93IHRoZSBsb2dpY2FsIG9yZGVyLgotICAgICAgICAvLyBOb3RlIHRo YXQgaW5saW5lIGxldmVsIGVsZW1lbnRzIHByb2R1Y2UgMTZiaXQgcGFyYWdyYXBoIGNvbnRlbnQg YnkgYXBwZW5kaW5nIG9iamVjdFJlcGxhY2VtZW50Q2hhcmFjdGVyLgotICAgICAgICAvLyBlLmcu IDxkaXYgZGlyPXJ0bD50aGlzIGluaXRpYXRlcyA4Yml0IHBhcmFncmFwaCBidWlsZGVyPC9kaXY+ IHdoaWxlCi0gICAgICAgIC8vICAgICAgPGRpdiBkaXI9cnRsPjxpbWc+IDwtIHR1cm5zIHRoZSBw YXJhZ3JhcGggYnVpbGRlciB0byAxNmJpdDwvZGl2PiAKLSAgICAgICAgcmV0dXJuOwotICAgIH0K LQogICAgIC8vIDEuIFNldHVwIHRoZSBiaWRpIGJvdW5kYXJ5IGxvb3AgYnkgY2FsbGluZyB1Ymlk aV9zZXRQYXJhIHdpdGggdGhlIHBhcmFncmFwaCB0ZXh0LgogICAgIC8vIDIuIENhbGwgdWJpZGlf Z2V0TG9naWNhbFJ1biB0byBhZHZhbmNlIHRvIHRoZSBuZXh0IGJpZGkgYm91bmRhcnkgdW50aWwg d2UgaGl0IHRoZSBlbmQgb2YgdGhlIGNvbnRlbnQuCiAgICAgLy8gMy4gU2V0IHRoZSBjb21wdXRl ZCBiaWRpIGxldmVsIG9uIHRoZSBhc3NvY2lhdGVkIGlubGluZSBpdGVtcy4gU3BsaXQgdGhlbSBh cyBuZWVkZWQuCkBAIC0yODMsNyArMjc1LDEzIEBAIHZvaWQgSW5saW5lSXRlbXNCdWlsZGVyOjpi cmVha0FuZENvbXB1dGVCaWRpTGV2ZWxzKElubGluZUl0ZW1zJiBpbmxpbmVJdGVtcykKIAogICAg IFVFcnJvckNvZGUgZXJyb3IgPSBVX1pFUk9fRVJST1I7CiAgICAgQVNTRVJUKCFwYXJhZ3JhcGhD b250ZW50QnVpbGRlci5pc0VtcHR5KCkpOwotICAgIHViaWRpX3NldFBhcmEodWJpZGksIHBhcmFn cmFwaENvbnRlbnRCdWlsZGVyLmNoYXJhY3RlcnMxNigpLCBwYXJhZ3JhcGhDb250ZW50QnVpbGRl ci5sZW5ndGgoKSwgcm9vdEJpZGlMZXZlbCwgbnVsbHB0ciwgJmVycm9yKTsKKyAgICB1YmlkaV9z ZXRQYXJhKHViaWRpCisgICAgICAgICwgU3RyaW5nVmlldyhwYXJhZ3JhcGhDb250ZW50QnVpbGRl cikudXBjb252ZXJ0ZWRDaGFyYWN0ZXJzKCkKKyAgICAgICAgLCBwYXJhZ3JhcGhDb250ZW50QnVp bGRlci5sZW5ndGgoKQorICAgICAgICAsIHJvb3RCaWRpTGV2ZWwKKyAgICAgICAgLCBudWxscHRy CisgICAgICAgICwgJmVycm9yKTsKKwogICAgIGlmIChVX0ZBSUxVUkUoZXJyb3IpKSB7CiAgICAg ICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogICAgICAgICByZXR1cm47Cg== 447411 2021-12-16 19:16:05 -0800 2021-12-17 06:17:55 -0800 Patch bug-234380-20211216191604.patch text/plain 2473 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3MTQ0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGE5ODY0ZWExYmRlZmVm ZDNhZWM4ODcwNzkzZTUxOGRmODUxZDI3Yi4uNTQxMWY0ZTJlMDE5MGQ2YTY0YjgyN2IyNzRlM2U1 NTM2ZjI2ODcyNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIxLTEyLTE2ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIFNpbXBsZSBS VEwgY29udGVudCBtYXkgbmVlZCB2aXN1YWwgcmVvcmRlcmluZworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM0MzgwCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgRGFyaW4gQWRsZXIgYW5kIEFudHRpIEtvaXZpc3RvLgorCisgICAgICAgIEFkZHJlc3Npbmcg cG9zdC1jb21taXQgY29tbWVudCAocjI4NzE0MikuCisKKyAgICAgICAgKiBsYXlvdXQvZm9ybWF0 dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVJdGVtc0J1aWxkZXIuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6TGF5b3V0OjpJbmxpbmVJdGVtc0J1aWxkZXI6OmJyZWFrQW5kQ29tcHV0ZUJpZGlMZXZl bHMpOgorCiAyMDIxLTEyLTE2ICBKb2huIEN1bm5pbmdoYW0gIDxqb2huY3VubmluZ2hhbUBhcHBs ZS5jb20+CiAKICAgICAgICAgW0dQVVBdIENyZWF0ZSBXZWJHTCBjb250ZXh0IHdpdGggdGFzayBp ZCB0b2tlbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250 ZXh0cy9pbmxpbmUvSW5saW5lSXRlbXNCdWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUl0ZW1zQnVpbGRlci5jcHAKaW5kZXgg MjEwMDM0NmZlOTk2ZGU5NDQ5MWQxNmZjYTgyY2Y4YzRjNzJiZDRhNS4uNDY0MWRlZDQ2ZWQ3MWEz ZTAyY2E0M2FmOTJhZDRlOGFjMDQ3ZDI1ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lSXRlbXNCdWlsZGVyLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVJ dGVtc0J1aWxkZXIuY3BwCkBAIC0yNzMsMTEgKzI3MywxMyBAQCB2b2lkIElubGluZUl0ZW1zQnVp bGRlcjo6YnJlYWtBbmRDb21wdXRlQmlkaUxldmVscyhJbmxpbmVJdGVtcyYgaW5saW5lSXRlbXMp CiAgICAgaWYgKCF1c2VIZXVyaXN0aWNCYXNlRGlyZWN0aW9uKQogICAgICAgICByb290QmlkaUxl dmVsID0gcm9vdCgpLnN0eWxlKCkuaXNMZWZ0VG9SaWdodERpcmVjdGlvbigpID8gVUJJRElfTFRS IDogVUJJRElfUlRMOwogCisgICAgYXV0byBiaWRpQ29udGVudCA9IFN0cmluZ1ZpZXcgeyBwYXJh Z3JhcGhDb250ZW50QnVpbGRlciB9LnVwY29udmVydGVkQ2hhcmFjdGVycygpOworICAgIGF1dG8g YmlkaUNvbnRlbnRMZW5ndGggPSBwYXJhZ3JhcGhDb250ZW50QnVpbGRlci5sZW5ndGgoKTsKICAg ICBVRXJyb3JDb2RlIGVycm9yID0gVV9aRVJPX0VSUk9SOwotICAgIEFTU0VSVCghcGFyYWdyYXBo Q29udGVudEJ1aWxkZXIuaXNFbXB0eSgpKTsKKyAgICBBU1NFUlQoYmlkaUNvbnRlbnRMZW5ndGgp OwogICAgIHViaWRpX3NldFBhcmEodWJpZGkKLSAgICAgICAgLCBTdHJpbmdWaWV3KHBhcmFncmFw aENvbnRlbnRCdWlsZGVyKS51cGNvbnZlcnRlZENoYXJhY3RlcnMoKQotICAgICAgICAsIHBhcmFn cmFwaENvbnRlbnRCdWlsZGVyLmxlbmd0aCgpCisgICAgICAgICwgYmlkaUNvbnRlbnQuZ2V0KCkK KyAgICAgICAgLCBiaWRpQ29udGVudExlbmd0aAogICAgICAgICAsIHJvb3RCaWRpTGV2ZWwKICAg ICAgICAgLCBudWxscHRyCiAgICAgICAgICwgJmVycm9yKTsKQEAgLTI4OSw3ICsyOTEsNyBAQCB2 b2lkIElubGluZUl0ZW1zQnVpbGRlcjo6YnJlYWtBbmRDb21wdXRlQmlkaUxldmVscyhJbmxpbmVJ dGVtcyYgaW5saW5lSXRlbXMpCiAKICAgICBzaXplX3QgaW5saW5lSXRlbUluZGV4ID0gMDsKICAg ICBhdXRvIGhhc1NlZW5PcGFxdWVJdGVtID0gZmFsc2U7Ci0gICAgZm9yIChzaXplX3QgY3VycmVu dFBvc2l0aW9uID0gMDsgY3VycmVudFBvc2l0aW9uIDwgcGFyYWdyYXBoQ29udGVudEJ1aWxkZXIu bGVuZ3RoKCk7KSB7CisgICAgZm9yIChzaXplX3QgY3VycmVudFBvc2l0aW9uID0gMDsgY3VycmVu dFBvc2l0aW9uIDwgYmlkaUNvbnRlbnRMZW5ndGg7KSB7CiAgICAgICAgIFVCaURpTGV2ZWwgYmlk aUxldmVsOwogICAgICAgICBpbnQzMl90IGVuZFBvc2l0aW9uID0gY3VycmVudFBvc2l0aW9uOwog ICAgICAgICB1YmlkaV9nZXRMb2dpY2FsUnVuKHViaWRpLCBjdXJyZW50UG9zaXRpb24sICZlbmRQ b3NpdGlvbiwgJmJpZGlMZXZlbCk7Cg== 447452 2021-12-17 06:17:58 -0800 2021-12-17 07:19:15 -0800 Patch bug-234380-20211217061757.patch text/plain 2467 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3MTQ0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGE5ODY0ZWExYmRlZmVm ZDNhZWM4ODcwNzkzZTUxOGRmODUxZDI3Yi4uNTQxMWY0ZTJlMDE5MGQ2YTY0YjgyN2IyNzRlM2U1 NTM2ZjI2ODcyNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIxLTEyLTE2ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIFNpbXBsZSBS VEwgY29udGVudCBtYXkgbmVlZCB2aXN1YWwgcmVvcmRlcmluZworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM0MzgwCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgRGFyaW4gQWRsZXIgYW5kIEFudHRpIEtvaXZpc3RvLgorCisgICAgICAgIEFkZHJlc3Npbmcg cG9zdC1jb21taXQgY29tbWVudCAocjI4NzE0MikuCisKKyAgICAgICAgKiBsYXlvdXQvZm9ybWF0 dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVJdGVtc0J1aWxkZXIuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6TGF5b3V0OjpJbmxpbmVJdGVtc0J1aWxkZXI6OmJyZWFrQW5kQ29tcHV0ZUJpZGlMZXZl bHMpOgorCiAyMDIxLTEyLTE2ICBKb2huIEN1bm5pbmdoYW0gIDxqb2huY3VubmluZ2hhbUBhcHBs ZS5jb20+CiAKICAgICAgICAgW0dQVVBdIENyZWF0ZSBXZWJHTCBjb250ZXh0IHdpdGggdGFzayBp ZCB0b2tlbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250 ZXh0cy9pbmxpbmUvSW5saW5lSXRlbXNCdWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUl0ZW1zQnVpbGRlci5jcHAKaW5kZXgg MjEwMDM0NmZlOTk2ZGU5NDQ5MWQxNmZjYTgyY2Y4YzRjNzJiZDRhNS4uYjJmOTE2YjVhMTgyNzYy ZDIyNjQwNjViMzRlMmQ4MDdmOTMwNGM2MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lSXRlbXNCdWlsZGVyLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVJ dGVtc0J1aWxkZXIuY3BwCkBAIC0yNzMsMTEgKzI3MywxMyBAQCB2b2lkIElubGluZUl0ZW1zQnVp bGRlcjo6YnJlYWtBbmRDb21wdXRlQmlkaUxldmVscyhJbmxpbmVJdGVtcyYgaW5saW5lSXRlbXMp CiAgICAgaWYgKCF1c2VIZXVyaXN0aWNCYXNlRGlyZWN0aW9uKQogICAgICAgICByb290QmlkaUxl dmVsID0gcm9vdCgpLnN0eWxlKCkuaXNMZWZ0VG9SaWdodERpcmVjdGlvbigpID8gVUJJRElfTFRS IDogVUJJRElfUlRMOwogCisgICAgYXV0byBiaWRpQ29udGVudCA9IFN0cmluZ1ZpZXcgeyBwYXJh Z3JhcGhDb250ZW50QnVpbGRlciB9LnVwY29udmVydGVkQ2hhcmFjdGVycygpOworICAgIGF1dG8g YmlkaUNvbnRlbnRMZW5ndGggPSBwYXJhZ3JhcGhDb250ZW50QnVpbGRlci5sZW5ndGgoKTsKICAg ICBVRXJyb3JDb2RlIGVycm9yID0gVV9aRVJPX0VSUk9SOwotICAgIEFTU0VSVCghcGFyYWdyYXBo Q29udGVudEJ1aWxkZXIuaXNFbXB0eSgpKTsKKyAgICBBU1NFUlQoYmlkaUNvbnRlbnRMZW5ndGgp OwogICAgIHViaWRpX3NldFBhcmEodWJpZGkKLSAgICAgICAgLCBTdHJpbmdWaWV3KHBhcmFncmFw aENvbnRlbnRCdWlsZGVyKS51cGNvbnZlcnRlZENoYXJhY3RlcnMoKQotICAgICAgICAsIHBhcmFn cmFwaENvbnRlbnRCdWlsZGVyLmxlbmd0aCgpCisgICAgICAgICwgYmlkaUNvbnRlbnQKKyAgICAg ICAgLCBiaWRpQ29udGVudExlbmd0aAogICAgICAgICAsIHJvb3RCaWRpTGV2ZWwKICAgICAgICAg LCBudWxscHRyCiAgICAgICAgICwgJmVycm9yKTsKQEAgLTI4OSw3ICsyOTEsNyBAQCB2b2lkIElu bGluZUl0ZW1zQnVpbGRlcjo6YnJlYWtBbmRDb21wdXRlQmlkaUxldmVscyhJbmxpbmVJdGVtcyYg aW5saW5lSXRlbXMpCiAKICAgICBzaXplX3QgaW5saW5lSXRlbUluZGV4ID0gMDsKICAgICBhdXRv IGhhc1NlZW5PcGFxdWVJdGVtID0gZmFsc2U7Ci0gICAgZm9yIChzaXplX3QgY3VycmVudFBvc2l0 aW9uID0gMDsgY3VycmVudFBvc2l0aW9uIDwgcGFyYWdyYXBoQ29udGVudEJ1aWxkZXIubGVuZ3Ro KCk7KSB7CisgICAgZm9yIChzaXplX3QgY3VycmVudFBvc2l0aW9uID0gMDsgY3VycmVudFBvc2l0 aW9uIDwgYmlkaUNvbnRlbnRMZW5ndGg7KSB7CiAgICAgICAgIFVCaURpTGV2ZWwgYmlkaUxldmVs OwogICAgICAgICBpbnQzMl90IGVuZFBvc2l0aW9uID0gY3VycmVudFBvc2l0aW9uOwogICAgICAg ICB1YmlkaV9nZXRMb2dpY2FsUnVuKHViaWRpLCBjdXJyZW50UG9zaXRpb24sICZlbmRQb3NpdGlv biwgJmJpZGlMZXZlbCk7Cg==