239508 2022-04-19 10:38:46 -0700 [iOS] Dictation text that contains emojis is inserted twice upon finalization 2022-04-19 17:26:30 -0700 1 1 1 Unclassified WebKit HTML Editing WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 239467 1 wenson_hsieh wenson_hsieh akeerthi cdumez hi katherine_cheney megan_gardner thorton webkit-bug-importer wenson_hsieh oldest_to_newest 1862628 0 wenson_hsieh 2022-04-19 10:38:46 -0700 rdar://91895524 1862668 1 457924 wenson_hsieh 2022-04-19 12:06:33 -0700 Created attachment 457924 Patch 1862724 2 457924 cdumez 2022-04-19 14:28:32 -0700 Comment on attachment 457924 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=457924&action=review > Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm:2406 > + for (size_t i = 0; i < numGraphemeClusters(oldText); ++i) Shouldn't we cache numGraphemeClusters(oldText) before the loop? Or is oldText changing as we iterate? 1862725 3 wenson_hsieh 2022-04-19 14:29:21 -0700 (In reply to Chris Dumez from comment #2) > Comment on attachment 457924 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=457924&action=review > > > Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm:2406 > > + for (size_t i = 0; i < numGraphemeClusters(oldText); ++i) > > Shouldn't we cache numGraphemeClusters(oldText) before the loop? Or is > oldText changing as we iterate? Good catch! `oldText` isn't changing, so we should pull this out into a local variable. I'll fix this before landing. 1862736 4 457938 wenson_hsieh 2022-04-19 15:02:30 -0700 Created attachment 457938 Address comment 1862771 5 ews-feeder 2022-04-19 17:26:26 -0700 Committed r293051 (249786@main): <https://commits.webkit.org/249786@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 457938. 457924 2022-04-19 12:06:33 -0700 2022-04-19 14:26:41 -0700 Patch bug-239508-20220419120633.patch text/plain 7205 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjkzMDMwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGExMzY4MGJmOTdkZWRmYmFk NTllMjE5ZGU2YTYxMGFjYWM2MjkzOWIuLmE4YTYzZThlMjZiNzllMmI3MTZlYmQ3ZTI4MDhjZTYy N2I4Nzk3N2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzggQEAKKzIwMjItMDQtMTkgIFdlbnNvbiBI c2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CisKKyAgICAgICAgW2lPU10gRGljdGF0aW9u IHRleHQgdGhhdCBjb250YWlucyBlbW9qaXMgaXMgaW5zZXJ0ZWQgdHdpY2UgdXBvbiBmaW5hbGl6 YXRpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIz OTUwOAorICAgICAgICByZGFyOi8vOTE4OTU1MjQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBgV2ViUGFnZTo6cmVwbGFjZURpY3RhdGVkVGV4dGAgY29u dGFpbnMgbG9naWMgdG8gb25seSBwcm9jZWVkIHdpdGggdGV4dCByZXBsYWNlbWVudCBpbiB0aGUg Y2FzZSB3aGVyZSB0aGUKKyAgICAgICAgZGljdGF0ZWQgdGV4dCBzdGlsbCBtYXRjaGVzIHRoZSB0 ZXh0IGJlZm9yZSB0aGUgY3VycmVudCBzZWxlY3Rpb24uIFRvIGVuc3VyZSB0aGlzLCBpdCBtYXJj aGVzIGJhY2t3YXJkcyB0aHJvdWdoCisgICAgICAgIHZpc2libGUgcG9zaXRpb25zIGZyb20gdGhl IHN0YXJ0IG9mIHRoZSBzZWxlY3Rpb24sIGZvciBhIHRvdGFsIG51bWJlciBvZiB0aW1lcyBlcXVh bCB0byB0aGUgbGVuZ3RoIG9mIHRoZQorICAgICAgICBleHBlY3RlZCBzdHJpbmcgKGBvbGRUZXh0 YCkuIElmIHRoZSB0ZXh0IHdpdGhpbiB0aGlzIGZvdW5kIHJhbmdlIChpLmUuIGZyb20gdGhlIHBv c2l0aW9uIGJlZm9yZSB0aGUgc3RhcnQgb2YgdGhlCisgICAgICAgIHNlbGVjdGlvbiwgdG8gdGhl IHN0YXJ0IG9mIHRoZSBzZWxlY3Rpb24pIG5vIGxvbmdlciBtYXRjaGVzIHRoZSBgb2xkVGV4dGAg cHJvdmlkZWQgYnkgdGhlIGNsaWVudCwgd2UgcmV0dXJuCisgICAgICAgIGVhcmx5IGFuZCBkbyBu b3RoaW5nLgorCisgICAgICAgIEhvd2V2ZXIsIHRoaXMgbG9naWMgZmFpbHMgaW4gdGhlIGNhc2Ug d2hlcmUgYG9sZFRleHRgIGNvbnRhaW5zIGVtb2ppcyAob3IgbW9yZSBnZW5lcmFsbHksIG11bHRp cGxlIGNvZGVwb2ludHMKKyAgICAgICAgdGhhdCBjb21iaW5lIHRvIGZvcm0gYSBzaW5nbGUgZ3Jh cGhlbWUgY2x1c3RlciksIHNpbmNlIHRoZSBsZW5ndGggb2YgdGhlIHN0cmluZyBpcyBtb3JlIHRo YW4gdGhlIG51bWJlciBvZgorICAgICAgICB2aXNpYmxlIHBvc2l0aW9uIGl0ZXJhdGlvbnMgbmVl ZGVkIHRvIGZpbmQgdGhlIGNvcnJlY3Qgc3RhcnRpbmcgcG9zaXRpb24gZm9yIHRoZSByYW5nZS4g QXMgYSByZXN1bHQsIHdlIGVuZCB1cAorICAgICAgICBub3QgcmVwbGFjaW5nIGFueSBjaGFyYWN0 ZXJzLCBhbmQgd2hlbiBVSUtpdCBkaWN0YXRpb24gY29kZSBsYXRlciBjYWxscyBgLWluc2VydFRl eHQ6YCB3aXRoIHRoZSBmaW5hbCBkaWN0YXRpb24KKyAgICAgICAgc3RyaW5nLCB3ZSBlbmQgdXAg ZHVwbGljYXRpbmcgdGhlIGZpbmFsaXplZCBkaWN0YXRpb24gdGV4dC4KKworICAgICAgICBUbyBh ZGRyZXNzIHRoaXMgaXNzdWUsIHNpbXBseSBhZHZhbmNlIGJhY2t3YXJkcyBieSBncmFwaGVtZSBj b3VudCBpbnN0ZWFkIG9mIHRoZSByYXcgc3RyaW5nIGxlbmd0aCB0byBrZWVwIHRoZQorICAgICAg ICBzdGFydGluZyB2aXNpYmxlIHBvc2l0aW9uIGNvbnNpc3RlbnQgd2l0aCB0aGUgc3RhcnQgb2Yg dGhlIHJhbmdlIHRoYXQgd2UncmUgdHJ5aW5nIHRvIHJlcGxhY2UuCisKKyAgICAgICAgVGVzdDog VUlXS0ludGVyYWN0aW9uVmlld1Byb3RvY29sLkluc2VydERpY3RhdGVkVGV4dENvbnRhaW5pbmdF bW9qaXMKKworICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbToK KyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6cmVwbGFjZURpY3RhdGVkVGV4dCk6CisgICAgICAg IChXZWJLaXQ6OldlYlBhZ2U6OmFwcGx5QXV0b2NvcnJlY3Rpb25JbnRlcm5hbCk6CisKKyAgICAg ICAgQWxzbyBhZGQgYSBGSVhNRSBoZXJlIGFyb3VuZCBzaW1pbGFyIGNvZGUgdGhhdCBtaWdodCBh bHNvIGJlIHN1c2NlcHRpYmxlIHRvIHRoZSBzYW1lIGJ1Zy4gSG93ZXZlciwgaW4gdGhpcyBjYXNl LAorICAgICAgICB3ZSBhdm9pZCB0aGUgcHJvYmxlbSBiZWNhdXNlIG9mIHN1YnNlcXVlbnQgbG9n aWMgdGhhdCBhZGp1c3RzIHRoZSBzdGFydGluZyBwb3NpdGlvbiB0byB0cnkgYW5kIG1hdGNoIHRo ZQorICAgICAgICBleHBlY3RlZCBzdHJpbmcuIFdlIG1heSBiZSBhYmxlIHRvIHJlbW92ZSBvciBm dXJ0aGVyIGxpbWl0IHRoaXMgZXh0cmEgYWRqdXN0bWVudCBieSB1c2luZyBncmFwaGVtZSBjbHVz dGVyIGNvdW50CisgICAgICAgIGhlcmUgaW5zdGVhZCBvZiBzdHJpbmcgbGVuZ3RoIHdoZW4gZmlu ZGluZyB0aGUgaW5pdGlhbCBzdGFydGluZyBwb3NpdGlvbi4KKwogMjAyMi0wNC0xOSAgV2Vuc29u IEhzaWVoICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNvbT4KIAogICAgICAgICBbaU9TXSBUZXh0IHNl bGVjdGlvbiBmbGlja2VycyB3aGVuIGluc2VydGluZyB0ZXh0IHVzaW5nIGRpY3RhdGlvbgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1Mu bW0gYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbQpp bmRleCBlYTc4NDkyMGI0ZjQ5ZDk4ZGJhYWMyNTExNDUxMTlhZTZjMmIzZDZmLi5kZGU4M2ZkMGE5 YjI4YzM5MjI4OTNhNDZlM2UyYTg3Zjg5YTExYTRiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0 L1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbQpAQCAtMTQ4LDIwICsxNDgsMjEg QEAKICNpbXBvcnQgPFdlYkNvcmUvVXNlckdlc3R1cmVJbmRpY2F0b3IuaD4KICNpbXBvcnQgPFdl YkNvcmUvVmlzaWJsZVVuaXRzLmg+CiAjaW1wb3J0IDxXZWJDb3JlL1dlYkV2ZW50Lmg+Ci0jaW1w b3J0IDxwYWwvY29jb2EvUmV2ZWFsU29mdExpbmsuaD4KICNpbXBvcnQgPHd0Zi9NYXRoRXh0cmFz Lmg+CiAjaW1wb3J0IDx3dGYvTWVtb3J5UHJlc3N1cmVIYW5kbGVyLmg+CiAjaW1wb3J0IDx3dGYv U2NvcGUuaD4KICNpbXBvcnQgPHd0Zi9TZXRGb3JTY29wZS5oPgotI2ltcG9ydCA8d3RmL1NvZnRM aW5raW5nLmg+CiAjaW1wb3J0IDx3dGYvY29jb2EvRW50aXRsZW1lbnRzLmg+CiAjaW1wb3J0IDx3 dGYvdGV4dC9TdHJpbmdUb0ludGVnZXJDb252ZXJzaW9uLmg+CisjaW1wb3J0IDx3dGYvdGV4dC9U ZXh0QnJlYWtJdGVyYXRvci5oPgogI2ltcG9ydCA8d3RmL3RleHQvVGV4dFN0cmVhbS5oPgogCiAj aWYgRU5BQkxFKEFUVEFDSE1FTlRfRUxFTUVOVCkKICNpbXBvcnQgPFdlYkNvcmUvUHJvbWlzZWRB dHRhY2htZW50SW5mby5oPgogI2VuZGlmCiAKKyNpbXBvcnQgPHBhbC9jb2NvYS9SZXZlYWxTb2Z0 TGluay5oPgorCiAjZGVmaW5lIFdFQlBBR0VfUkVMRUFTRV9MT0coY2hhbm5lbCwgZm10LCAuLi4p IFJFTEVBU0VfTE9HKGNoYW5uZWwsICIlcCAtIFdlYlBhZ2U6OiIgZm10LCB0aGlzLCAjI19fVkFf QVJHU19fKQogI2RlZmluZSBXRUJQQUdFX1JFTEVBU0VfTE9HX0VSUk9SKGNoYW5uZWwsIGZtdCwg Li4uKSBSRUxFQVNFX0xPR19FUlJPUihjaGFubmVsLCAiJXAgLSBXZWJQYWdlOjoiIGZtdCwgdGhp cywgIyNfX1ZBX0FSR1NfXykKIApAQCAtMjQwMiw3ICsyNDAzLDcgQEAgdm9pZCBXZWJQYWdlOjpy ZXBsYWNlRGljdGF0ZWRUZXh0KGNvbnN0IFN0cmluZyYgb2xkVGV4dCwgY29uc3QgU3RyaW5nJiBu ZXdUZXh0KQogICAgICAgICByZXR1cm47CiAgICAgfQogICAgIFZpc2libGVQb3NpdGlvbiBwb3Np dGlvbiA9IGZyYW1lLT5zZWxlY3Rpb24oKS5zZWxlY3Rpb24oKS5zdGFydCgpOwotICAgIGZvciAo c2l6ZV90IGkgPSAwOyBpIDwgb2xkVGV4dC5sZW5ndGgoKTsgKytpKQorICAgIGZvciAoc2l6ZV90 IGkgPSAwOyBpIDwgbnVtR3JhcGhlbWVDbHVzdGVycyhvbGRUZXh0KTsgKytpKQogICAgICAgICBw b3NpdGlvbiA9IHBvc2l0aW9uLnByZXZpb3VzKCk7CiAgICAgaWYgKHBvc2l0aW9uLmlzTnVsbCgp KQogICAgICAgICBwb3NpdGlvbiA9IHN0YXJ0T2ZEb2N1bWVudChmcmFtZS0+ZG9jdW1lbnQoKSk7 CkBAIC0yNTE5LDYgKzI1MjAsOSBAQCBib29sIFdlYlBhZ2U6OmFwcGx5QXV0b2NvcnJlY3Rpb25J bnRlcm5hbChjb25zdCBTdHJpbmcmIGNvcnJlY3Rpb24sIGNvbnN0IFN0cmluZwogICAgICAgICAv LyBmb3J3YXJkIHN1Y2ggdGhhdCBpdCBtYXRjaGVzIHRoZSBvcmlnaW5hbCBzZWxlY3Rpb24gYXMg bXVjaCBhcyBwb3NzaWJsZS4KICAgICAgICAgaWYgKGZvbGRRdW90ZU1hcmtzKHRleHRGb3JSYW5n ZSkgIT0gb3JpZ2luYWxUZXh0V2l0aEZvbGRlZFF1b3RlTWFya3MpIHsKICAgICAgICAgICAgIC8v IFNlYXJjaCBmb3IgdGhlIG9yaWdpbmFsIHRleHQgYmVmb3JlIHRoZSBzZWxlY3Rpb24gY2FyZXQu CisgICAgICAgICAgICAvLyBGSVhNRTogRG9lcyB0aGlzIGRvIHRoZSByaWdodCB0aGluZyBpbiB0 aGUgY2FzZSB3aGVyZSBgb3JpZ2luYWxUZXh0YCBjb250YWlucyBvbmUgb3IgbW9yZSBncmFwaGVt ZSBjbHVzdGVycworICAgICAgICAgICAgLy8gdGhhdCBlbmNvbXBhc3MgbXVsdGlwbGUgY29kZXBv aW50cz8gQWR2YW5jaW5nIGJhY2t3YXJkcyBieSBncmFwaGVtZSBjbHVzdGVyIGNvdW50IGhlcmUg bWF5IGFsc28gYWxsb3cgdXMgdG8KKyAgICAgICAgICAgIC8vIHNpZGVzdGVwIHRoZSBwb3NpdGlv biBhZGp1c3RtZW50IGxvZ2ljIGJlbG93IGluIHNvbWUgY2FzZXMuCiAgICAgICAgICAgICBmb3Ig KHNpemVfdCBpID0gMDsgaSA8IG9yaWdpbmFsVGV4dC5sZW5ndGgoKTsgKytpKQogICAgICAgICAg ICAgICAgIHBvc2l0aW9uID0gcG9zaXRpb24ucHJldmlvdXMoKTsKICAgICAgICAgICAgIGlmIChw b3NpdGlvbi5pc051bGwoKSkKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0No YW5nZUxvZwppbmRleCA3MWZmNDA2MTg4ZTNmMGNiOTMxNWI3OGY4NmNmOWRlNDgyZWRmZDU0Li44 YmIxZjhiZGUzYWQ4M2NhNzlkYzdlZjZiZGQ1YjVmY2Y4NDRkY2MwIDEwMDY0NAotLS0gYS9Ub29s cy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMjIt MDQtMTkgIFdlbnNvbiBIc2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CisKKyAgICAgICAg W2lPU10gRGljdGF0aW9uIHRleHQgdGhhdCBjb250YWlucyBlbW9qaXMgaXMgaW5zZXJ0ZWQgdHdp Y2UgdXBvbiBmaW5hbGl6YXRpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIzOTUwOAorICAgICAgICByZGFyOi8vOTE4OTU1MjQKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgYW4gQVBJIHRlc3QgdG8g ZXhlcmNpc2UgdGhlIGNoYW5nZS4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvaW9z L1VJV0tJbnRlcmFjdGlvblZpZXdQcm90b2NvbC5tbToKKyAgICAgICAgKFRlc3RXZWJLaXRBUEk6 OlRFU1QpOgorCiAyMDIyLTA0LTE5ICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUu Y29tPgogCiAgICAgICAgIFtpT1NdIFRleHQgc2VsZWN0aW9uIGZsaWNrZXJzIHdoZW4gaW5zZXJ0 aW5nIHRleHQgdXNpbmcgZGljdGF0aW9uCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJ L1Rlc3RzL2lvcy9VSVdLSW50ZXJhY3Rpb25WaWV3UHJvdG9jb2wubW0gYi9Ub29scy9UZXN0V2Vi S2l0QVBJL1Rlc3RzL2lvcy9VSVdLSW50ZXJhY3Rpb25WaWV3UHJvdG9jb2wubW0KaW5kZXggMGNh Zjk1Zjk2OWEyZjlmMTFjMDQxZDM3NTY1MDczYmVjMjlhZjA4Ny4uMDYxNDUwMzIyMGMzM2JiYzVi Y2I0NTI1ODlhNjRmYjIwN2I5MDZkNCAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9U ZXN0cy9pb3MvVUlXS0ludGVyYWN0aW9uVmlld1Byb3RvY29sLm1tCisrKyBiL1Rvb2xzL1Rlc3RX ZWJLaXRBUEkvVGVzdHMvaW9zL1VJV0tJbnRlcmFjdGlvblZpZXdQcm90b2NvbC5tbQpAQCAtMjM4 LDYgKzIzOCwxOSBAQCBURVNUKFVJV0tJbnRlcmFjdGlvblZpZXdQcm90b2NvbCwgVGV4dEludGVy YWN0aW9uQ2FuQmVnaW5JbkV4aXN0aW5nU2VsZWN0aW9uKQogICAgIEVYUEVDVF9UUlVFKGFsbG93 c1RleHRJbnRlcmFjdGlvbkluc2lkZVNlbGVjdGlvbik7CiB9CiAKK1RFU1QoVUlXS0ludGVyYWN0 aW9uVmlld1Byb3RvY29sLCBSZXBsYWNlRGljdGF0ZWRUZXh0Q29udGFpbmluZ0Vtb2ppcykKK3sK KyAgICBhdXRvIFt3ZWJWaWV3LCBpbnB1dERlbGVnYXRlXSA9IHNldFVwRWRpdGFibGVXZWJWaWV3 QW5kV2FpdEZvcklucHV0U2Vzc2lvbigpOworICAgIGF1dG8gY29udGVudFZpZXcgPSBbd2ViVmll dyB0ZXh0SW5wdXRDb250ZW50Vmlld107CisgICAgW2NvbnRlbnRWaWV3IHNlbGVjdEFsbDpuaWxd OworICAgIFtjb250ZW50VmlldyBpbnNlcnRUZXh0OkAiSGVsbG8gd29ybGQuIFRoaXMg8J+RifCf j7sgaXMgYSBnb29kIGJveSJdOworICAgIFt3ZWJWaWV3IHdhaXRGb3JOZXh0UHJlc2VudGF0aW9u VXBkYXRlXTsKKworICAgIFtjb250ZW50VmlldyByZXBsYWNlRGljdGF0ZWRUZXh0OkAiVGhpcyDw n5GJ8J+PuyBpcyBhIGdvb2QgYm95IiB3aXRoVGV4dDpAIlRoaXMg8J+RifCfj7sgaXMgYSDwn6au Il07CisgICAgW3dlYlZpZXcgd2FpdEZvck5leHRQcmVzZW50YXRpb25VcGRhdGVdOworICAgIEVY UEVDVF9XS19TVFJFUShAIkhlbGxvIHdvcmxkLiBUaGlzIPCfkYnwn4+7IGlzIGEg8J+mriIsIFt3 ZWJWaWV3IGNvbnRlbnRzQXNTdHJpbmddKTsKK30KKwogVEVTVChVSVdLSW50ZXJhY3Rpb25WaWV3 UHJvdG9jb2wsIFN1cHByZXNzU2VsZWN0aW9uQ2hhbmdlc0R1cmluZ0RpY3RhdGlvbikKIHsKICAg ICBhdXRvIFt3ZWJWaWV3LCBpbnB1dERlbGVnYXRlXSA9IHNldFVwRWRpdGFibGVXZWJWaWV3QW5k V2FpdEZvcklucHV0U2Vzc2lvbigpOwo= 457938 2022-04-19 15:02:30 -0700 2022-04-19 17:26:28 -0700 Address comment bug-239508-20220419150229.patch text/plain 7200 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjkzMDMwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGExMzY4MGJmOTdkZWRmYmFk NTllMjE5ZGU2YTYxMGFjYWM2MjkzOWIuLjNmMDM3Y2E4NWIwYTliMDA3MDNhNGQ3OGZmYmMxMjRh ZWI2NmMzNTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzggQEAKKzIwMjItMDQtMTkgIFdlbnNvbiBI c2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CisKKyAgICAgICAgW2lPU10gRGljdGF0aW9u IHRleHQgdGhhdCBjb250YWlucyBlbW9qaXMgaXMgaW5zZXJ0ZWQgdHdpY2UgdXBvbiBmaW5hbGl6 YXRpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIz OTUwOAorICAgICAgICByZGFyOi8vOTE4OTU1MjQKKworICAgICAgICBSZXZpZXdlZCBieSBBZGl0 eWEgS2VlcnRoaS4KKworICAgICAgICBgV2ViUGFnZTo6cmVwbGFjZURpY3RhdGVkVGV4dGAgY29u dGFpbnMgbG9naWMgdG8gb25seSBwcm9jZWVkIHdpdGggdGV4dCByZXBsYWNlbWVudCBpbiB0aGUg Y2FzZSB3aGVyZSB0aGUKKyAgICAgICAgZGljdGF0ZWQgdGV4dCBzdGlsbCBtYXRjaGVzIHRoZSB0 ZXh0IGJlZm9yZSB0aGUgY3VycmVudCBzZWxlY3Rpb24uIFRvIGVuc3VyZSB0aGlzLCBpdCBtYXJj aGVzIGJhY2t3YXJkcyB0aHJvdWdoCisgICAgICAgIHZpc2libGUgcG9zaXRpb25zIGZyb20gdGhl IHN0YXJ0IG9mIHRoZSBzZWxlY3Rpb24sIGZvciBhIHRvdGFsIG51bWJlciBvZiB0aW1lcyBlcXVh bCB0byB0aGUgbGVuZ3RoIG9mIHRoZQorICAgICAgICBleHBlY3RlZCBzdHJpbmcgKGBvbGRUZXh0 YCkuIElmIHRoZSB0ZXh0IHdpdGhpbiB0aGlzIGZvdW5kIHJhbmdlIChpLmUuIGZyb20gdGhlIHBv c2l0aW9uIGJlZm9yZSB0aGUgc3RhcnQgb2YgdGhlCisgICAgICAgIHNlbGVjdGlvbiwgdG8gdGhl IHN0YXJ0IG9mIHRoZSBzZWxlY3Rpb24pIG5vIGxvbmdlciBtYXRjaGVzIHRoZSBgb2xkVGV4dGAg cHJvdmlkZWQgYnkgdGhlIGNsaWVudCwgd2UgcmV0dXJuCisgICAgICAgIGVhcmx5IGFuZCBkbyBu b3RoaW5nLgorCisgICAgICAgIEhvd2V2ZXIsIHRoaXMgbG9naWMgZmFpbHMgaW4gdGhlIGNhc2Ug d2hlcmUgYG9sZFRleHRgIGNvbnRhaW5zIGVtb2ppcyAob3IgbW9yZSBnZW5lcmFsbHksIG11bHRp cGxlIGNvZGVwb2ludHMKKyAgICAgICAgdGhhdCBjb21iaW5lIHRvIGZvcm0gYSBzaW5nbGUgZ3Jh cGhlbWUgY2x1c3RlciksIHNpbmNlIHRoZSBsZW5ndGggb2YgdGhlIHN0cmluZyBpcyBtb3JlIHRo YW4gdGhlIG51bWJlciBvZgorICAgICAgICB2aXNpYmxlIHBvc2l0aW9uIGl0ZXJhdGlvbnMgbmVl ZGVkIHRvIGZpbmQgdGhlIGNvcnJlY3Qgc3RhcnRpbmcgcG9zaXRpb24gZm9yIHRoZSByYW5nZS4g QXMgYSByZXN1bHQsIHdlIGVuZCB1cAorICAgICAgICBub3QgcmVwbGFjaW5nIGFueSBjaGFyYWN0 ZXJzLCBhbmQgd2hlbiBVSUtpdCBkaWN0YXRpb24gY29kZSBsYXRlciBjYWxscyBgLWluc2VydFRl eHQ6YCB3aXRoIHRoZSBmaW5hbCBkaWN0YXRpb24KKyAgICAgICAgc3RyaW5nLCB3ZSBlbmQgdXAg ZHVwbGljYXRpbmcgdGhlIGZpbmFsaXplZCBkaWN0YXRpb24gdGV4dC4KKworICAgICAgICBUbyBh ZGRyZXNzIHRoaXMgaXNzdWUsIHNpbXBseSBhZHZhbmNlIGJhY2t3YXJkcyBieSBncmFwaGVtZSBj b3VudCBpbnN0ZWFkIG9mIHRoZSByYXcgc3RyaW5nIGxlbmd0aCB0byBrZWVwIHRoZQorICAgICAg ICBzdGFydGluZyB2aXNpYmxlIHBvc2l0aW9uIGNvbnNpc3RlbnQgd2l0aCB0aGUgc3RhcnQgb2Yg dGhlIHJhbmdlIHRoYXQgd2UncmUgdHJ5aW5nIHRvIHJlcGxhY2UuCisKKyAgICAgICAgVGVzdDog VUlXS0ludGVyYWN0aW9uVmlld1Byb3RvY29sLlJlcGxhY2VEaWN0YXRlZFRleHRDb250YWluaW5n RW1vamlzCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW06 CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OnJlcGxhY2VEaWN0YXRlZFRleHQpOgorICAgICAg ICAoV2ViS2l0OjpXZWJQYWdlOjphcHBseUF1dG9jb3JyZWN0aW9uSW50ZXJuYWwpOgorCisgICAg ICAgIEFsc28gYWRkIGEgRklYTUUgaGVyZSBhcm91bmQgc2ltaWxhciBjb2RlIHRoYXQgbWlnaHQg YWxzbyBiZSBzdXNjZXB0aWJsZSB0byB0aGUgc2FtZSBidWcuIEhvd2V2ZXIsIGluIHRoaXMgY2Fz ZSwKKyAgICAgICAgd2UgYXZvaWQgdGhlIHByb2JsZW0gYmVjYXVzZSBvZiBzdWJzZXF1ZW50IGxv Z2ljIHRoYXQgYWRqdXN0cyB0aGUgc3RhcnRpbmcgcG9zaXRpb24gdG8gdHJ5IGFuZCBtYXRjaCB0 aGUKKyAgICAgICAgZXhwZWN0ZWQgc3RyaW5nLiBXZSBtYXkgYmUgYWJsZSB0byByZW1vdmUgb3Ig ZnVydGhlciBsaW1pdCB0aGlzIGV4dHJhIGFkanVzdG1lbnQgYnkgdXNpbmcgZ3JhcGhlbWUgY2x1 c3RlciBjb3VudAorICAgICAgICBoZXJlIGluc3RlYWQgb2Ygc3RyaW5nIGxlbmd0aCB3aGVuIGZp bmRpbmcgdGhlIGluaXRpYWwgc3RhcnRpbmcgcG9zaXRpb24uCisKIDIwMjItMDQtMTkgIFdlbnNv biBIc2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CiAKICAgICAgICAgW2lPU10gVGV4dCBz ZWxlY3Rpb24gZmxpY2tlcnMgd2hlbiBpbnNlcnRpbmcgdGV4dCB1c2luZyBkaWN0YXRpb24KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdlSU9T Lm1tIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0K aW5kZXggZWE3ODQ5MjBiNGY0OWQ5OGRiYWFjMjUxMTQ1MTE5YWU2YzJiM2Q2Zi4uZWEwOGU0Mjc5 OGRhZmMwMWZjZmRkNWU5MjU5MjI5NDMzYmRkYzliNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0KKysrIGIvU291cmNlL1dlYktp dC9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0KQEAgLTE0OCwyMCArMTQ4LDIx IEBACiAjaW1wb3J0IDxXZWJDb3JlL1VzZXJHZXN0dXJlSW5kaWNhdG9yLmg+CiAjaW1wb3J0IDxX ZWJDb3JlL1Zpc2libGVVbml0cy5oPgogI2ltcG9ydCA8V2ViQ29yZS9XZWJFdmVudC5oPgotI2lt cG9ydCA8cGFsL2NvY29hL1JldmVhbFNvZnRMaW5rLmg+CiAjaW1wb3J0IDx3dGYvTWF0aEV4dHJh cy5oPgogI2ltcG9ydCA8d3RmL01lbW9yeVByZXNzdXJlSGFuZGxlci5oPgogI2ltcG9ydCA8d3Rm L1Njb3BlLmg+CiAjaW1wb3J0IDx3dGYvU2V0Rm9yU2NvcGUuaD4KLSNpbXBvcnQgPHd0Zi9Tb2Z0 TGlua2luZy5oPgogI2ltcG9ydCA8d3RmL2NvY29hL0VudGl0bGVtZW50cy5oPgogI2ltcG9ydCA8 d3RmL3RleHQvU3RyaW5nVG9JbnRlZ2VyQ29udmVyc2lvbi5oPgorI2ltcG9ydCA8d3RmL3RleHQv VGV4dEJyZWFrSXRlcmF0b3IuaD4KICNpbXBvcnQgPHd0Zi90ZXh0L1RleHRTdHJlYW0uaD4KIAog I2lmIEVOQUJMRShBVFRBQ0hNRU5UX0VMRU1FTlQpCiAjaW1wb3J0IDxXZWJDb3JlL1Byb21pc2Vk QXR0YWNobWVudEluZm8uaD4KICNlbmRpZgogCisjaW1wb3J0IDxwYWwvY29jb2EvUmV2ZWFsU29m dExpbmsuaD4KKwogI2RlZmluZSBXRUJQQUdFX1JFTEVBU0VfTE9HKGNoYW5uZWwsIGZtdCwgLi4u KSBSRUxFQVNFX0xPRyhjaGFubmVsLCAiJXAgLSBXZWJQYWdlOjoiIGZtdCwgdGhpcywgIyNfX1ZB X0FSR1NfXykKICNkZWZpbmUgV0VCUEFHRV9SRUxFQVNFX0xPR19FUlJPUihjaGFubmVsLCBmbXQs IC4uLikgUkVMRUFTRV9MT0dfRVJST1IoY2hhbm5lbCwgIiVwIC0gV2ViUGFnZTo6IiBmbXQsIHRo aXMsICMjX19WQV9BUkdTX18pCiAKQEAgLTI0MDIsNyArMjQwMyw3IEBAIHZvaWQgV2ViUGFnZTo6 cmVwbGFjZURpY3RhdGVkVGV4dChjb25zdCBTdHJpbmcmIG9sZFRleHQsIGNvbnN0IFN0cmluZyYg bmV3VGV4dCkKICAgICAgICAgcmV0dXJuOwogICAgIH0KICAgICBWaXNpYmxlUG9zaXRpb24gcG9z aXRpb24gPSBmcmFtZS0+c2VsZWN0aW9uKCkuc2VsZWN0aW9uKCkuc3RhcnQoKTsKLSAgICBmb3Ig KHNpemVfdCBpID0gMDsgaSA8IG9sZFRleHQubGVuZ3RoKCk7ICsraSkKKyAgICBmb3IgKGF1dG8g aSA9IG51bUdyYXBoZW1lQ2x1c3RlcnMob2xkVGV4dCk7IGk7IC0taSkKICAgICAgICAgcG9zaXRp b24gPSBwb3NpdGlvbi5wcmV2aW91cygpOwogICAgIGlmIChwb3NpdGlvbi5pc051bGwoKSkKICAg ICAgICAgcG9zaXRpb24gPSBzdGFydE9mRG9jdW1lbnQoZnJhbWUtPmRvY3VtZW50KCkpOwpAQCAt MjUxOSw2ICsyNTIwLDkgQEAgYm9vbCBXZWJQYWdlOjphcHBseUF1dG9jb3JyZWN0aW9uSW50ZXJu YWwoY29uc3QgU3RyaW5nJiBjb3JyZWN0aW9uLCBjb25zdCBTdHJpbmcKICAgICAgICAgLy8gZm9y d2FyZCBzdWNoIHRoYXQgaXQgbWF0Y2hlcyB0aGUgb3JpZ2luYWwgc2VsZWN0aW9uIGFzIG11Y2gg YXMgcG9zc2libGUuCiAgICAgICAgIGlmIChmb2xkUXVvdGVNYXJrcyh0ZXh0Rm9yUmFuZ2UpICE9 IG9yaWdpbmFsVGV4dFdpdGhGb2xkZWRRdW90ZU1hcmtzKSB7CiAgICAgICAgICAgICAvLyBTZWFy Y2ggZm9yIHRoZSBvcmlnaW5hbCB0ZXh0IGJlZm9yZSB0aGUgc2VsZWN0aW9uIGNhcmV0LgorICAg ICAgICAgICAgLy8gRklYTUU6IERvZXMgdGhpcyBkbyB0aGUgcmlnaHQgdGhpbmcgaW4gdGhlIGNh c2Ugd2hlcmUgYG9yaWdpbmFsVGV4dGAgY29udGFpbnMgb25lIG9yIG1vcmUgZ3JhcGhlbWUgY2x1 c3RlcnMKKyAgICAgICAgICAgIC8vIHRoYXQgZW5jb21wYXNzIG11bHRpcGxlIGNvZGVwb2ludHM/ IEFkdmFuY2luZyBiYWNrd2FyZHMgYnkgZ3JhcGhlbWUgY2x1c3RlciBjb3VudCBoZXJlIG1heSBh bHNvIGFsbG93IHVzIHRvCisgICAgICAgICAgICAvLyBzaWRlc3RlcCB0aGUgcG9zaXRpb24gYWRq dXN0bWVudCBsb2dpYyBiZWxvdyBpbiBzb21lIGNhc2VzLgogICAgICAgICAgICAgZm9yIChzaXpl X3QgaSA9IDA7IGkgPCBvcmlnaW5hbFRleHQubGVuZ3RoKCk7ICsraSkKICAgICAgICAgICAgICAg ICBwb3NpdGlvbiA9IHBvc2l0aW9uLnByZXZpb3VzKCk7CiAgICAgICAgICAgICBpZiAocG9zaXRp b24uaXNOdWxsKCkpCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VM b2cKaW5kZXggNzFmZjQwNjE4OGUzZjBjYjkzMTViNzhmODZjZjlkZTQ4MmVkZmQ1NC4uNGYxZGM0 M2ExNTQ3MzNkOWNhYzk0NDIyZTVmNzYwZTQ4MDA1MTczNSAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hh bmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIyLTA0LTE5 ICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAgIFtpT1Nd IERpY3RhdGlvbiB0ZXh0IHRoYXQgY29udGFpbnMgZW1vamlzIGlzIGluc2VydGVkIHR3aWNlIHVw b24gZmluYWxpemF0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMzk1MDgKKyAgICAgICAgcmRhcjovLzkxODk1NTI0CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgQWRpdHlhIEtlZXJ0aGkuCisKKyAgICAgICAgQWRkIGFuIEFQSSB0ZXN0IHRvIGV4ZXJj aXNlIHRoZSBjaGFuZ2UuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL2lvcy9VSVdL SW50ZXJhY3Rpb25WaWV3UHJvdG9jb2wubW06CisgICAgICAgIChUZXN0V2ViS2l0QVBJOjpURVNU KToKKwogMjAyMi0wNC0xOSAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNvbT4K IAogICAgICAgICBbaU9TXSBUZXh0IHNlbGVjdGlvbiBmbGlja2VycyB3aGVuIGluc2VydGluZyB0 ZXh0IHVzaW5nIGRpY3RhdGlvbgpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0 cy9pb3MvVUlXS0ludGVyYWN0aW9uVmlld1Byb3RvY29sLm1tIGIvVG9vbHMvVGVzdFdlYktpdEFQ SS9UZXN0cy9pb3MvVUlXS0ludGVyYWN0aW9uVmlld1Byb3RvY29sLm1tCmluZGV4IDBjYWY5NWY5 NjlhMmY5ZjExYzA0MWQzNzU2NTA3M2JlYzI5YWYwODcuLjA2MTQ1MDMyMjBjMzNiYmM1YmNiNDUy NTg5YTY0ZmIyMDdiOTA2ZDQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMv aW9zL1VJV0tJbnRlcmFjdGlvblZpZXdQcm90b2NvbC5tbQorKysgYi9Ub29scy9UZXN0V2ViS2l0 QVBJL1Rlc3RzL2lvcy9VSVdLSW50ZXJhY3Rpb25WaWV3UHJvdG9jb2wubW0KQEAgLTIzOCw2ICsy MzgsMTkgQEAgVEVTVChVSVdLSW50ZXJhY3Rpb25WaWV3UHJvdG9jb2wsIFRleHRJbnRlcmFjdGlv bkNhbkJlZ2luSW5FeGlzdGluZ1NlbGVjdGlvbikKICAgICBFWFBFQ1RfVFJVRShhbGxvd3NUZXh0 SW50ZXJhY3Rpb25JbnNpZGVTZWxlY3Rpb24pOwogfQogCitURVNUKFVJV0tJbnRlcmFjdGlvblZp ZXdQcm90b2NvbCwgUmVwbGFjZURpY3RhdGVkVGV4dENvbnRhaW5pbmdFbW9qaXMpCit7CisgICAg YXV0byBbd2ViVmlldywgaW5wdXREZWxlZ2F0ZV0gPSBzZXRVcEVkaXRhYmxlV2ViVmlld0FuZFdh aXRGb3JJbnB1dFNlc3Npb24oKTsKKyAgICBhdXRvIGNvbnRlbnRWaWV3ID0gW3dlYlZpZXcgdGV4 dElucHV0Q29udGVudFZpZXddOworICAgIFtjb250ZW50VmlldyBzZWxlY3RBbGw6bmlsXTsKKyAg ICBbY29udGVudFZpZXcgaW5zZXJ0VGV4dDpAIkhlbGxvIHdvcmxkLiBUaGlzIPCfkYnwn4+7IGlz IGEgZ29vZCBib3kiXTsKKyAgICBbd2ViVmlldyB3YWl0Rm9yTmV4dFByZXNlbnRhdGlvblVwZGF0 ZV07CisKKyAgICBbY29udGVudFZpZXcgcmVwbGFjZURpY3RhdGVkVGV4dDpAIlRoaXMg8J+RifCf j7sgaXMgYSBnb29kIGJveSIgd2l0aFRleHQ6QCJUaGlzIPCfkYnwn4+7IGlzIGEg8J+mriJdOwor ICAgIFt3ZWJWaWV3IHdhaXRGb3JOZXh0UHJlc2VudGF0aW9uVXBkYXRlXTsKKyAgICBFWFBFQ1Rf V0tfU1RSRVEoQCJIZWxsbyB3b3JsZC4gVGhpcyDwn5GJ8J+PuyBpcyBhIPCfpq4iLCBbd2ViVmll dyBjb250ZW50c0FzU3RyaW5nXSk7Cit9CisKIFRFU1QoVUlXS0ludGVyYWN0aW9uVmlld1Byb3Rv Y29sLCBTdXBwcmVzc1NlbGVjdGlvbkNoYW5nZXNEdXJpbmdEaWN0YXRpb24pCiB7CiAgICAgYXV0 byBbd2ViVmlldywgaW5wdXREZWxlZ2F0ZV0gPSBzZXRVcEVkaXRhYmxlV2ViVmlld0FuZFdhaXRG b3JJbnB1dFNlc3Npb24oKTsK