210410 2020-04-12 11:21:30 -0700 [Cocoa] Minor tweaks to code to get locale strings to remove one-time-initialization booleans 2020-04-12 12:29:12 -0700 1 1 1 Unclassified WebKit Web Template Framework WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 darin darin benjamin cdumez cmarcelo ews-watchlist sam webkit-bug-importer oldest_to_newest 1640711 0 darin 2020-04-12 11:21:30 -0700 Minor tweaks to code to get locale strings to remove one-time-initialization booleans 1640712 1 396236 darin 2020-04-12 11:25:52 -0700 Created attachment 396236 Patch 1640720 2 darin 2020-04-12 12:28:07 -0700 Committed r259986: <https://trac.webkit.org/changeset/259986> 1640721 3 webkit-bug-importer 2020-04-12 12:29:12 -0700 <rdar://problem/61680807> 396236 2020-04-12 11:25:52 -0700 2020-04-12 11:45:27 -0700 Patch bug-210410-20200412112551.patch text/plain 6510 darin U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5OTgyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IGEzZDM0ZGE0NWQ1YmEzYmU0MzQ2MTUx ZDA4NzYxNjlkMDNiY2JlOTEuLmUyM2RlYjMxZWViZjZjY2YzNDg4ZDc4NjAxODhkNDFhMDFmZTQ4 MzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMjAtMDQtMTIgIERhcmluIEFkbGVyICA8ZGFyaW5A YXBwbGUuY29tPgorCisgICAgICAgIFtDb2NvYV0gTWlub3IgdHdlYWtzIHRvIGNvZGUgdG8gZ2V0 IGxvY2FsZSBzdHJpbmdzIHRvIHJlbW92ZSBvbmUtdGltZS1pbml0aWFsaXphdGlvbiBib29sZWFu cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEwNDEw CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiB3dGYv dGV4dC9jb2NvYS9UZXh0QnJlYWtJdGVyYXRvckludGVybmFsSUNVQ29jb2EuY3BwOgorICAgICAg ICAoV1RGOjp0ZXh0QnJlYWtMb2NhbGVQcmVmZXJlbmNlKTogVXNlIGF1dG8sIGFuZCBubyBuZWVk IHRvIGV4cGxpY2l0bHkgbWFyayB0aGlzIGlubGluZS4KKyAgICAgICAgKFdURjo6dG9wTGFuZ3Vh Z2VQcmVmZXJlbmNlKTogVXNlIGF1dG8uCisgICAgICAgIChXVEY6OmxvY2FsZUlESW5CdWZmZXIp OiBSZW5hbWVkIGZyb20gZ2V0TG9jYWxlLiBDaGFuZ2VkIHRvIHJldHVybiBhIHN0ZDo6YXJyYXkg YW5kIHRvCisgICAgICAgIGhhbmRsZSBmYWlsdXJlIGNhc2VzIGFmdGVyd2FyZCByYXRoZXIgdGhh biBieSBpbml0aWFsaXppbmcgYmVmb3JlaGFuZC4KKyAgICAgICAgKFdURjo6Z2V0U2VhcmNoTG9j YWxlKTogRGVsZXRlZC4KKyAgICAgICAgKFdURjo6Y3VycmVudFNlYXJjaExvY2FsZUlEKTogVXNp bmcgInN0YXRpYyBjb25zdCBhdXRvIiwgd3JvdGUgdGhpcyBpbiBhIHN0cmFpZ2h0Zm9yd2FyZAor ICAgICAgICBhbmQgY29tcGFjdCB3YXksIHVzaW5nIGxvY2FsZUlESW5CdWZmZXIgYW5kIHRvcExh bmd1YWdlUHJlZmVyZW5jZS4KKyAgICAgICAgKFdURjo6dGV4dEJyZWFrTG9jYWxlKTogUmVuYW1l ZCBmcm9tIGdldFRleHRCcmVha0xvY2FsZSBhbmQgY2hhbmdlZCB0byByZXR1cm4gYQorICAgICAg ICBSZXRhaW5QdHI8Q0ZTdHJpbmdSZWY+LgorICAgICAgICAoV1RGOjpjdXJyZW50VGV4dEJyZWFr TG9jYWxlSUQpOiBVc2luZyAic3RhdGljIGNvbnN0IGF1dG8iLCB3cm90ZSB0aGlzIGluIGEgc3Ry YWlnaHRmb3J3YXJkCisgICAgICAgIGFuZCBjb21wYWN0IHdheSwgdXNpbmcgbG9jYWxlSURJbkJ1 ZmZlciBhbmQgdGV4dEJyZWFrTG9jYWxlLgorCiAyMDIwLTA0LTEyICBEYXZpZCBLaWx6ZXIgIDxk ZGtpbHplckBhcHBsZS5jb20+CiAKICAgICAgICAgRm9sbG93LXVwOiBXVEY6OlBlcnNpc3RlbmNl OjpDb2RlciBhbmQgV1RGOjpQZXJzaXN0ZW5jZTo6RGVjb2RlciBzaG91bGQgdXNlIFdBUk5fVU5V U0VEX1JFVFVSTgpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93dGYvdGV4dC9jb2NvYS9UZXh0QnJl YWtJdGVyYXRvckludGVybmFsSUNVQ29jb2EuY3BwIGIvU291cmNlL1dURi93dGYvdGV4dC9jb2Nv YS9UZXh0QnJlYWtJdGVyYXRvckludGVybmFsSUNVQ29jb2EuY3BwCmluZGV4IDY4MWJiZWM1NmMz MmEyODE4ZmFkNWQ2YTQ2ZDdmNjJlNDUxN2NhOWIuLmE0MDA5YWQ5ZGNlZGY2ZTZiYjRkMDZjYWZi NzRkMGZkN2UwNmU1NDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL3RleHQvY29jb2EvVGV4 dEJyZWFrSXRlcmF0b3JJbnRlcm5hbElDVUNvY29hLmNwcAorKysgYi9Tb3VyY2UvV1RGL3d0Zi90 ZXh0L2NvY29hL1RleHRCcmVha0l0ZXJhdG9ySW50ZXJuYWxJQ1VDb2NvYS5jcHAKQEAgLTEsNSAr MSw1IEBACiAvKgotICogQ29weXJpZ2h0IChDKSAyMDA3LTIwMTkgQXBwbGUgSW5jLiBBbGwgcmln aHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAyMDA3LTIwMjAgQXBwbGUgSW5jLiBBbGwg cmlnaHRzIHJlc2VydmVkLgogICoKICAqIFRoaXMgbGlicmFyeSBpcyBmcmVlIHNvZnR3YXJlOyB5 b3UgY2FuIHJlZGlzdHJpYnV0ZSBpdCBhbmQvb3IKICAqIG1vZGlmeSBpdCB1bmRlciB0aGUgdGVy bXMgb2YgdGhlIEdOVSBMaWJyYXJ5IEdlbmVyYWwgUHVibGljCkBAIC0yMSwxMSArMjEsMTUgQEAK ICNpbmNsdWRlICJjb25maWcuaCIKICNpbmNsdWRlIDx3dGYvdGV4dC9UZXh0QnJlYWtJdGVyYXRv ckludGVybmFsSUNVLmg+CiAKKyNpbmNsdWRlIDxhcnJheT4KICNpbmNsdWRlIDx3dGYvUmV0YWlu UHRyLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQvVGV4dEJyZWFrSXRlcmF0b3IuaD4KIAogbmFtZXNw YWNlIFdURiB7CiAKKy8vIEJ1ZmZlciBzaXplZCB0byBob2xkIEFTQ0lJIGxvY2FsZSBJRCBzdHJp bmdzIHVwIHRvIDMyIGNoYXJhY3RlcnMgbG9uZy4KK3VzaW5nIExvY2FsZUlEQnVmZmVyID0gc3Rk OjphcnJheTxjaGFyLCAzMz47CisKIHN0YXRpYyBWYXJpYW50PFRleHRCcmVha0l0ZXJhdG9ySUNV LCBUZXh0QnJlYWtJdGVyYXRvclBsYXRmb3JtPiBtYXBNb2RlVG9CYWNraW5nSXRlcmF0b3IoU3Ry aW5nVmlldyBzdHJpbmcsIFRleHRCcmVha0l0ZXJhdG9yOjpNb2RlIG1vZGUsIGNvbnN0IEF0b21T dHJpbmcmIGxvY2FsZSkKIHsKICAgICBzd2l0Y2ggKG1vZGUpIHsKQEAgLTQ1LDExICs0OSw5IEBA IFRleHRCcmVha0l0ZXJhdG9yOjpUZXh0QnJlYWtJdGVyYXRvcihTdHJpbmdWaWV3IHN0cmluZywg TW9kZSBtb2RlLCBjb25zdCBBdG9tU3RyCiB7CiB9CiAKLXN0YXRpYyBjb25zdGV4cHIgaW50IG1h eExvY2FsZVN0cmluZ0xlbmd0aCA9IDMyOwotCi1zdGF0aWMgaW5saW5lIFJldGFpblB0cjxDRlN0 cmluZ1JlZj4gdGV4dEJyZWFrTG9jYWxlUHJlZmVyZW5jZSgpCitzdGF0aWMgUmV0YWluUHRyPENG U3RyaW5nUmVmPiB0ZXh0QnJlYWtMb2NhbGVQcmVmZXJlbmNlKCkKIHsKLSAgICBSZXRhaW5QdHI8 Q0ZQcm9wZXJ0eUxpc3RSZWY+IGxvY2FsZSA9IGFkb3B0Q0YoQ0ZQcmVmZXJlbmNlc0NvcHlWYWx1 ZShDRlNUUigiQXBwbGVUZXh0QnJlYWtMb2NhbGUiKSwKKyAgICBhdXRvIGxvY2FsZSA9IGFkb3B0 Q0YoQ0ZQcmVmZXJlbmNlc0NvcHlWYWx1ZShDRlNUUigiQXBwbGVUZXh0QnJlYWtMb2NhbGUiKSwK ICAgICAgICAga0NGUHJlZmVyZW5jZXNBbnlBcHBsaWNhdGlvbiwga0NGUHJlZmVyZW5jZXNDdXJy ZW50VXNlciwga0NGUHJlZmVyZW5jZXNBbnlIb3N0KSk7CiAgICAgaWYgKCFsb2NhbGUgfHwgQ0ZH ZXRUeXBlSUQobG9jYWxlLmdldCgpKSAhPSBDRlN0cmluZ0dldFR5cGVJRCgpKQogICAgICAgICBy ZXR1cm4gbnVsbHB0cjsKQEAgLTU4LDYwICs2MCw0MiBAQCBzdGF0aWMgaW5saW5lIFJldGFpblB0 cjxDRlN0cmluZ1JlZj4gdGV4dEJyZWFrTG9jYWxlUHJlZmVyZW5jZSgpCiAKIHN0YXRpYyBSZXRh aW5QdHI8Q0ZTdHJpbmdSZWY+IHRvcExhbmd1YWdlUHJlZmVyZW5jZSgpCiB7Ci0gICAgUmV0YWlu UHRyPENGQXJyYXlSZWY+IGxhbmd1YWdlc0FycmF5ID0gYWRvcHRDRihDRkxvY2FsZUNvcHlQcmVm ZXJyZWRMYW5ndWFnZXMoKSk7Ci0gICAgaWYgKCFsYW5ndWFnZXNBcnJheSkKLSAgICAgICAgcmV0 dXJuIG51bGxwdHI7Ci0gICAgaWYgKCFDRkFycmF5R2V0Q291bnQobGFuZ3VhZ2VzQXJyYXkuZ2V0 KCkpKQorICAgIGF1dG8gbGFuZ3VhZ2VzQXJyYXkgPSBhZG9wdENGKENGTG9jYWxlQ29weVByZWZl cnJlZExhbmd1YWdlcygpKTsKKyAgICBpZiAoIWxhbmd1YWdlc0FycmF5IHx8ICFDRkFycmF5R2V0 Q291bnQobGFuZ3VhZ2VzQXJyYXkuZ2V0KCkpKQogICAgICAgICByZXR1cm4gbnVsbHB0cjsKICAg ICByZXR1cm4gc3RhdGljX2Nhc3Q8Q0ZTdHJpbmdSZWY+KENGQXJyYXlHZXRWYWx1ZUF0SW5kZXgo bGFuZ3VhZ2VzQXJyYXkuZ2V0KCksIDApKTsKIH0KIAotc3RhdGljIHZvaWQgZ2V0TG9jYWxlKENG U3RyaW5nUmVmIGxvY2FsZSwgY2hhciBsb2NhbGVTdHJpbmdCdWZmZXJbbWF4TG9jYWxlU3RyaW5n TGVuZ3RoXSkKLXsKLSAgICAvLyBFbXB0eSBzdHJpbmcgbWVhbnMgInJvb3QgbG9jYWxlIiwgYW5k IHRoYXQgaXMgd2hhdCB3ZSB1c2UgaWYgd2UgY2FuJ3QgZ2V0IGEgcHJlZmVyZW5jZS4KLSAgICBs b2NhbGVTdHJpbmdCdWZmZXJbMF0gPSAwOwotICAgIGlmICghbG9jYWxlKQotICAgICAgICByZXR1 cm47Ci0gICAgQ0ZTdHJpbmdHZXRDU3RyaW5nKGxvY2FsZSwgbG9jYWxlU3RyaW5nQnVmZmVyLCBt YXhMb2NhbGVTdHJpbmdMZW5ndGgsIGtDRlN0cmluZ0VuY29kaW5nQVNDSUkpOwotfQotCi1zdGF0 aWMgdm9pZCBnZXRTZWFyY2hMb2NhbGUoY2hhciBsb2NhbGVTdHJpbmdCdWZmZXJbbWF4TG9jYWxl U3RyaW5nTGVuZ3RoXSkKK3N0YXRpYyBMb2NhbGVJREJ1ZmZlciBsb2NhbGVJREluQnVmZmVyKENG U3RyaW5nUmVmIHN0cmluZykKIHsKLSAgICBnZXRMb2NhbGUodG9wTGFuZ3VhZ2VQcmVmZXJlbmNl KCkuZ2V0KCksIGxvY2FsZVN0cmluZ0J1ZmZlcik7CisgICAgLy8gRW1wdHkgc3RyaW5nIG1lYW5z ICJyb290IGxvY2FsZSIsIGFuZCBpcyB3aGF0IHdlIHVzZSBpZiB3ZSBjYW4ndCBnZXQgYSBwcmVm ZXJlbmNlLgorICAgIExvY2FsZUlEQnVmZmVyIGJ1ZmZlcjsKKyAgICBpZiAoIXN0cmluZyB8fCAh Q0ZTdHJpbmdHZXRDU3RyaW5nKHN0cmluZywgYnVmZmVyLmRhdGEoKSwgYnVmZmVyLnNpemUoKSwg a0NGU3RyaW5nRW5jb2RpbmdBU0NJSSkpCisgICAgICAgIGJ1ZmZlci5mcm9udCgpID0gJ1wwJzsK KyAgICByZXR1cm4gYnVmZmVyOwogfQogCiBjb25zdCBjaGFyKiBjdXJyZW50U2VhcmNoTG9jYWxl SUQoKQogewotICAgIHN0YXRpYyBjaGFyIGxvY2FsZVN0cmluZ0J1ZmZlclttYXhMb2NhbGVTdHJp bmdMZW5ndGhdOwotICAgIHN0YXRpYyBib29sIGdvdFNlYXJjaExvY2FsZSA9IGZhbHNlOwotICAg IGlmICghZ290U2VhcmNoTG9jYWxlKSB7Ci0gICAgICAgIGdldFNlYXJjaExvY2FsZShsb2NhbGVT dHJpbmdCdWZmZXIpOwotICAgICAgICBnb3RTZWFyY2hMb2NhbGUgPSB0cnVlOwotICAgIH0KLSAg ICByZXR1cm4gbG9jYWxlU3RyaW5nQnVmZmVyOworICAgIHN0YXRpYyBjb25zdCBhdXRvIGJ1ZmZl ciA9IGxvY2FsZUlESW5CdWZmZXIodG9wTGFuZ3VhZ2VQcmVmZXJlbmNlKCkuZ2V0KCkpOworICAg IHJldHVybiBidWZmZXIuZGF0YSgpOwogfQogCi1zdGF0aWMgdm9pZCBnZXRUZXh0QnJlYWtMb2Nh bGUoY2hhciBsb2NhbGVTdHJpbmdCdWZmZXJbbWF4TG9jYWxlU3RyaW5nTGVuZ3RoXSkKK3N0YXRp YyBSZXRhaW5QdHI8Q0ZTdHJpbmdSZWY+IHRleHRCcmVha0xvY2FsZSgpCiB7CiAgICAgLy8gSWYg dGhlcmUgaXMgbm8gdGV4dCBicmVhayBsb2NhbGUsIHVzZSB0aGUgdG9wIGxhbmd1YWdlIHByZWZl cmVuY2UuCi0gICAgUmV0YWluUHRyPENGU3RyaW5nUmVmPiBsb2NhbGUgPSB0ZXh0QnJlYWtMb2Nh bGVQcmVmZXJlbmNlKCk7Ci0gICAgaWYgKGxvY2FsZSkgewotICAgICAgICBpZiAoUmV0YWluUHRy PENGU3RyaW5nUmVmPiBjYW5vbmljYWxMb2NhbGUgPSBhZG9wdENGKENGTG9jYWxlQ3JlYXRlQ2Fu b25pY2FsTGFuZ3VhZ2VJZGVudGlmaWVyRnJvbVN0cmluZyhrQ0ZBbGxvY2F0b3JEZWZhdWx0LCBs b2NhbGUuZ2V0KCkpKSkKLSAgICAgICAgICAgIGxvY2FsZSA9IGNhbm9uaWNhbExvY2FsZTsKLSAg ICB9IGVsc2UKLSAgICAgICAgbG9jYWxlID0gdG9wTGFuZ3VhZ2VQcmVmZXJlbmNlKCk7Ci0gICAg Z2V0TG9jYWxlKGxvY2FsZS5nZXQoKSwgbG9jYWxlU3RyaW5nQnVmZmVyKTsKKyAgICBhdXRvIGxv Y2FsZSA9IHRleHRCcmVha0xvY2FsZVByZWZlcmVuY2UoKTsKKyAgICBpZiAoIWxvY2FsZSkKKyAg ICAgICAgcmV0dXJuIHRvcExhbmd1YWdlUHJlZmVyZW5jZSgpOworICAgIGlmIChhdXRvIGNhbm9u aWNhbExvY2FsZSA9IGFkb3B0Q0YoQ0ZMb2NhbGVDcmVhdGVDYW5vbmljYWxMYW5ndWFnZUlkZW50 aWZpZXJGcm9tU3RyaW5nKGtDRkFsbG9jYXRvckRlZmF1bHQsIGxvY2FsZS5nZXQoKSkpKQorICAg ICAgICByZXR1cm4gY2Fub25pY2FsTG9jYWxlOworICAgIHJldHVybiBsb2NhbGU7CiB9CiAKIGNv bnN0IGNoYXIqIGN1cnJlbnRUZXh0QnJlYWtMb2NhbGVJRCgpCiB7Ci0gICAgc3RhdGljIGNoYXIg bG9jYWxlU3RyaW5nQnVmZmVyW21heExvY2FsZVN0cmluZ0xlbmd0aF07Ci0gICAgc3RhdGljIGJv b2wgZ290VGV4dEJyZWFrTG9jYWxlID0gZmFsc2U7Ci0gICAgaWYgKCFnb3RUZXh0QnJlYWtMb2Nh bGUpIHsKLSAgICAgICAgZ2V0VGV4dEJyZWFrTG9jYWxlKGxvY2FsZVN0cmluZ0J1ZmZlcik7Ci0g ICAgICAgIGdvdFRleHRCcmVha0xvY2FsZSA9IHRydWU7Ci0gICAgfQotICAgIHJldHVybiBsb2Nh bGVTdHJpbmdCdWZmZXI7CisgICAgc3RhdGljIGNvbnN0IGF1dG8gYnVmZmVyID0gbG9jYWxlSURJ bkJ1ZmZlcih0ZXh0QnJlYWtMb2NhbGUoKS5nZXQoKSk7CisgICAgcmV0dXJuIGJ1ZmZlci5kYXRh KCk7CiB9CiAKIH0K