[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 91e3e83b806db2b17c82c554863e85d4488f56b0
Author: weinig at apple.com <weinig at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 9 21:57:43 2009 +0000

    Use the current run loop instead of the main runloop for the NetworkStateNotifier.
    
    Reviewed by Anders Carlsson.
    
    * platform/network/mac/NetworkStateNotifierMac.cpp:
    (WebCore::NetworkStateNotifier::NetworkStateNotifier):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51920 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index ce34cac..8d4fbe8 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,15 @@
 
         Reviewed by Anders Carlsson.
 
+        Use the current run loop instead of the main runloop for the NetworkStateNotifier.
+
+        * platform/network/mac/NetworkStateNotifierMac.cpp:
+        (WebCore::NetworkStateNotifier::NetworkStateNotifier):
+
+2009-12-09  Sam Weinig  <sam at webkit.org>
+
+        Reviewed by Anders Carlsson.
+
         Use isMainThread() helper instead of pthread_main_np() != 0.
 
         * platform/mac/WebCoreObjCExtras.mm:
diff --git a/WebCore/platform/network/mac/NetworkStateNotifierMac.cpp b/WebCore/platform/network/mac/NetworkStateNotifierMac.cpp
index c0918a4..f36ff1c 100644
--- a/WebCore/platform/network/mac/NetworkStateNotifierMac.cpp
+++ b/WebCore/platform/network/mac/NetworkStateNotifierMac.cpp
@@ -28,11 +28,6 @@
 
 #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;
@@ -113,7 +108,7 @@ NetworkStateNotifier::NetworkStateNotifier()
     if (!configSource)
         return;
 
-    CFRunLoopAddSource(CFRunLoopGetMain(), configSource.get(), kCFRunLoopCommonModes);
+    CFRunLoopAddSource(CFRunLoopGetCurrent(), configSource.get(), kCFRunLoopCommonModes);
     
     RetainPtr<CFMutableArrayRef> keys(AdoptCF, CFArrayCreateMutable(0, 0, &kCFTypeArrayCallBacks));
     RetainPtr<CFMutableArrayRef> patterns(AdoptCF, CFArrayCreateMutable(0, 0, &kCFTypeArrayCallBacks));

-- 
WebKit Debian packaging