[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

[andersca at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit c50593fcdfae1b099b63705ef3a45ff9f1168450
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 22 02:03:05 2009 +0000

    Make sure that we check for the right thread.
    
    Reviewed by Sam Weinig.
    
    * platform/mac/WebCoreObjCExtras.mm:
    (WebCoreObjCScheduleDeallocateOnMainThread):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52469 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 39305ed..bf59b0a 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2009-12-21  Anders Carlsson  <andersca at apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Make sure that we check for the right thread.
+
+        * platform/mac/WebCoreObjCExtras.mm:
+        (WebCoreObjCScheduleDeallocateOnMainThread):
+
 2009-12-21  Enrica Casucci  <enrica at apple.com>
 
         Reviewed by Maciej Stachowiak.
diff --git a/WebCore/platform/mac/WebCoreObjCExtras.mm b/WebCore/platform/mac/WebCoreObjCExtras.mm
index cb8d504..4fc757c 100644
--- a/WebCore/platform/mac/WebCoreObjCExtras.mm
+++ b/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);

-- 
WebKit Debian packaging