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

[weinig at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 946d6161f62879ec832e10bb015026698074e5ec
Author: weinig at apple.com <weinig at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 10 00:23:30 2009 +0000

    Roll out 51919 and 51920. They were incorrect and unnecessary right now.
    
    * platform/mac/WebCoreObjCExtras.mm:
    (WebCoreObjCScheduleDeallocateOnMainThread):
    * platform/network/mac/NetworkStateNotifierMac.cpp:
    (WebCore::NetworkStateNotifier::NetworkStateNotifier):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51931 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 420996c..76231e5 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2009-12-09  Sam Weinig  <sam at webkit.org>
+
+        Roll out 51919 and 51920. They were incorrect and unnecessary right now.
+
+        * platform/mac/WebCoreObjCExtras.mm:
+        (WebCoreObjCScheduleDeallocateOnMainThread):
+        * platform/network/mac/NetworkStateNotifierMac.cpp:
+        (WebCore::NetworkStateNotifier::NetworkStateNotifier):
+
 2009-12-09  Steve Block  <steveblock at google.com>
 
         Reviewed by Darin Fisher.
diff --git a/WebCore/platform/mac/WebCoreObjCExtras.mm b/WebCore/platform/mac/WebCoreObjCExtras.mm
index ea9b9e8..cb8d504 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 (isMainThread())
+    if (pthread_main_np() != 0)
         return false;
     
     ClassAndIdPair* pair = new ClassAndIdPair(cls, object);
diff --git a/WebCore/platform/network/mac/NetworkStateNotifierMac.cpp b/WebCore/platform/network/mac/NetworkStateNotifierMac.cpp
index f36ff1c..2045eb3 100644
--- a/WebCore/platform/network/mac/NetworkStateNotifierMac.cpp
+++ b/WebCore/platform/network/mac/NetworkStateNotifierMac.cpp
@@ -28,6 +28,11 @@
 
 #include <SystemConfiguration/SystemConfiguration.h>
 
+#ifdef BUILDING_ON_TIGER 
+// This function is available on Tiger, but not declared in the CFRunLoop.h header on Tiger. 
+extern "C" CFRunLoopRef CFRunLoopGetMain(); 
+#endif 
+
 namespace WebCore {
 
 static const double StateChangeTimerInterval = 2.0;
@@ -108,7 +113,7 @@ NetworkStateNotifier::NetworkStateNotifier()
     if (!configSource)
         return;
 
-    CFRunLoopAddSource(CFRunLoopGetCurrent(), configSource.get(), kCFRunLoopCommonModes);
+    CFRunLoopAddSource(CFRunLoopGetMain(), configSource.get(), kCFRunLoopCommonModes);
     
     RetainPtr<CFMutableArrayRef> keys(AdoptCF, CFArrayCreateMutable(0, 0, &kCFTypeArrayCallBacks));
     RetainPtr<CFMutableArrayRef> patterns(AdoptCF, CFArrayCreateMutable(0, 0, &kCFTypeArrayCallBacks));

-- 
WebKit Debian packaging