228107 2021-07-20 08:13:02 -0700 IBeam cursor is horizontal in Mail compose window 2021-07-20 12:44:29 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 katherine_cheney katherine_cheney simon.fraser thorton wenson_hsieh zalan oldest_to_newest 1778174 0 katherine_cheney 2021-07-20 08:13:02 -0700 IBeam cursor is horizontal in Mail compose window 1778175 1 433875 katherine_cheney 2021-07-20 08:15:38 -0700 Created attachment 433875 Patch 1778176 2 katherine_cheney 2021-07-20 08:16:00 -0700 rdar://80636912 1778196 3 433875 simon.fraser 2021-07-20 10:02:11 -0700 Comment on attachment 433875 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=433875&action=review > Source/WebKit/Shared/ios/InteractionInformationAtPosition.h:76 > + std::optional<bool> isHorizontalWritingMode; Would it be simpler to just call this isVerticalWritingMode and default to false? That's effectively what the code is doing. 1778201 4 433875 katherine_cheney 2021-07-20 10:37:27 -0700 Comment on attachment 433875 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=433875&action=review >> Source/WebKit/Shared/ios/InteractionInformationAtPosition.h:76 >> + std::optional<bool> isHorizontalWritingMode; > > Would it be simpler to just call this isVerticalWritingMode and default to false? That's effectively what the code is doing. Yes, it would be. 1778203 5 433881 katherine_cheney 2021-07-20 10:41:23 -0700 Created attachment 433881 Patch 1778244 6 ews-feeder 2021-07-20 12:44:27 -0700 Committed r280098 (239815@main): <https://commits.webkit.org/239815@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 433881. 433875 2021-07-20 08:15:38 -0700 2021-07-20 10:41:21 -0700 Patch bug-228107-20210720081537.patch text/plain 4545 katherine_cheney U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwMDAyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDdlNTA4MGQ0N2FjYjc3NzEy YzUzNzc0NWMyM2FjMmRlNDFiZDI2NWEuLjBhMGIzM2E3NGUwYjk4YTVjM2MwMWMxNzNlYjkzODI0 ZDliODc4Y2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUgQEAKKzIwMjEtMDctMjAgIEthdGUgQ2hl bmV5ICA8a2F0aGVyaW5lX2NoZW5leUBhcHBsZS5jb20+CisKKyAgICAgICAgSUJlYW0gY3Vyc29y IGlzIGhvcml6b250YWwgaW4gTWFpbCBjb21wb3NlIHdpbmRvdworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI4MTA3CisgICAgICAgIDxyZGFyOi8vcHJv YmxlbS84MDYzNjkxMj4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBSZWNlbnRseSB3ZSBhZGRlZCBzdXBwb3J0IGZvciB2ZXJ0aWNhbCB3cml0aW5nIG1v ZGUgZm9yIHRoZSBJQmVhbQorICAgICAgICBjdXJzb3IgaW4gV2ViS2l0LiBUaGlzIGFkZGVkIGEg bmV3IHBhcmFtZXRlciBpc0hvcml6b250YWxXcml0aW5nTW9kZQorICAgICAgICB3aGljaCBkZWZh dWx0cyB0byBmYWxzZS4gVGhpcyBjYXVzZXMgdGhlIElCZWFtIHRvIGFwcGVhciBob3Jpem9udGFs IGluCisgICAgICAgIGNhc2VzIHdoZXJlIFdlYlBhZ2U6OnBvcHVsYXRlQ2FyZXRDb250ZXh0IGlz IG5vdCBjYWxsZWQsIHJlZ3Jlc3NpbmcgZXhwZWN0ZWQKKyAgICAgICAgYmVoYXZpb3IuIFRoaXMg cGF0Y2ggbWFrZXMgaXNIb3Jpem9udGFsV3JpdGluZ01vZGUgYW4gb3B0aW9uYWwgYW5kCisgICAg ICAgIG9ubHkgc2V0cyB0aGUgSUJlYW0gY3Vyc29yIG9yaWVudGF0aW9uIGlmIHRoZSB2YWx1ZSB3 YXMgZXhwbGljaXRseQorICAgICAgICBzZXQgaW4gdGhlIHBhZ2UuCisKKyAgICAgICAgKiBTaGFy ZWQvaW9zL0ludGVyYWN0aW9uSW5mb3JtYXRpb25BdFBvc2l0aW9uLmg6CisgICAgICAgICogVUlQ cm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW06CisgICAgICAgICgtW1dLQ29u dGVudFZpZXcgcG9pbnRlckludGVyYWN0aW9uOnN0eWxlRm9yUmVnaW9uOl0pOgorICAgICAgICAq IFdlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbToKKyAgICAgICAgKFdlYktpdDo6 cG9wdWxhdGVDYXJldENvbnRleHQpOgorCiAyMDIxLTA3LTE2ICBLYXRlIENoZW5leSAgPGthdGhl cmluZV9jaGVuZXlAYXBwbGUuY29tPgogCiAgICAgICAgIG1hY09TIFNhZmFyaSBuZXR3b3JrIHNl c3Npb25zIG5vdCBiZWluZyBtYXJrZWQgYXMgYmVpbmcgZnJvbSBhIGJyb3dzZXIKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL2lvcy9JbnRlcmFjdGlvbkluZm9ybWF0aW9uQXRQb3Np dGlvbi5oIGIvU291cmNlL1dlYktpdC9TaGFyZWQvaW9zL0ludGVyYWN0aW9uSW5mb3JtYXRpb25B dFBvc2l0aW9uLmgKaW5kZXggMDAyMmQxM2U1OTIzNmZmYzAyOTNlMDRmMzEwOWQzNGRiNWIzNDNh MC4uYTBiNTJhMGFkYjkyNWM5ZGFiZGRmZmI3ZjIxYTg5YjE2YzUzMTFhNCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9TaGFyZWQvaW9zL0ludGVyYWN0aW9uSW5mb3JtYXRpb25BdFBvc2l0aW9u LmgKKysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvaW9zL0ludGVyYWN0aW9uSW5mb3JtYXRpb25B dFBvc2l0aW9uLmgKQEAgLTczLDcgKzczLDcgQEAgc3RydWN0IEludGVyYWN0aW9uSW5mb3JtYXRp b25BdFBvc2l0aW9uIHsKICNlbmRpZgogICAgIGJvb2wgc2hvdWxkTm90VXNlSUJlYW1JbkVkaXRh YmxlQ29udGVudCB7IGZhbHNlIH07CiAgICAgYm9vbCBpc0ltYWdlT3ZlcmxheVRleHQgeyBmYWxz ZSB9OwotICAgIGJvb2wgaXNIb3Jpem9udGFsV3JpdGluZ01vZGUgeyBmYWxzZSB9OworICAgIHN0 ZDo6b3B0aW9uYWw8Ym9vbD4gaXNIb3Jpem9udGFsV3JpdGluZ01vZGU7CiAgICAgV2ViQ29yZTo6 RmxvYXRQb2ludCBhZGp1c3RlZFBvaW50Rm9yTm9kZVJlc3BvbmRpbmdUb0NsaWNrRXZlbnRzOwog ICAgIFVSTCB1cmw7CiAgICAgVVJMIGltYWdlVVJMOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbSBiL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0KaW5kZXggZjY0OWJm MDBjYWJiOGQzNDMyYWNmYTBjNGUxOTFmOGZmNTcyM2NkMC4uOTYzYzMwNzRjYjIwNzlmMzRmYTlk YTdlYzUyNzg4NGJlOWMwNWE3MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv aW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tCkBAIC05NjgxLDggKzk2ODEsMTMg QEAgc3RhdGljIEJPT0wgYXBwbGljYXRpb25Jc0tub3duVG9JZ25vcmVNb3VzZUV2ZW50cyhjb25z dCBjaGFyKiAmd2FybmluZ1ZlcnNpb24pCiAKICAgICBVSVBvaW50ZXJTdHlsZSAqKF5pQmVhbUN1 cnNvcikodm9pZCkgPSBeewogICAgICAgICBmbG9hdCBiZWFtTGVuZ3RoID0gX3Bvc2l0aW9uSW5m b3JtYXRpb24uY2FyZXRMZW5ndGggKiBzY2FsZUZhY3RvcjsKLSAgICAgICAgYXV0byBheGlzT3Jp ZW50YXRpb24gPSBfcG9zaXRpb25JbmZvcm1hdGlvbi5pc0hvcml6b250YWxXcml0aW5nTW9kZSA/ IFVJQXhpc1ZlcnRpY2FsIDogVUlBeGlzSG9yaXpvbnRhbDsKLSAgICAgICAgVUlBeGlzIGlCZWFt Q29uc3RyYWludEF4ZXMgPSBfcG9zaXRpb25JbmZvcm1hdGlvbi5pc0hvcml6b250YWxXcml0aW5n TW9kZSA/IFVJQXhpc1ZlcnRpY2FsIDogVUlBeGlzSG9yaXpvbnRhbDsKKyAgICAgICAgYXV0byBh eGlzT3JpZW50YXRpb24gPSBVSUF4aXNWZXJ0aWNhbDsKKyAgICAgICAgVUlBeGlzIGlCZWFtQ29u c3RyYWludEF4ZXMgPSBVSUF4aXNWZXJ0aWNhbDsKKworICAgICAgICBpZiAoX3Bvc2l0aW9uSW5m b3JtYXRpb24uaXNIb3Jpem9udGFsV3JpdGluZ01vZGUpIHsKKyAgICAgICAgICAgIGF4aXNPcmll bnRhdGlvbiA9ICpfcG9zaXRpb25JbmZvcm1hdGlvbi5pc0hvcml6b250YWxXcml0aW5nTW9kZSA/ IFVJQXhpc1ZlcnRpY2FsIDogVUlBeGlzSG9yaXpvbnRhbDsKKyAgICAgICAgICAgIGlCZWFtQ29u c3RyYWludEF4ZXMgPSAqX3Bvc2l0aW9uSW5mb3JtYXRpb24uaXNIb3Jpem9udGFsV3JpdGluZ01v ZGUgPyBVSUF4aXNWZXJ0aWNhbCA6IFVJQXhpc0hvcml6b250YWw7CisgICAgICAgIH0KIAogICAg ICAgICAvLyBJZiB0aGUgSS1iZWFtIGlzIHNvIGxhcmdlIHRoYXQgdGhlIG1hZ25ldGlzbSBpcyBo YXJkIHRvIGZpZ2h0LCB3ZSBzaG91bGQgbm90IGFwcGx5IGFueSBtYWduZXRpc20uCiAgICAgICAg IGlmIChiZWFtTGVuZ3RoID4gW1VJVGV4dEludGVyYWN0aW9uIF9tYXhpbXVtQmVhbVNuYXBwaW5n TGVuZ3RoXSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL2lv cy9XZWJQYWdlSU9TLm1tIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dl YlBhZ2VJT1MubW0KaW5kZXggMmY0ZDgxYzFmMWZiOGZmMDUwOGE0MjgyYTI2ZTA4ZjAxZTcxNDM3 OS4uOThiZGY5OTFhNTQ3MzBmNzA4ZjUxM2QxNmJmMGEyZTg3OWZhMzUxNyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0KKysrIGIv U291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0KQEAgLTMw MzgsNyArMzAzOCw3IEBAIHN0YXRpYyB2b2lkIHBvcHVsYXRlQ2FyZXRDb250ZXh0KGNvbnN0IEhp dFRlc3RSZXN1bHQmIGhpdFRlc3RSZXN1bHQsIGNvbnN0IEludGVyCiAKICAgICBpbmZvLmlzSG9y aXpvbnRhbFdyaXRpbmdNb2RlID0gcmVuZGVyZXItPmlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCk7 CiAgICAgaW5mby5saW5lQ2FyZXRFeHRlbnQgPSB2aWV3LT5jb250ZW50c1RvUm9vdFZpZXcobGlu ZVJlY3QpOwotICAgIGluZm8uY2FyZXRMZW5ndGggPSBpbmZvLmlzSG9yaXpvbnRhbFdyaXRpbmdN b2RlID8gaW5mby5saW5lQ2FyZXRFeHRlbnQuaGVpZ2h0KCkgOiBpbmZvLmxpbmVDYXJldEV4dGVu dC53aWR0aCgpOworICAgIGluZm8uY2FyZXRMZW5ndGggPSByZW5kZXJlci0+aXNIb3Jpem9udGFs V3JpdGluZ01vZGUoKSA/IGluZm8ubGluZUNhcmV0RXh0ZW50LmhlaWdodCgpIDogaW5mby5saW5l Q2FyZXRFeHRlbnQud2lkdGgoKTsKIAogICAgIGJvb2wgbGluZUNvbnRhaW5zUmVxdWVzdFBvaW50 ID0gaW5mby5saW5lQ2FyZXRFeHRlbnQuY29udGFpbnMocmVxdWVzdC5wb2ludCk7CiAgICAgLy8g Rm9yY2UgYW4gSS1iZWFtIGN1cnNvciBpZiB0aGUgcGFnZSBkaWRuJ3QgcmVxdWVzdCBhIGhhbmQs IGFuZCB3ZSdyZSBpbnNpZGUgdGhlIGJvdW5kcyBvZiB0aGUgbGluZS4K 433881 2021-07-20 10:41:23 -0700 2021-07-20 12:44:28 -0700 Patch bug-228107-20210720104122.patch text/plain 6429 katherine_cheney U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwMDAyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDdlNTA4MGQ0N2FjYjc3NzEy YzUzNzc0NWMyM2FjMmRlNDFiZDI2NWEuLjczNjBjNzcwZGU3OGU5NWI3ODg2ODgwYzQ2NDM4NTE1 MGIwYzc4YWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjkgQEAKKzIwMjEtMDctMjAgIEthdGUgQ2hl bmV5ICA8a2F0aGVyaW5lX2NoZW5leUBhcHBsZS5jb20+CisKKyAgICAgICAgSUJlYW0gY3Vyc29y IGlzIGhvcml6b250YWwgaW4gTWFpbCBjb21wb3NlIHdpbmRvdworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI4MTA3CisgICAgICAgIDxyZGFyOi8vcHJv YmxlbS84MDYzNjkxMj4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBSZWNlbnRseSB3ZSBhZGRlZCBzdXBwb3J0IGZvciB2ZXJ0aWNhbCB3cml0aW5nIG1v ZGUgZm9yIHRoZSBJQmVhbQorICAgICAgICBjdXJzb3IgaW4gV2ViS2l0LiBUaGlzIGFkZGVkIGEg bmV3IHBhcmFtZXRlciBpc0hvcml6b250YWxXcml0aW5nTW9kZQorICAgICAgICB3aGljaCBkZWZh dWx0cyB0byBmYWxzZS4gVGhpcyBjYXVzZXMgdGhlIElCZWFtIHRvIGFwcGVhciBob3Jpem9udGFs IGluCisgICAgICAgIGNhc2VzIHdoZXJlIFdlYlBhZ2U6OnBvcHVsYXRlQ2FyZXRDb250ZXh0IGlz IG5vdCBjYWxsZWQsIHJlZ3Jlc3NpbmcgZXhwZWN0ZWQKKyAgICAgICAgYmVoYXZpb3IuIAorCisg ICAgICAgIFRoaXMgcGF0Y2ggY2hhbmdlcyBpc0hvcml6b250YWxXcml0aW5nTW9kZSB0byBpc1Zl cnRpY2FsV3JpdGluZ01vZGUKKyAgICAgICAgdG8gZml4IHRoaXMsIHdoaWxlIHN0aWxsIGFsbG93 aW5nIHN1cHBvcnQgZm9yIHZlcnRpY2FsIHdyaXRpbmcgbW9kZS4KKworICAgICAgICAqIFNoYXJl ZC9pb3MvSW50ZXJhY3Rpb25JbmZvcm1hdGlvbkF0UG9zaXRpb24uaDoKKyAgICAgICAgKiBTaGFy ZWQvaW9zL0ludGVyYWN0aW9uSW5mb3JtYXRpb25BdFBvc2l0aW9uLm1tOgorICAgICAgICAoV2Vi S2l0OjpJbnRlcmFjdGlvbkluZm9ybWF0aW9uQXRQb3NpdGlvbjo6ZW5jb2RlIGNvbnN0KToKKyAg ICAgICAgKFdlYktpdDo6SW50ZXJhY3Rpb25JbmZvcm1hdGlvbkF0UG9zaXRpb246OmRlY29kZSk6 CisgICAgICAgICogVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW06Cisg ICAgICAgICgtW1dLQ29udGVudFZpZXcgcG9pbnRlckludGVyYWN0aW9uOnN0eWxlRm9yUmVnaW9u Ol0pOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbToKKyAg ICAgICAgKFdlYktpdDo6cG9wdWxhdGVDYXJldENvbnRleHQpOgorCiAyMDIxLTA3LTE2ICBLYXRl IENoZW5leSAgPGthdGhlcmluZV9jaGVuZXlAYXBwbGUuY29tPgogCiAgICAgICAgIG1hY09TIFNh ZmFyaSBuZXR3b3JrIHNlc3Npb25zIG5vdCBiZWluZyBtYXJrZWQgYXMgYmVpbmcgZnJvbSBhIGJy b3dzZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL2lvcy9JbnRlcmFjdGlvbklu Zm9ybWF0aW9uQXRQb3NpdGlvbi5oIGIvU291cmNlL1dlYktpdC9TaGFyZWQvaW9zL0ludGVyYWN0 aW9uSW5mb3JtYXRpb25BdFBvc2l0aW9uLmgKaW5kZXggMDAyMmQxM2U1OTIzNmZmYzAyOTNlMDRm MzEwOWQzNGRiNWIzNDNhMC4uNjVkNjNmOTJhOTgzYmIzMzlkNTcwNGMyMjY4NmMxM2UxMjhkOWUx MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQvaW9zL0ludGVyYWN0aW9uSW5mb3Jt YXRpb25BdFBvc2l0aW9uLmgKKysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvaW9zL0ludGVyYWN0 aW9uSW5mb3JtYXRpb25BdFBvc2l0aW9uLmgKQEAgLTczLDcgKzczLDcgQEAgc3RydWN0IEludGVy YWN0aW9uSW5mb3JtYXRpb25BdFBvc2l0aW9uIHsKICNlbmRpZgogICAgIGJvb2wgc2hvdWxkTm90 VXNlSUJlYW1JbkVkaXRhYmxlQ29udGVudCB7IGZhbHNlIH07CiAgICAgYm9vbCBpc0ltYWdlT3Zl cmxheVRleHQgeyBmYWxzZSB9OwotICAgIGJvb2wgaXNIb3Jpem9udGFsV3JpdGluZ01vZGUgeyBm YWxzZSB9OworICAgIGJvb2wgaXNWZXJ0aWNhbFdyaXRpbmdNb2RlIHsgZmFsc2UgfTsKICAgICBX ZWJDb3JlOjpGbG9hdFBvaW50IGFkanVzdGVkUG9pbnRGb3JOb2RlUmVzcG9uZGluZ1RvQ2xpY2tF dmVudHM7CiAgICAgVVJMIHVybDsKICAgICBVUkwgaW1hZ2VVUkw7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L1NoYXJlZC9pb3MvSW50ZXJhY3Rpb25JbmZvcm1hdGlvbkF0UG9zaXRpb24ubW0g Yi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9pb3MvSW50ZXJhY3Rpb25JbmZvcm1hdGlvbkF0UG9zaXRp b24ubW0KaW5kZXggOTI2MTkzZmI3MzlkNjdmMzQwYWMwNmY4ZGE2ZjhiNDI4MGMxMTk2ZC4uNGIw YjhiNTI0YzM3YWM4NDgzMDM3YjRjYWZhMDc2OGVlZTg1ODA3YSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9TaGFyZWQvaW9zL0ludGVyYWN0aW9uSW5mb3JtYXRpb25BdFBvc2l0aW9uLm1tCisr KyBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL2lvcy9JbnRlcmFjdGlvbkluZm9ybWF0aW9uQXRQb3Np dGlvbi5tbQpAQCAtODMsNyArODMsNyBAQCB2b2lkIEludGVyYWN0aW9uSW5mb3JtYXRpb25BdFBv c2l0aW9uOjplbmNvZGUoSVBDOjpFbmNvZGVyJiBlbmNvZGVyKSBjb25zdAogI2VuZGlmCiAgICAg ZW5jb2RlciA8PCBzaG91bGROb3RVc2VJQmVhbUluRWRpdGFibGVDb250ZW50OwogICAgIGVuY29k ZXIgPDwgaXNJbWFnZU92ZXJsYXlUZXh0OwotICAgIGVuY29kZXIgPDwgaXNIb3Jpem9udGFsV3Jp dGluZ01vZGU7CisgICAgZW5jb2RlciA8PCBpc1ZlcnRpY2FsV3JpdGluZ01vZGU7CiAgICAgZW5j b2RlciA8PCBlbGVtZW50Q29udGV4dDsKICAgICBlbmNvZGVyIDw8IGltYWdlRWxlbWVudENvbnRl eHQ7CiB9CkBAIC0yMTQsNyArMjE0LDcgQEAgYm9vbCBJbnRlcmFjdGlvbkluZm9ybWF0aW9uQXRQ b3NpdGlvbjo6ZGVjb2RlKElQQzo6RGVjb2RlciYgZGVjb2RlciwgSW50ZXJhY3Rpb24KICAgICBp ZiAoIWRlY29kZXIuZGVjb2RlKHJlc3VsdC5pc0ltYWdlT3ZlcmxheVRleHQpKQogICAgICAgICBy ZXR1cm4gZmFsc2U7CiAKLSAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHJlc3VsdC5pc0hvcml6b250 YWxXcml0aW5nTW9kZSkpCisgICAgaWYgKCFkZWNvZGVyLmRlY29kZShyZXN1bHQuaXNWZXJ0aWNh bFdyaXRpbmdNb2RlKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgaWYgKCFkZWNvZGVy LmRlY29kZShyZXN1bHQuZWxlbWVudENvbnRleHQpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbSBiL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0KaW5kZXggZjY0OWJm MDBjYWJiOGQzNDMyYWNmYTBjNGUxOTFmOGZmNTcyM2NkMC4uZGI3ZTNmM2Q1Y2IzYjc1ZjE5ZGQ0 MWZkNzc0ZmRmYjM0NDI3NjYwYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv aW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tCkBAIC05NjgxLDggKzk2ODEsOCBA QCBzdGF0aWMgQk9PTCBhcHBsaWNhdGlvbklzS25vd25Ub0lnbm9yZU1vdXNlRXZlbnRzKGNvbnN0 IGNoYXIqICZ3YXJuaW5nVmVyc2lvbikKIAogICAgIFVJUG9pbnRlclN0eWxlICooXmlCZWFtQ3Vy c29yKSh2b2lkKSA9IF57CiAgICAgICAgIGZsb2F0IGJlYW1MZW5ndGggPSBfcG9zaXRpb25JbmZv cm1hdGlvbi5jYXJldExlbmd0aCAqIHNjYWxlRmFjdG9yOwotICAgICAgICBhdXRvIGF4aXNPcmll bnRhdGlvbiA9IF9wb3NpdGlvbkluZm9ybWF0aW9uLmlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlID8g VUlBeGlzVmVydGljYWwgOiBVSUF4aXNIb3Jpem9udGFsOwotICAgICAgICBVSUF4aXMgaUJlYW1D b25zdHJhaW50QXhlcyA9IF9wb3NpdGlvbkluZm9ybWF0aW9uLmlzSG9yaXpvbnRhbFdyaXRpbmdN b2RlID8gVUlBeGlzVmVydGljYWwgOiBVSUF4aXNIb3Jpem9udGFsOworICAgICAgICBhdXRvIGF4 aXNPcmllbnRhdGlvbiA9IF9wb3NpdGlvbkluZm9ybWF0aW9uLmlzVmVydGljYWxXcml0aW5nTW9k ZSA/IFVJQXhpc0hvcml6b250YWwgOiBVSUF4aXNWZXJ0aWNhbDsKKyAgICAgICAgVUlBeGlzIGlC ZWFtQ29uc3RyYWludEF4ZXMgPSBfcG9zaXRpb25JbmZvcm1hdGlvbi5pc1ZlcnRpY2FsV3JpdGlu Z01vZGUgPyBVSUF4aXNIb3Jpem9udGFsIDogVUlBeGlzVmVydGljYWw7CiAKICAgICAgICAgLy8g SWYgdGhlIEktYmVhbSBpcyBzbyBsYXJnZSB0aGF0IHRoZSBtYWduZXRpc20gaXMgaGFyZCB0byBm aWdodCwgd2Ugc2hvdWxkIG5vdCBhcHBseSBhbnkgbWFnbmV0aXNtLgogICAgICAgICBpZiAoYmVh bUxlbmd0aCA+IFtVSVRleHRJbnRlcmFjdGlvbiBfbWF4aW11bUJlYW1TbmFwcGluZ0xlbmd0aF0p CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFn ZUlPUy5tbSBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdlSU9T Lm1tCmluZGV4IDJmNGQ4MWMxZjFmYjhmZjA1MDhhNDI4MmEyNmUwOGYwMWU3MTQzNzkuLmM4ZDY0 NWM2MDk5MGQ3MjZkZWU5N2U2ZjJkMzBiYjNjZmY0NWMyMGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdlSU9TLm1tCisrKyBiL1NvdXJjZS9X ZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdlSU9TLm1tCkBAIC0zMDM2LDkgKzMw MzYsOSBAQCBzdGF0aWMgdm9pZCBwb3B1bGF0ZUNhcmV0Q29udGV4dChjb25zdCBIaXRUZXN0UmVz dWx0JiBoaXRUZXN0UmVzdWx0LCBjb25zdCBJbnRlcgogICAgIGlmIChpc0VkaXRhYmxlKQogICAg ICAgICBsaW5lUmVjdC5zZXRXaWR0aChibG9ja0Zsb3cuY29udGVudFdpZHRoKCkpOwogCi0gICAg aW5mby5pc0hvcml6b250YWxXcml0aW5nTW9kZSA9IHJlbmRlcmVyLT5pc0hvcml6b250YWxXcml0 aW5nTW9kZSgpOworICAgIGluZm8uaXNWZXJ0aWNhbFdyaXRpbmdNb2RlID0gIXJlbmRlcmVyLT5p c0hvcml6b250YWxXcml0aW5nTW9kZSgpOwogICAgIGluZm8ubGluZUNhcmV0RXh0ZW50ID0gdmll dy0+Y29udGVudHNUb1Jvb3RWaWV3KGxpbmVSZWN0KTsKLSAgICBpbmZvLmNhcmV0TGVuZ3RoID0g aW5mby5pc0hvcml6b250YWxXcml0aW5nTW9kZSA/IGluZm8ubGluZUNhcmV0RXh0ZW50LmhlaWdo dCgpIDogaW5mby5saW5lQ2FyZXRFeHRlbnQud2lkdGgoKTsKKyAgICBpbmZvLmNhcmV0TGVuZ3Ro ID0gaW5mby5pc1ZlcnRpY2FsV3JpdGluZ01vZGUgPyBpbmZvLmxpbmVDYXJldEV4dGVudC53aWR0 aCgpIDogaW5mby5saW5lQ2FyZXRFeHRlbnQuaGVpZ2h0KCk7CiAKICAgICBib29sIGxpbmVDb250 YWluc1JlcXVlc3RQb2ludCA9IGluZm8ubGluZUNhcmV0RXh0ZW50LmNvbnRhaW5zKHJlcXVlc3Qu cG9pbnQpOwogICAgIC8vIEZvcmNlIGFuIEktYmVhbSBjdXJzb3IgaWYgdGhlIHBhZ2UgZGlkbid0 IHJlcXVlc3QgYSBoYW5kLCBhbmQgd2UncmUgaW5zaWRlIHRoZSBib3VuZHMgb2YgdGhlIGxpbmUu CkBAIC0zMDUxLDcgKzMwNTEsNyBAQCBzdGF0aWMgdm9pZCBwb3B1bGF0ZUNhcmV0Q29udGV4dChj b25zdCBIaXRUZXN0UmVzdWx0JiBoaXRUZXN0UmVzdWx0LCBjb25zdCBJbnRlcgogICAgICAgICBp bmZvLmxpbmVDYXJldEV4dGVudCA9IHZpZXctPmNvbnRlbnRzVG9Sb290VmlldyhhcHByb3hpbWF0 ZUxpbmVSZWN0SW5Db250ZW50Q29vcmRpbmF0ZXMpOwogICAgICAgICBpZiAoIWluZm8ubGluZUNh cmV0RXh0ZW50LmNvbnRhaW5zKHJlcXVlc3QucG9pbnQpIHx8ICFpc0VkaXRhYmxlKQogICAgICAg ICAgICAgaW5mby5saW5lQ2FyZXRFeHRlbnQuc2V0WShyZXF1ZXN0LnBvaW50LnkoKSAtIGluZm8u bGluZUNhcmV0RXh0ZW50LmhlaWdodCgpIC8gMik7Ci0gICAgICAgIGluZm8uY2FyZXRMZW5ndGgg PSBpbmZvLmlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlID8gaW5mby5saW5lQ2FyZXRFeHRlbnQuaGVp Z2h0KCkgOiBpbmZvLmxpbmVDYXJldEV4dGVudC53aWR0aCgpOworICAgICAgICBpbmZvLmNhcmV0 TGVuZ3RoID0gaW5mby5pc1ZlcnRpY2FsV3JpdGluZ01vZGUgPyBpbmZvLmxpbmVDYXJldEV4dGVu dC53aWR0aCgpIDogaW5mby5saW5lQ2FyZXRFeHRlbnQuaGVpZ2h0KCk7CiAgICAgfQogCiAgICAg YXV0byBub2RlU2hvdWxkTm90VXNlSUJlYW0gPSBeKE5vZGUqIG5vZGUpIHsK