[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[weinig at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit 6fcbfaa37e06551a7637f3716bfca0ac6d871389
Author: weinig at apple.com <weinig at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 9 21:55:13 2009 +0000

    Use isMainThread() helper instead of pthread_main_np() != 0.
    
    Reviewed by Anders Carlsson.
    
    * platform/mac/WebCoreObjCExtras.mm:
    (WebCoreObjCScheduleDeallocateOnMainThread):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51919 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index f846e9a..ce34cac 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,15 @@
 
         Reviewed by Anders Carlsson.
 
+        Use isMainThread() helper instead of pthread_main_np() != 0.
+
+        * platform/mac/WebCoreObjCExtras.mm:
+        (WebCoreObjCScheduleDeallocateOnMainThread):
+
+2009-12-09  Sam Weinig  <sam at webkit.org>
+
+        Reviewed by Anders Carlsson.
+
         Add some #ifdefs to allow us to experiment with a single NSView mac WebKit.
 
         * page/Chrome.h:
diff --git a/WebCore/platform/mac/WebCoreObjCExtras.mm b/WebCore/platform/mac/WebCoreObjCExtras.mm
index cb8d504..ea9b9e8 100644
--- a/WebCore/platform/mac/WebCoreObjCExtras.mm
+++ b/WebCore/platform/mac/WebCoreObjCExtras.mm
@@ -72,7 +72,7 @@ bool WebCoreObjCScheduleDeallocateOnMainThread(Class cls, id object)
 {
     ASSERT([object isKindOfClass:cls]);
     
-    if (pthread_main_np() != 0)
+    if (isMainThread())
         return false;
     
     ClassAndIdPair* pair = new ClassAndIdPair(cls, object);

-- 
WebKit Debian packaging