2010-04-28 Simon Fraser <simon.fraser@apple.com>

smfr · smfr · commit ec0dc1fc43e8 · 2010-04-28T21:23:19.000Z
Reviewed by Sam Weinig. <rdar://problem/7918719> ASSERT(isMainThread()) from Font::setShouldUseSmoothing() Ensure that the WebView +initialize method initializes threading, so that things are correctly initialized when the first call into the WebKit framework is via a WebView class method. * WebView/WebView.mm: (+[WebView initialize]): Canonical link: https://commits.webkit.org/49701@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@58432 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
@@ -1,3 +1,15 @@
+2010-04-28  Simon Fraser  <simon.fraser@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        <rdar://problem/7918719> ASSERT(isMainThread()) from Font::setShouldUseSmoothing()
+        
+        Ensure that the WebView +initialize method initializes threading, so that things are correctly
+        initialized when the first call into the WebKit framework is via a WebView class method.
+
+        * WebView/WebView.mm:
+        (+[WebView initialize]):
+
 2010-04-28  Darin Adler  <darin@apple.com>
 
         Reviewed by Adele Peterson.
diff --git a/WebKit/mac/WebView/WebView.mm b/WebKit/mac/WebView/WebView.mm
@@ -158,13 +158,15 @@
 #import <objc/objc-runtime.h>
 #import <runtime/ArrayPrototype.h>
 #import <runtime/DateInstance.h>
+#import <runtime/InitializeThreading.h>
 #import <runtime/JSLock.h>
 #import <runtime/JSValue.h>
 #import <wtf/Assertions.h>
 #import <wtf/HashTraits.h>
 #import <wtf/RefCountedLeakCounter.h>
 #import <wtf/RefPtr.h>
 #import <wtf/StdLibExtras.h>
+#import <wtf/Threading.h>
 
 #if ENABLE(DASHBOARD_SUPPORT)
 #import <WebKit/WebDashboardRegion.h>
@@ -2458,6 +2460,8 @@ + (void)initialize
     initialized = YES;
 
     InitWebCoreSystemInterface();
+    JSC::initializeThreading();
+    WTF::initializeMainThreadToProcessMainThread();
 
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_applicationWillTerminate) name:NSApplicationWillTerminateNotification object:NSApp];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_preferencesChangedNotification:) name:WebPreferencesChangedNotification object:nil];
