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

[ap at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit 43c7ee8c9cb9bbc44cdfa26cf70933cef2b41562
Author: ap at apple.com <ap at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 23 21:28:47 2009 +0000

            Build fix.
    
            * platform/network/cf/SocketStreamHandleCFNet.cpp:
            (WebCore::SocketStreamHandle::pacExecutionCallbackMainThread): pacExecutionCallbackMainThread
            is static, so it can't use member variables directly.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51315 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 098cbf2..eabf017 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,13 @@
 2009-11-23  Alexey Proskuryakov  <ap at apple.com>
 
+        Build fix.
+
+        * platform/network/cf/SocketStreamHandleCFNet.cpp:
+        (WebCore::SocketStreamHandle::pacExecutionCallbackMainThread): pacExecutionCallbackMainThread
+        is static, so it can't use member variables directly.
+
+2009-11-23  Alexey Proskuryakov  <ap at apple.com>
+
         Reviewed by Brady Eidson.
 
         https://bugs.webkit.org/show_bug.cgi?id=31748
diff --git a/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp b/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp
index 8980ef4..8c6ff56 100644
--- a/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp
+++ b/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp
@@ -131,9 +131,8 @@ void SocketStreamHandle::pacExecutionCallback(void* client, CFArrayRef proxyList
 
 void SocketStreamHandle::pacExecutionCallbackMainThread(void* invocation)
 {
-    ASSERT(m_connectingSubstate == ExecutingPACFile);
-
     MainThreadPACCallbackInfo* info = static_cast<MainThreadPACCallbackInfo*>(invocation);
+    ASSERT(info->handle->m_connectingSubstate == ExecutingPACFile);
     // This time, the array won't have PAC as a first entry.
     info->handle->chooseProxyFromArray(info->proxyList);
     info->handle->createStreams();

-- 
WebKit Debian packaging