diff options
| author | Ben Murdoch <benm@google.com> | 2010-05-11 18:35:50 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-05-14 10:23:05 +0100 |
| commit | 21939df44de1705786c545cd1bf519d47250322d (patch) | |
| tree | ef56c310f5c0cdc379c2abb2e212308a3281ce20 /WebKit/mac/Misc/WebIconDatabase.mm | |
| parent | 4ff1d8891d520763f17675827154340c7c740f90 (diff) | |
| download | external_webkit-21939df44de1705786c545cd1bf519d47250322d.zip external_webkit-21939df44de1705786c545cd1bf519d47250322d.tar.gz external_webkit-21939df44de1705786c545cd1bf519d47250322d.tar.bz2 | |
Merge Webkit at r58956: Initial merge by Git.
Change-Id: I1d9fb60ea2c3f2ddc04c17a871acdb39353be228
Diffstat (limited to 'WebKit/mac/Misc/WebIconDatabase.mm')
| -rw-r--r-- | WebKit/mac/Misc/WebIconDatabase.mm | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/WebKit/mac/Misc/WebIconDatabase.mm b/WebKit/mac/Misc/WebIconDatabase.mm index 0ded0d5..f53bffa 100644 --- a/WebKit/mac/Misc/WebIconDatabase.mm +++ b/WebKit/mac/Misc/WebIconDatabase.mm @@ -42,6 +42,8 @@ #import <WebCore/IntSize.h> #import <WebCore/SharedBuffer.h> #import <WebCore/ThreadCheck.h> +#import <runtime/InitializeThreading.h> +#import <wtf/Threading.h> using namespace WebCore; @@ -88,6 +90,12 @@ static WebIconDatabaseClient* defaultClient() @implementation WebIconDatabase ++ (void)initialize +{ + JSC::initializeThreading(); + WTF::initializeMainThreadToProcessMainThread(); +} + + (WebIconDatabase *)sharedIconDatabase { static WebIconDatabase *database = nil; |