diff options
Diffstat (limited to 'src/3rdparty/webkit/WebCore/platform/mac/WebCoreObjCExtras.mm')
| -rw-r--r-- | src/3rdparty/webkit/WebCore/platform/mac/WebCoreObjCExtras.mm | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/3rdparty/webkit/WebCore/platform/mac/WebCoreObjCExtras.mm b/src/3rdparty/webkit/WebCore/platform/mac/WebCoreObjCExtras.mm index cb8d5048db..4fc757ca9d 100644 --- a/src/3rdparty/webkit/WebCore/platform/mac/WebCoreObjCExtras.mm +++ b/src/3rdparty/webkit/WebCore/platform/mac/WebCoreObjCExtras.mm @@ -72,8 +72,13 @@ bool WebCoreObjCScheduleDeallocateOnMainThread(Class cls, id object) { ASSERT([object isKindOfClass:cls]); +#if USE(WEB_THREAD) + if (isMainThread()) + return false; +#else if (pthread_main_np() != 0) return false; +#endif ClassAndIdPair* pair = new ClassAndIdPair(cls, object); callOnMainThread(deallocCallback, pair); |