Title: [164903] trunk/Source/WebCore
- Revision
- 164903
- Author
- wei...@apple.com
- Date
- 2014-02-28 19:11:49 -0800 (Fri, 28 Feb 2014)
Log Message
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.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (164902 => 164903)
--- 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)
@@ -1,3 +1,18 @@
+2014-02-28 Sam Weinig <s...@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.
+
2014-02-28 Dean Jackson <d...@apple.com>
Crash at ebay.com when viewing auction items at com.apple.WebCore: WebCore::GraphicsContext3D::getExtensions + 10
Modified: trunk/Source/WebCore/platform/mac/Language.mm (164902 => 164903)
--- 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)
@@ -28,28 +28,49 @@
#import "BlockExceptions.h"
#import "WebCoreSystemInterface.h"
+#import <mutex>
#import <wtf/Assertions.h>
-#import <wtf/MainThread.h>
+#import <wtf/NeverDestroyed.h>
#import <wtf/RetainPtr.h>
#import <wtf/text/WTFString.h>
-using namespace WebCore;
+namespace WebCore {
-static BOOL useCachedPreferredLanguages;
+static std::mutex& preferredLanguagesMutex()
+{
+ static dispatch_once_t onceToken;
+ static std::mutex* mutex;
-@interface WebLanguageChangeObserver : NSObject {
+ dispatch_once(&onceToken, ^{
+ mutex = std::make_unique<std::mutex>().release();
+ });
+
+ return *mutex;
}
+
+static Vector<String>& preferredLanguages()
+{
+ static NeverDestroyed<Vector<String>> languages;
+ return languages;
+}
+
+}
+
+@interface WebLanguageChangeObserver : NSObject
@end
@implementation WebLanguageChangeObserver
-+ (void)_webkit_languagePreferencesDidChange
++ (void)languagePreferencesDidChange:(NSNotification *)notification
{
- ASSERT(isMainThread());
+ UNUSED_PARAM(notification);
- useCachedPreferredLanguages = NO;
+ {
+ std::lock_guard<std::mutex> lock(WebCore::preferredLanguagesMutex());
+ WebCore::preferredLanguages().clear();
+ }
- languageDidChange();
+ WebCore::languageDidChange();
}
@end
@@ -58,8 +79,6 @@
static String httpStyleLanguageCode(NSString *languageCode)
{
- ASSERT(isMainThread());
-
// Look up the language code using CFBundle.
RetainPtr<CFStringRef> preferredLanguageCode = adoptCF(wkCopyCFLocalizationPreferredName((CFStringRef)languageCode));
@@ -81,16 +100,19 @@
Vector<String> platformUserPreferredLanguages()
{
- DEFINE_STATIC_LOCAL(Vector<String>, userPreferredLanguages, ());
+#if PLATFORM(MAC)
+ static dispatch_once_t onceToken;
+ dispatch_once(&onceToken, ^{
+ [[NSDistributedNotificationCenter defaultCenter] addObserver:[WebLanguageChangeObserver self] selector:@selector(languagePreferencesDidChange:) name:@"AppleLanguagePreferencesChangedNotification" object:nil];
+ });
+#endif
- ASSERT(isMainThread());
-
BEGIN_BLOCK_OBJC_EXCEPTIONS;
- if (!useCachedPreferredLanguages) {
- useCachedPreferredLanguages = YES;
- userPreferredLanguages.clear();
+ std::lock_guard<std::mutex> lock(preferredLanguagesMutex());
+ Vector<String>& userPreferredLanguages = preferredLanguages();
+ if (userPreferredLanguages.isEmpty()) {
RetainPtr<CFArrayRef> languages = adoptCF(CFLocaleCopyPreferredLanguages());
CFIndex languageCount = CFArrayGetCount(languages.get());
if (!languageCount)
@@ -101,19 +123,14 @@
}
}
-#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;
+ Vector<String> userPreferredLanguagesCopy;
+ userPreferredLanguagesCopy.reserveInitialCapacity(userPreferredLanguages.size());
+ for (auto& language : userPreferredLanguages)
+ userPreferredLanguagesCopy.uncheckedAppend(language.isolatedCopy());
+
+ return userPreferredLanguagesCopy;
+
END_BLOCK_OBJC_EXCEPTIONS;
return Vector<String>();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
