<!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>[164903] trunk/Source/WebCore</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/164903">164903</a></dd>
<dt>Author</dt> <dd>weinig@apple.com</dd>
<dt>Date</dt> <dd>2014-02-28 19:11:49 -0800 (Fri, 28 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>ASSERT(isMainThread()) hit under platformUserPreferredLanguages() with WebKit1 and WebKit2 in the same process
https://bugs.webkit.org/show_bug.cgi?id=129528
Reviewed by Andreas Kling.
* platform/mac/Language.mm:
(WebCore::preferredLanguagesMutex):
(WebCore::preferredLanguages):
(+[WebLanguageChangeObserver languagePreferencesDidChange:]):
(WebCore::httpStyleLanguageCode):
(WebCore::platformUserPreferredLanguages):
Add a mutex and do an isolated copy of the strings to allow this function to be called from multiple threads.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformmacLanguagemm">trunk/Source/WebCore/platform/mac/Language.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (164902 => 164903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-01 02:51:39 UTC (rev 164902)
+++ trunk/Source/WebCore/ChangeLog 2014-03-01 03:11:49 UTC (rev 164903)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-02-28 Sam Weinig <sam@webkit.org>
+
+ ASSERT(isMainThread()) hit under platformUserPreferredLanguages() with WebKit1 and WebKit2 in the same process
+ https://bugs.webkit.org/show_bug.cgi?id=129528
+
+ Reviewed by Andreas Kling.
+
+ * platform/mac/Language.mm:
+ (WebCore::preferredLanguagesMutex):
+ (WebCore::preferredLanguages):
+ (+[WebLanguageChangeObserver languagePreferencesDidChange:]):
+ (WebCore::httpStyleLanguageCode):
+ (WebCore::platformUserPreferredLanguages):
+ Add a mutex and do an isolated copy of the strings to allow this function to be called from multiple threads.
+
</ins><span class="cx"> 2014-02-28 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> Crash at ebay.com when viewing auction items at com.apple.WebCore: WebCore::GraphicsContext3D::getExtensions + 10
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacLanguagemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/Language.mm (164902 => 164903)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/Language.mm 2014-03-01 02:51:39 UTC (rev 164902)
+++ trunk/Source/WebCore/platform/mac/Language.mm 2014-03-01 03:11:49 UTC (rev 164903)
</span><span class="lines">@@ -28,28 +28,49 @@
</span><span class="cx">
</span><span class="cx"> #import "BlockExceptions.h"
</span><span class="cx"> #import "WebCoreSystemInterface.h"
</span><ins>+#import <mutex>
</ins><span class="cx"> #import <wtf/Assertions.h>
</span><del>-#import <wtf/MainThread.h>
</del><ins>+#import <wtf/NeverDestroyed.h>
</ins><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx"> #import <wtf/text/WTFString.h>
</span><span class="cx">
</span><del>-using namespace WebCore;
</del><ins>+namespace WebCore {
</ins><span class="cx">
</span><del>-static BOOL useCachedPreferredLanguages;
</del><ins>+static std::mutex& preferredLanguagesMutex()
+{
+ static dispatch_once_t onceToken;
+ static std::mutex* mutex;
</ins><span class="cx">
</span><del>-@interface WebLanguageChangeObserver : NSObject {
</del><ins>+ dispatch_once(&onceToken, ^{
+ mutex = std::make_unique<std::mutex>().release();
+ });
+
+ return *mutex;
</ins><span class="cx"> }
</span><ins>+
+static Vector<String>& preferredLanguages()
+{
+ static NeverDestroyed<Vector<String>> languages;
+ return languages;
+}
+
+}
+
+@interface WebLanguageChangeObserver : NSObject
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @implementation WebLanguageChangeObserver
</span><span class="cx">
</span><del>-+ (void)_webkit_languagePreferencesDidChange
</del><ins>++ (void)languagePreferencesDidChange:(NSNotification *)notification
</ins><span class="cx"> {
</span><del>- ASSERT(isMainThread());
</del><ins>+ UNUSED_PARAM(notification);
</ins><span class="cx">
</span><del>- useCachedPreferredLanguages = NO;
</del><ins>+ {
+ std::lock_guard<std::mutex> lock(WebCore::preferredLanguagesMutex());
+ WebCore::preferredLanguages().clear();
+ }
</ins><span class="cx">
</span><del>- languageDidChange();
</del><ins>+ WebCore::languageDidChange();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="lines">@@ -58,8 +79,6 @@
</span><span class="cx">
</span><span class="cx"> static String httpStyleLanguageCode(NSString *languageCode)
</span><span class="cx"> {
</span><del>- ASSERT(isMainThread());
-
</del><span class="cx"> // Look up the language code using CFBundle.
</span><span class="cx"> RetainPtr<CFStringRef> preferredLanguageCode = adoptCF(wkCopyCFLocalizationPreferredName((CFStringRef)languageCode));
</span><span class="cx">
</span><span class="lines">@@ -81,16 +100,19 @@
</span><span class="cx">
</span><span class="cx"> Vector<String> platformUserPreferredLanguages()
</span><span class="cx"> {
</span><del>- DEFINE_STATIC_LOCAL(Vector<String>, userPreferredLanguages, ());
</del><ins>+#if PLATFORM(MAC)
+ static dispatch_once_t onceToken;
+ dispatch_once(&onceToken, ^{
+ [[NSDistributedNotificationCenter defaultCenter] addObserver:[WebLanguageChangeObserver self] selector:@selector(languagePreferencesDidChange:) name:@"AppleLanguagePreferencesChangedNotification" object:nil];
+ });
+#endif
</ins><span class="cx">
</span><del>- ASSERT(isMainThread());
-
</del><span class="cx"> BEGIN_BLOCK_OBJC_EXCEPTIONS;
</span><span class="cx">
</span><del>- if (!useCachedPreferredLanguages) {
- useCachedPreferredLanguages = YES;
- userPreferredLanguages.clear();
</del><ins>+ std::lock_guard<std::mutex> lock(preferredLanguagesMutex());
+ Vector<String>& userPreferredLanguages = preferredLanguages();
</ins><span class="cx">
</span><ins>+ if (userPreferredLanguages.isEmpty()) {
</ins><span class="cx"> RetainPtr<CFArrayRef> languages = adoptCF(CFLocaleCopyPreferredLanguages());
</span><span class="cx"> CFIndex languageCount = CFArrayGetCount(languages.get());
</span><span class="cx"> if (!languageCount)
</span><span class="lines">@@ -101,19 +123,14 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !PLATFORM(IOS)
- static bool languageChangeObserverAdded;
- if (!languageChangeObserverAdded) {
- [[NSDistributedNotificationCenter defaultCenter] addObserver:[WebLanguageChangeObserver self]
- selector:@selector(_webkit_languagePreferencesDidChange)
- name:@"AppleLanguagePreferencesChangedNotification"
- object:nil];
- languageChangeObserverAdded = true;
- }
-#endif // !PLATFORM(IOS)
-
- return userPreferredLanguages;
</del><ins>+ Vector<String> userPreferredLanguagesCopy;
+ userPreferredLanguagesCopy.reserveInitialCapacity(userPreferredLanguages.size());
</ins><span class="cx">
</span><ins>+ for (auto& language : userPreferredLanguages)
+ userPreferredLanguagesCopy.uncheckedAppend(language.isolatedCopy());
+
+ return userPreferredLanguagesCopy;
+
</ins><span class="cx"> END_BLOCK_OBJC_EXCEPTIONS;
</span><span class="cx">
</span><span class="cx"> return Vector<String>();
</span></span></pre>
</div>
</div>
</body>
</html>