197014 2019-04-17 09:28:21 -0700 [iOS] Support multiple file selection in UIDocumentPickerViewController 2019-05-09 15:54:56 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 aestes aestes achristensen ap bdakin cdumez commit-queue ggaren thorton timothy webkit-bug-importer wenson_hsieh yevseytsev oldest_to_newest 1528110 0 aestes 2019-04-17 09:28:21 -0700 [iOS] Support multiple file selection in UIDocumentPickerViewController 1528112 1 aestes 2019-04-17 09:30:04 -0700 rdar://problem/49963514 1528119 2 367634 aestes 2019-04-17 09:34:20 -0700 Created attachment 367634 Patch 1528212 3 367634 thorton 2019-04-17 12:20:52 -0700 Comment on attachment 367634 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=367634&action=review > Source/WebCore/en.lproj/Localizable.strings:68 > +/* label next to file upload control; parameter is the number of files when greater than one */ > +"%lu files" = "%lu files"; Why is the string up two lines not good enough? :D Or replace that one with this one? I don't know what types you need. 1528243 4 367634 aestes 2019-04-17 13:04:34 -0700 Comment on attachment 367634 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=367634&action=review >> Source/WebCore/en.lproj/Localizable.strings:68 >> +"%lu files" = "%lu files"; > > Why is the string up two lines not good enough? :D Or replace that one with this one? I don't know what types you need. lol, will use the other one via the handy multipleFileUploadText() in LocalizedStrings.h :) Thanks for reviewing! 1528245 5 367669 aestes 2019-04-17 13:16:55 -0700 Created attachment 367669 Patch 1528295 6 367669 commit-queue 2019-04-17 15:41:14 -0700 Comment on attachment 367669 Patch Clearing flags on attachment: 367669 Committed r244404: <https://trac.webkit.org/changeset/244404> 1528296 7 commit-queue 2019-04-17 15:41:16 -0700 All reviewed patches have been landed. Closing bug. 1528477 8 ap 2019-04-18 09:39:48 -0700 > > Source/WebCore/en.lproj/Localizable.strings:68 > > +/* label next to file upload control; parameter is the number of files when greater than one */ > > +"%lu files" = "%lu files"; > > Why is the string up two lines not good enough? :D Or replace that one with > this one? I don't know what types you need. It actually isn't good at all! Pluralization doesn't work like "1 vs. any other number" in many languages, see <http://www.unicode.org/cldr/charts/latest/supplemental/language_plural_rules.html>. Foundation has proper support for this. I checked the Russian localization in shipping WebKit for macOS, and it actually uses the hack that translators apply when software lacks full localization support - it's translated to an equivalent of "Files: %d". 1528503 9 thorton 2019-04-18 10:48:19 -0700 (In reply to Alexey Proskuryakov from comment #8) > > > Source/WebCore/en.lproj/Localizable.strings:68 > > > +/* label next to file upload control; parameter is the number of files when greater than one */ > > > +"%lu files" = "%lu files"; > > > > Why is the string up two lines not good enough? :D Or replace that one with > > this one? I don't know what types you need. > > It actually isn't good at all! > > Pluralization doesn't work like "1 vs. any other number" in many languages, > see > <http://www.unicode.org/cldr/charts/latest/supplemental/ > language_plural_rules.html>. Foundation has proper support for this. > > I checked the Russian localization in shipping WebKit for macOS, and it > actually uses the hack that translators apply when software lacks full > localization support - it's translated to an equivalent of "Files: %d". I was going to comment about this, but I don't think WebKit has a stringsdict yet? And didn't want to force bringing that up on Andy :) 1528558 10 yevseytsev 2019-04-18 13:44:49 -0700 Created bug for it https://bugs.webkit.org/show_bug.cgi?id=197070 1534879 11 ap 2019-05-09 15:54:56 -0700 > I was going to comment about this, but I don't think WebKit has a > stringsdict yet? And didn't want to force bringing that up on Andy :) Actually it does, Source/WebCore/en.lproj/Localizable.stringsdict. Since all localization is done through WebCore, that's the one to use. 367634 2019-04-17 09:34:20 -0700 2019-04-17 13:16:54 -0700 Patch bug-197014-20190417093418.patch text/plain 5632 aestes U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ0Mzc5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDRlNGJkYjE3ZGEyMzgz OThkMmJiMjE2NzFjY2VhOGRmNGJmYzRhOC4uM2RjYjVjM2ZlMzVhNWQ1MDgzYjQ0MThmNzkyM2U0 YTQyOGJhYjQ2YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDE5LTA0LTE3ICBBbmR5 IEVzdGVzICA8YWVzdGVzQGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TXSBTdXBwb3J0IG11bHRp cGxlIGZpbGUgc2VsZWN0aW9uIGluIFVJRG9jdW1lbnRQaWNrZXJWaWV3Q29udHJvbGxlcgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk3MDE0CisgICAg ICAgIDxyZGFyOi8vcHJvYmxlbS80OTk2MzUxND4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIGVuLmxwcm9qL0xvY2FsaXphYmxlLnN0cmluZ3M6Cisg ICAgICAgIFJhbiB1cGRhdGUtd2Via2l0LWxvY2FsaXphYmxlLXN0cmluZ3MuCisKIDIwMTktMDQt MTcgIFJvYiBCdWlzICA8cmJ1aXNAaWdhbGlhLmNvbT4KIAogICAgICAgICBYTUxIdHRwUmVxdWVz dCBoYXMgdGhlIHdyb25nIGZhbGxiYWNrIGVuY29kaW5nCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDc1MGM3NGViNzhk Mzg5ZDM0ZWFmODYyMzQ3YTZlOGM0NjJlYzg1NzcuLjVmM2FkMjI1OTEzYmVmMDFmODFhZTg0MjI0 MjY4ZWRhYjYxNjU1ZmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTktMDQtMTcgIEFu ZHkgRXN0ZXMgIDxhZXN0ZXNAYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdIFN1cHBvcnQgbXVs dGlwbGUgZmlsZSBzZWxlY3Rpb24gaW4gVUlEb2N1bWVudFBpY2tlclZpZXdDb250cm9sbGVyCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTcwMTQKKyAg ICAgICAgPHJkYXI6Ly9wcm9ibGVtLzQ5OTYzNTE0PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogVUlQcm9jZXNzL2lvcy9mb3Jtcy9XS0ZpbGVVcGxv YWRQYW5lbC5tbToKKyAgICAgICAgKC1bV0tGaWxlVXBsb2FkUGFuZWwgX3Nob3dEb2N1bWVudFBp Y2tlck1lbnVdKToKKyAgICAgICAgQWxsb3dlZCBtdWx0aXBsZSBmaWxlIHNlbGVjdGlvbiBpbiBv dXIgVUlEb2N1bWVudFBpY2tlclZpZXdDb250cm9sbGVyIHdoZW4KKyAgICAgICAgX2FsbG93TXVs dGlwbGVGaWxlcyBpcyBZRVMuCisKKyAgICAgICAgKGRpc3BsYXlTdHJpbmdGb3JEb2N1bWVudHNB dFVSTHMpOgorICAgICAgICAoLVtXS0ZpbGVVcGxvYWRQYW5lbCBkb2N1bWVudFBpY2tlcjpkaWRQ aWNrRG9jdW1lbnRzQXRVUkxzOl0pOgorICAgICAgICBDaGFuZ2VkIHRvIHN1cHBvcnQgbXVsdGlw bGUgZmlsZSBzZWxlY3Rpb24uIFdoZW4gbW9yZSB0aGFuIG9uZSBmaWxlIGlzIHNlbGVjdGVkLCB1 c2VkIGEKKyAgICAgICAgbG9jYWxpemVkIGRpc3BsYXkgc3RyaW5nIG9mICIlbHUgZmlsZXMiLCBz aW1pbGFyIHRvIHRoZSBkaXNwbGF5IHN0cmluZyBmb3IgbXVsdGlwbGUgbWVkaWEuCisKIDIwMTkt MDQtMTYgIEFuZHkgRXN0ZXMgIDxhZXN0ZXNAYXBwbGUuY29tPgogCiAgICAgICAgIFtpT1NNYWNd IFVzZSBVSURvY3VtZW50UGlja2VyVmlld0NvbnRyb2xsZXIgZm9yIHBpY2tpbmcgZmlsZXMKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2VuLmxwcm9qL0xvY2FsaXphYmxlLnN0cmluZ3MgYi9T b3VyY2UvV2ViQ29yZS9lbi5scHJvai9Mb2NhbGl6YWJsZS5zdHJpbmdzCmluZGV4IGVmMzc5NTk3 NjliMDFiYmE5YzgyNjVjOTVkZTY0N2ExZTI5ZjQzMDQuLjcwYjkwNzUwNzI5M2QwOTQyYjhhNGU5 ZDRhOWIwZTkxNjk2YjMzNWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2VuLmxwcm9qL0xv Y2FsaXphYmxlLnN0cmluZ3MKKysrIGIvU291cmNlL1dlYkNvcmUvZW4ubHByb2ovTG9jYWxpemFi bGUuc3RyaW5ncwpAQCAtNjQsNiArNjQsOSBAQAogLyogTGFiZWwgZm9yIFBERiBwYWdlIG51bWJl ciBpbmRpY2F0b3IuICovCiAiJWQgb2YgJWQiID0gIiVkIG9mICVkIjsKIAorLyogbGFiZWwgbmV4 dCB0byBmaWxlIHVwbG9hZCBjb250cm9sOyBwYXJhbWV0ZXIgaXMgdGhlIG51bWJlciBvZiBmaWxl cyB3aGVuIGdyZWF0ZXIgdGhhbiBvbmUgKi8KKyIlbHUgZmlsZXMiID0gIiVsdSBmaWxlcyI7CisK IC8qIGxhYmVsIG5leHQgdG8gZmlsZSB1cGxvYWQgY29udHJvbDsgcGFyYW1ldGVycyBhcmUgdGhl IG51bWJlciBvZiBwaG90b3MgYW5kIHRoZSBudW1iZXIgb2YgdmlkZW9zICovCiAiJWx1IHBob3Rv KHMpIGFuZCAlbHUgdmlkZW8ocykiID0gIiVsdSBwaG90byhzKSBhbmQgJWx1IHZpZGVvKHMpIjsK IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL2Zvcm1zL1dLRmlsZVVw bG9hZFBhbmVsLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL2Zvcm1zL1dLRmlsZVVw bG9hZFBhbmVsLm1tCmluZGV4IDI0Njg2NTExNjc1YzUxMmEzMDFkN2I2ZmNjNjI3MzVkYTlkYjA1 OWMuLmNiZTg1NDE5MjFhYWJiNzQ4NmQ2MDc5NjdiYjRhMmJhZDVmNWUzMDMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9mb3Jtcy9XS0ZpbGVVcGxvYWRQYW5lbC5tbQor KysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvZm9ybXMvV0tGaWxlVXBsb2FkUGFuZWwu bW0KQEAgLTQxMyw4ICs0MTMsNyBAQCAtICh2b2lkKV9zaG93RG9jdW1lbnRQaWNrZXJNZW51CiAK ICAgICBOU0FycmF5ICpkb2N1bWVudFR5cGVzID0gbWVkaWFUeXBlcy5jb3VudCA/IG1lZGlhVHlw ZXMgOiBAWyhfX2JyaWRnZSBOU1N0cmluZyAqKWtVVFR5cGVJdGVtXTsKICAgICBpZiAoc2hvdWxk UHJlc2VudERvY3VtZW50TWVudVZpZXdDb250cm9sbGVyKSB7Ci0gICAgICAgIC8vIEZJWE1FOiBV SURvY3VtZW50TWVudVZpZXdDb250cm9sbGVyIGlzIGRlcHJlY2F0ZWQsIHdlIHNob3VsZCB1c2Ug VUlEb2N1bWVudFBpY2tlclZpZXdDb250cm9sbGVyIGluc3RlYWQuCi0gICAgICAgIC8vIEZJWE1F IDQ5OTYzNTE0OiBTdXBwb3J0IG11bHRpcGxlIGZpbGUgc2VsZWN0aW9uCisgICAgICAgIC8vIEZJ WE1FIDQ5OTc5NDQyOiBVSURvY3VtZW50TWVudVZpZXdDb250cm9sbGVyIGlzIGRlcHJlY2F0ZWQu IFVzZSBVSURvY3VtZW50UGlja2VyVmlld0NvbnRyb2xsZXIgaW5zdGVhZCB0byBzdXBwb3J0IG11 bHRpcGxlIGZpbGUgc2VsZWN0aW9uLgogICAgICAgICBfZG9jdW1lbnRNZW51Q29udHJvbGxlciA9 IGFkb3B0TlMoW1tVSURvY3VtZW50TWVudVZpZXdDb250cm9sbGVyIGFsbG9jXSBfaW5pdElnbm9y aW5nQXBwbGljYXRpb25FbnRpdGxlbWVudEZvckltcG9ydE9mVHlwZXM6ZG9jdW1lbnRUeXBlc10p OwogICAgICAgICBbX2RvY3VtZW50TWVudUNvbnRyb2xsZXIgc2V0RGVsZWdhdGU6c2VsZl07CiAK QEAgLTQzMyw4ICs0MzIsOCBAQCAtICh2b2lkKV9zaG93RG9jdW1lbnRQaWNrZXJNZW51CiAgICAg ICAgIFtzZWxmIF9wcmVzZW50TWVudU9wdGlvbkZvckN1cnJlbnRJbnRlcmZhY2VJZGlvbTpfZG9j dW1lbnRNZW51Q29udHJvbGxlci5nZXQoKV07CiAgICAgfSBlbHNlIHsKICAgICAgICAgLy8gSW1h Z2UgYW5kIFZpZGVvIHR5cGVzIGFyZSBub3QgYWNjZXB0ZWQgc28gYnlwYXNzIHRoZSBtZW51IGFu ZCBvcGVuIHRoZSBmaWxlIHBpY2tlciBkaXJlY3RseS4KLSAgICAgICAgLy8gRklYTUUgNDk5NjM1 MTQ6IFN1cHBvcnQgbXVsdGlwbGUgZmlsZSBzZWxlY3Rpb24KICAgICAgICAgX2RvY3VtZW50UGlj a2VyQ29udHJvbGxlciA9IGFkb3B0TlMoW1tVSURvY3VtZW50UGlja2VyVmlld0NvbnRyb2xsZXIg YWxsb2NdIGluaXRXaXRoRG9jdW1lbnRUeXBlczpkb2N1bWVudFR5cGVzIGluTW9kZTpVSURvY3Vt ZW50UGlja2VyTW9kZUltcG9ydF0pOworICAgICAgICBbX2RvY3VtZW50UGlja2VyQ29udHJvbGxl ciBzZXRBbGxvd3NNdWx0aXBsZVNlbGVjdGlvbjpfYWxsb3dNdWx0aXBsZUZpbGVzXTsKICAgICAg ICAgW19kb2N1bWVudFBpY2tlckNvbnRyb2xsZXIgc2V0RGVsZWdhdGU6c2VsZl07CiAgICAgICAg IFtzZWxmIF9wcmVzZW50RnVsbHNjcmVlblZpZXdDb250cm9sbGVyOl9kb2N1bWVudFBpY2tlckNv bnRyb2xsZXIuZ2V0KCkgYW5pbWF0ZWQ6WUVTXTsKICAgICB9CkBAIC01NTEsMTMgKzU1MCwyMCBA QCAtICh2b2lkKWRvY3VtZW50TWVudVdhc0NhbmNlbGxlZDooVUlEb2N1bWVudE1lbnVWaWV3Q29u dHJvbGxlciAqKWRvY3VtZW50TWVudQogCiAjcHJhZ21hIG1hcmsgLSBVSURvY3VtZW50UGlja2Vy Q29udHJvbGxlckRlbGVnYXRlIGltcGxlbWVudGF0aW9uCiAKLS0gKHZvaWQpZG9jdW1lbnRQaWNr ZXI6KFVJRG9jdW1lbnRQaWNrZXJWaWV3Q29udHJvbGxlciAqKWNvbnRyb2xsZXIgZGlkUGlja0Rv Y3VtZW50c0F0VVJMczooTlNBcnJheSA8TlNVUkwgKj4gKil1cmxzCitzdGF0aWMgTlNTdHJpbmcg KmRpc3BsYXlTdHJpbmdGb3JEb2N1bWVudHNBdFVSTHMoTlNBcnJheTxOU1VSTCAqPiAqdXJscykK IHsKLSAgICAvLyBGSVhNRSA0OTk2MzUxNDogU3VwcG9ydCBtdWx0aXBsZSBmaWxlIHNlbGVjdGlv bgotICAgIEFTU0VSVCh1cmxzLmNvdW50ID09IDEpOwotICAgIE5TVVJMICp1cmwgPSB1cmxzWzBd OworICAgIEFTU0VSVCh1cmxzLmNvdW50KTsKKyAgICBpZiAodXJscy5jb3VudCA9PSAxKQorICAg ICAgICByZXR1cm4gdXJsc1swXS5sYXN0UGF0aENvbXBvbmVudDsKKworICAgIHJldHVybiBbTlNT dHJpbmcgbG9jYWxpemVkU3RyaW5nV2l0aEZvcm1hdDpXRUJfVUlfTlNTVFJJTkcoQCIlbHUgZmls ZXMiLCAibGFiZWwgbmV4dCB0byBmaWxlIHVwbG9hZCBjb250cm9sOyBwYXJhbWV0ZXIgaXMgdGhl IG51bWJlciBvZiBmaWxlcyB3aGVuIGdyZWF0ZXIgdGhhbiBvbmUiKSwgKHVuc2lnbmVkIGxvbmcp dXJscy5jb3VudF07Cit9CisKKy0gKHZvaWQpZG9jdW1lbnRQaWNrZXI6KFVJRG9jdW1lbnRQaWNr ZXJWaWV3Q29udHJvbGxlciAqKWNvbnRyb2xsZXIgZGlkUGlja0RvY3VtZW50c0F0VVJMczooTlNB cnJheTxOU1VSTCAqPiAqKXVybHMKK3sKKyAgICBBU1NFUlQodXJscy5jb3VudCk7CiAgICAgW3Nl bGYgX2Rpc21pc3NEaXNwbGF5QW5pbWF0ZWQ6WUVTXTsKLSAgICBbc2VsZiBfY2hvb3NlRmlsZXM6 dXJscyBkaXNwbGF5U3RyaW5nOnVybC5sYXN0UGF0aENvbXBvbmVudCBpY29uSW1hZ2U6aWNvbkZv ckZpbGUodXJsKV07CisgICAgW3NlbGYgX2Nob29zZUZpbGVzOnVybHMgZGlzcGxheVN0cmluZzpk aXNwbGF5U3RyaW5nRm9yRG9jdW1lbnRzQXRVUkxzKHVybHMpIGljb25JbWFnZTppY29uRm9yRmls ZSh1cmxzWzBdKV07CiB9CiAKIC0gKHZvaWQpZG9jdW1lbnRQaWNrZXJXYXNDYW5jZWxsZWQ6KFVJ RG9jdW1lbnRQaWNrZXJWaWV3Q29udHJvbGxlciAqKWRvY3VtZW50UGlja2VyCg== 367669 2019-04-17 13:16:55 -0700 2019-04-17 15:41:14 -0700 Patch bug-197014-20190417131655.patch text/plain 5395 aestes U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ0Mzc5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDRlNGJkYjE3ZGEyMzgz OThkMmJiMjE2NzFjY2VhOGRmNGJmYzRhOC4uYWE3Y2EyNWE1MGM0MDYzYTJmYjMzYmQxMDk3Zjcz ZDY0YmI1MzQ5NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDE5LTA0LTE3ICBBbmR5 IEVzdGVzICA8YWVzdGVzQGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TXSBTdXBwb3J0IG11bHRp cGxlIGZpbGUgc2VsZWN0aW9uIGluIFVJRG9jdW1lbnRQaWNrZXJWaWV3Q29udHJvbGxlcgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk3MDE0CisgICAg ICAgIDxyZGFyOi8vcHJvYmxlbS80OTk2MzUxND4KKworICAgICAgICBSZXZpZXdlZCBieSBUaW0g SG9ydG9uLgorCisgICAgICAgICogcGxhdGZvcm0vTG9jYWxpemVkU3RyaW5ncy5oOgorICAgICAg ICBFeHBvcnRlZCBtdWx0aXBsZUZpbGVVcGxvYWRUZXh0KCkuCisKIDIwMTktMDQtMTcgIFJvYiBC dWlzICA8cmJ1aXNAaWdhbGlhLmNvbT4KIAogICAgICAgICBYTUxIdHRwUmVxdWVzdCBoYXMgdGhl IHdyb25nIGZhbGxiYWNrIGVuY29kaW5nCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0NoYW5n ZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDc1MGM3NGViNzhkMzg5ZDM0ZWFm ODYyMzQ3YTZlOGM0NjJlYzg1NzcuLmQ0ZDhkOGRiZmMxMTBiOWEzNWM5OWRlNTViZDk1OTk1Mjc1 NmQ1NTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9X ZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTktMDQtMTcgIEFuZHkgRXN0ZXMg IDxhZXN0ZXNAYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdIFN1cHBvcnQgbXVsdGlwbGUgZmls ZSBzZWxlY3Rpb24gaW4gVUlEb2N1bWVudFBpY2tlclZpZXdDb250cm9sbGVyCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTcwMTQKKyAgICAgICAgPHJk YXI6Ly9wcm9ibGVtLzQ5OTYzNTE0PgorCisgICAgICAgIFJldmlld2VkIGJ5IFRpbSBIb3J0b24u CisKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL2Zvcm1zL1dLRmlsZVVwbG9hZFBhbmVsLm1tOgor ICAgICAgICAoLVtXS0ZpbGVVcGxvYWRQYW5lbCBfc2hvd0RvY3VtZW50UGlja2VyTWVudV0pOgor ICAgICAgICBBbGxvd2VkIG11bHRpcGxlIGZpbGUgc2VsZWN0aW9uIGluIG91ciBVSURvY3VtZW50 UGlja2VyVmlld0NvbnRyb2xsZXIgd2hlbgorICAgICAgICBfYWxsb3dNdWx0aXBsZUZpbGVzIGlz IFlFUy4KKworICAgICAgICAoZGlzcGxheVN0cmluZ0ZvckRvY3VtZW50c0F0VVJMcyk6CisgICAg ICAgICgtW1dLRmlsZVVwbG9hZFBhbmVsIGRvY3VtZW50UGlja2VyOmRpZFBpY2tEb2N1bWVudHNB dFVSTHM6XSk6CisgICAgICAgIENoYW5nZWQgdG8gc3VwcG9ydCBtdWx0aXBsZSBmaWxlIHNlbGVj dGlvbi4gV2hlbiBtb3JlIHRoYW4gb25lIGZpbGUgaXMgc2VsZWN0ZWQsIHVzZQorICAgICAgICBX ZWJDb3JlOjptdWx0aXBsZUZpbGVVcGxvYWRUZXh0KCkgYXMgdGhlIGRpc3BsYXkgc3RyaW5nLgor CiAyMDE5LTA0LTE2ICBBbmR5IEVzdGVzICA8YWVzdGVzQGFwcGxlLmNvbT4KIAogICAgICAgICBb aU9TTWFjXSBVc2UgVUlEb2N1bWVudFBpY2tlclZpZXdDb250cm9sbGVyIGZvciBwaWNraW5nIGZp bGVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9Mb2NhbGl6ZWRTdHJpbmdz LmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9Mb2NhbGl6ZWRTdHJpbmdzLmgKaW5kZXggYjRl MTExZTczMDA4NGE2YWYwZWIwMWNhMmUwZDljMGZjODEwZTRjMy4uZTgwMjlmZjljNTExZDkzN2Ex NWRlYjc5NWFiYmQ5MWRmYTA4YTE4MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vTG9jYWxpemVkU3RyaW5ncy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0xvY2Fs aXplZFN0cmluZ3MuaApAQCAtMjM2LDcgKzIzNiw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAg ICBTdHJpbmcgdW5zdXBwb3J0ZWRQbHVnaW5UZXh0KCk7CiAgICAgV0VCQ09SRV9FWFBPUlQgU3Ry aW5nIHBsdWdpblRvb1NtYWxsVGV4dCgpOwogCi0gICAgU3RyaW5nIG11bHRpcGxlRmlsZVVwbG9h ZFRleHQodW5zaWduZWQgbnVtYmVyT2ZGaWxlcyk7CisgICAgV0VCQ09SRV9FWFBPUlQgU3RyaW5n IG11bHRpcGxlRmlsZVVwbG9hZFRleHQodW5zaWduZWQgbnVtYmVyT2ZGaWxlcyk7CiAgICAgU3Ry aW5nIHVua25vd25GaWxlU2l6ZVRleHQoKTsKIAogI2lmIFBMQVRGT1JNKFdJTikKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9mb3Jtcy9XS0ZpbGVVcGxvYWRQYW5lbC5t bSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9mb3Jtcy9XS0ZpbGVVcGxvYWRQYW5lbC5t bQppbmRleCAyNDY4NjUxMTY3NWM1MTJhMzAxZDdiNmZjYzYyNzM1ZGE5ZGIwNTljLi40MjYzYzY2 NjU4YmRmMDI0NTQwNzM2NmYwZWNhOWMxOGQyOTlkNTNmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9pb3MvZm9ybXMvV0tGaWxlVXBsb2FkUGFuZWwubW0KKysrIGIvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvaW9zL2Zvcm1zL1dLRmlsZVVwbG9hZFBhbmVsLm1tCkBAIC00MTMs OCArNDEzLDcgQEAgLSAodm9pZClfc2hvd0RvY3VtZW50UGlja2VyTWVudQogCiAgICAgTlNBcnJh eSAqZG9jdW1lbnRUeXBlcyA9IG1lZGlhVHlwZXMuY291bnQgPyBtZWRpYVR5cGVzIDogQFsoX19i cmlkZ2UgTlNTdHJpbmcgKilrVVRUeXBlSXRlbV07CiAgICAgaWYgKHNob3VsZFByZXNlbnREb2N1 bWVudE1lbnVWaWV3Q29udHJvbGxlcikgewotICAgICAgICAvLyBGSVhNRTogVUlEb2N1bWVudE1l bnVWaWV3Q29udHJvbGxlciBpcyBkZXByZWNhdGVkLCB3ZSBzaG91bGQgdXNlIFVJRG9jdW1lbnRQ aWNrZXJWaWV3Q29udHJvbGxlciBpbnN0ZWFkLgotICAgICAgICAvLyBGSVhNRSA0OTk2MzUxNDog U3VwcG9ydCBtdWx0aXBsZSBmaWxlIHNlbGVjdGlvbgorICAgICAgICAvLyBGSVhNRSA0OTk3OTQ0 MjogVUlEb2N1bWVudE1lbnVWaWV3Q29udHJvbGxlciBpcyBkZXByZWNhdGVkLiBVc2UgVUlEb2N1 bWVudFBpY2tlclZpZXdDb250cm9sbGVyIGluc3RlYWQgdG8gc3VwcG9ydCBtdWx0aXBsZSBmaWxl IHNlbGVjdGlvbi4KICAgICAgICAgX2RvY3VtZW50TWVudUNvbnRyb2xsZXIgPSBhZG9wdE5TKFtb VUlEb2N1bWVudE1lbnVWaWV3Q29udHJvbGxlciBhbGxvY10gX2luaXRJZ25vcmluZ0FwcGxpY2F0 aW9uRW50aXRsZW1lbnRGb3JJbXBvcnRPZlR5cGVzOmRvY3VtZW50VHlwZXNdKTsKICAgICAgICAg W19kb2N1bWVudE1lbnVDb250cm9sbGVyIHNldERlbGVnYXRlOnNlbGZdOwogCkBAIC00MzMsOCAr NDMyLDggQEAgLSAodm9pZClfc2hvd0RvY3VtZW50UGlja2VyTWVudQogICAgICAgICBbc2VsZiBf cHJlc2VudE1lbnVPcHRpb25Gb3JDdXJyZW50SW50ZXJmYWNlSWRpb206X2RvY3VtZW50TWVudUNv bnRyb2xsZXIuZ2V0KCldOwogICAgIH0gZWxzZSB7CiAgICAgICAgIC8vIEltYWdlIGFuZCBWaWRl byB0eXBlcyBhcmUgbm90IGFjY2VwdGVkIHNvIGJ5cGFzcyB0aGUgbWVudSBhbmQgb3BlbiB0aGUg ZmlsZSBwaWNrZXIgZGlyZWN0bHkuCi0gICAgICAgIC8vIEZJWE1FIDQ5OTYzNTE0OiBTdXBwb3J0 IG11bHRpcGxlIGZpbGUgc2VsZWN0aW9uCiAgICAgICAgIF9kb2N1bWVudFBpY2tlckNvbnRyb2xs ZXIgPSBhZG9wdE5TKFtbVUlEb2N1bWVudFBpY2tlclZpZXdDb250cm9sbGVyIGFsbG9jXSBpbml0 V2l0aERvY3VtZW50VHlwZXM6ZG9jdW1lbnRUeXBlcyBpbk1vZGU6VUlEb2N1bWVudFBpY2tlck1v ZGVJbXBvcnRdKTsKKyAgICAgICAgW19kb2N1bWVudFBpY2tlckNvbnRyb2xsZXIgc2V0QWxsb3dz TXVsdGlwbGVTZWxlY3Rpb246X2FsbG93TXVsdGlwbGVGaWxlc107CiAgICAgICAgIFtfZG9jdW1l bnRQaWNrZXJDb250cm9sbGVyIHNldERlbGVnYXRlOnNlbGZdOwogICAgICAgICBbc2VsZiBfcHJl c2VudEZ1bGxzY3JlZW5WaWV3Q29udHJvbGxlcjpfZG9jdW1lbnRQaWNrZXJDb250cm9sbGVyLmdl dCgpIGFuaW1hdGVkOllFU107CiAgICAgfQpAQCAtNTUxLDEzICs1NTAsMjEgQEAgLSAodm9pZClk b2N1bWVudE1lbnVXYXNDYW5jZWxsZWQ6KFVJRG9jdW1lbnRNZW51Vmlld0NvbnRyb2xsZXIgKilk b2N1bWVudE1lbnUKIAogI3ByYWdtYSBtYXJrIC0gVUlEb2N1bWVudFBpY2tlckNvbnRyb2xsZXJE ZWxlZ2F0ZSBpbXBsZW1lbnRhdGlvbgogCi0tICh2b2lkKWRvY3VtZW50UGlja2VyOihVSURvY3Vt ZW50UGlja2VyVmlld0NvbnRyb2xsZXIgKiljb250cm9sbGVyIGRpZFBpY2tEb2N1bWVudHNBdFVS THM6KE5TQXJyYXkgPE5TVVJMICo+ICopdXJscworc3RhdGljIE5TU3RyaW5nICpkaXNwbGF5U3Ry aW5nRm9yRG9jdW1lbnRzQXRVUkxzKE5TQXJyYXk8TlNVUkwgKj4gKnVybHMpCiB7Ci0gICAgLy8g RklYTUUgNDk5NjM1MTQ6IFN1cHBvcnQgbXVsdGlwbGUgZmlsZSBzZWxlY3Rpb24KLSAgICBBU1NF UlQodXJscy5jb3VudCA9PSAxKTsKLSAgICBOU1VSTCAqdXJsID0gdXJsc1swXTsKKyAgICBhdXRv IHVybHNDb3VudCA9IHVybHMuY291bnQ7CisgICAgQVNTRVJUKHVybHNDb3VudCk7CisgICAgaWYg KHVybHNDb3VudCA9PSAxKQorICAgICAgICByZXR1cm4gdXJsc1swXS5sYXN0UGF0aENvbXBvbmVu dDsKKworICAgIHJldHVybiBXZWJDb3JlOjptdWx0aXBsZUZpbGVVcGxvYWRUZXh0KHVybHNDb3Vu dCk7Cit9CisKKy0gKHZvaWQpZG9jdW1lbnRQaWNrZXI6KFVJRG9jdW1lbnRQaWNrZXJWaWV3Q29u dHJvbGxlciAqKWNvbnRyb2xsZXIgZGlkUGlja0RvY3VtZW50c0F0VVJMczooTlNBcnJheTxOU1VS TCAqPiAqKXVybHMKK3sKKyAgICBBU1NFUlQodXJscy5jb3VudCk7CiAgICAgW3NlbGYgX2Rpc21p c3NEaXNwbGF5QW5pbWF0ZWQ6WUVTXTsKLSAgICBbc2VsZiBfY2hvb3NlRmlsZXM6dXJscyBkaXNw bGF5U3RyaW5nOnVybC5sYXN0UGF0aENvbXBvbmVudCBpY29uSW1hZ2U6aWNvbkZvckZpbGUodXJs KV07CisgICAgW3NlbGYgX2Nob29zZUZpbGVzOnVybHMgZGlzcGxheVN0cmluZzpkaXNwbGF5U3Ry aW5nRm9yRG9jdW1lbnRzQXRVUkxzKHVybHMpIGljb25JbWFnZTppY29uRm9yRmlsZSh1cmxzWzBd KV07CiB9CiAKIC0gKHZvaWQpZG9jdW1lbnRQaWNrZXJXYXNDYW5jZWxsZWQ6KFVJRG9jdW1lbnRQ aWNrZXJWaWV3Q29udHJvbGxlciAqKWRvY3VtZW50UGlja2VyCg==