<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[283250] branches/safari-612.2.9.1-branch/Source/WebKitLegacy/mac</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/283250">283250</a></dd>
<dt>Author</dt> <dd>alancoon@apple.com</dd>
<dt>Date</dt> <dd>2021-09-29 12:45:09 -0700 (Wed, 29 Sep 2021)</dd>
</dl>
<h3>Log Message</h3>
<pre>Cherry-pick <a href="http://trac.webkit.org/projects/webkit/changeset/283225">r283225</a>. rdar://problem/83683566
Make WebLocalizedString() thread-safe
https://bugs.webkit.org/show_bug.cgi?id=230954
Reviewed by Alexey Proskuryakov.
Make WebLocalizedString() thread-safe. It takes minimal effort to make it thread-safe given
that the NSBundle API is thread-safe [1] and clients keep calling it on the background thread.
[1] https://developer.apple.com/documentation/foundation/nslocalizedstringwithdefaultvalue
"As of OS X 10.11 and iOS 9, NSBundle is thread-safe. As such, you can safely call
NSLocalizedStringWithDefaultValue from any execution context."
* Misc/WebLocalizableStrings.mm:
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@283225 268f45cc-cd09-0410-ab3c-d52691b4dbfc</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari612291branchSourceWebKitLegacymacChangeLog">branches/safari-612.2.9.1-branch/Source/WebKitLegacy/mac/ChangeLog</a></li>
<li><a href="#branchessafari612291branchSourceWebKitLegacymacMiscWebLocalizableStringsmm">branches/safari-612.2.9.1-branch/Source/WebKitLegacy/mac/Misc/WebLocalizableStrings.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari612291branchSourceWebKitLegacymacChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-612.2.9.1-branch/Source/WebKitLegacy/mac/ChangeLog (283249 => 283250)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612.2.9.1-branch/Source/WebKitLegacy/mac/ChangeLog 2021-09-29 19:43:45 UTC (rev 283249)
+++ branches/safari-612.2.9.1-branch/Source/WebKitLegacy/mac/ChangeLog 2021-09-29 19:45:09 UTC (rev 283250)
</span><span class="lines">@@ -1,3 +1,40 @@
</span><ins>+2021-09-29 Alan Coon <alancoon@apple.com>
+
+ Cherry-pick r283225. rdar://problem/83683566
+
+ Make WebLocalizedString() thread-safe
+ https://bugs.webkit.org/show_bug.cgi?id=230954
+
+ Reviewed by Alexey Proskuryakov.
+
+ Make WebLocalizedString() thread-safe. It takes minimal effort to make it thread-safe given
+ that the NSBundle API is thread-safe [1] and clients keep calling it on the background thread.
+
+ [1] https://developer.apple.com/documentation/foundation/nslocalizedstringwithdefaultvalue
+ "As of OS X 10.11 and iOS 9, NSBundle is thread-safe. As such, you can safely call
+ NSLocalizedStringWithDefaultValue from any execution context."
+
+ * Misc/WebLocalizableStrings.mm:
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@283225 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-09-29 Chris Dumez <cdumez@apple.com>
+
+ Make WebLocalizedString() thread-safe
+ https://bugs.webkit.org/show_bug.cgi?id=230954
+
+ Reviewed by Alexey Proskuryakov.
+
+ Make WebLocalizedString() thread-safe. It takes minimal effort to make it thread-safe given
+ that the NSBundle API is thread-safe [1] and clients keep calling it on the background thread.
+
+ [1] https://developer.apple.com/documentation/foundation/nslocalizedstringwithdefaultvalue
+ "As of OS X 10.11 and iOS 9, NSBundle is thread-safe. As such, you can safely call
+ NSLocalizedStringWithDefaultValue from any execution context."
+
+ * Misc/WebLocalizableStrings.mm:
+
</ins><span class="cx"> 2021-09-22 Alan Coon <alancoon@apple.com>
</span><span class="cx">
</span><span class="cx"> Cherry-pick r282707. rdar://problem/83429953
</span></span></pre></div>
<a id="branchessafari612291branchSourceWebKitLegacymacMiscWebLocalizableStringsmm"></a>
<div class="modfile"><h4>Modified: branches/safari-612.2.9.1-branch/Source/WebKitLegacy/mac/Misc/WebLocalizableStrings.mm (283249 => 283250)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612.2.9.1-branch/Source/WebKitLegacy/mac/Misc/WebLocalizableStrings.mm 2021-09-29 19:43:45 UTC (rev 283249)
+++ branches/safari-612.2.9.1-branch/Source/WebKitLegacy/mac/Misc/WebLocalizableStrings.mm 2021-09-29 19:45:09 UTC (rev 283250)
</span><span class="lines">@@ -37,17 +37,13 @@
</span><span class="cx">
</span><span class="cx"> NSString *WebLocalizedString(WebLocalizableStringsBundle *stringsBundle, const char *key)
</span><span class="cx"> {
</span><del>- // This function is not thread-safe due at least to its unguarded use of the mainBundle static variable
- // and its use of [NSBundle localizedStringForKey:::], which is not guaranteed to be thread-safe. If
- // we decide we need to use this on background threads, we'll need to add locking here and make sure
- // it doesn't affect performance.
-#if !PLATFORM(IOS_FAMILY)
- ASSERT(isMainThread());
-#endif
-
</del><span class="cx"> NSBundle *bundle;
</span><span class="cx"> if (stringsBundle == NULL) {
</span><del>- static NeverDestroyed<RetainPtr<NSBundle>> mainBundle = [NSBundle mainBundle];
</del><ins>+ static LazyNeverDestroyed<RetainPtr<NSBundle>> mainBundle;
+ static std::once_flag flag;
+ std::call_once(flag, [] () {
+ mainBundle.construct([NSBundle mainBundle]);
+ });
</ins><span class="cx"> ASSERT(mainBundle.get());
</span><span class="cx"> bundle = mainBundle.get().get();
</span><span class="cx"> } else {
</span></span></pre>
</div>
</div>
</body>
</html>