[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[simon.fraser at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 161ad742d663520642a1712a2f1e2c567b03b946
Author: simon.fraser at apple.com <simon.fraser at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 14 22:56:16 2010 +0000

    2010-10-14  Simon Fraser  <simon.fraser at apple.com>
    
            Fix the build after r69808.
    
            * WebCore.xcodeproj/project.pbxproj:
            * platform/network/cf/ProxyServerCFNet.cpp:
            (WebCore::proxyServersForURL):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69811 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index e6acb80..124ca21 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,11 @@
+2010-10-14  Simon Fraser  <simon.fraser at apple.com>
+
+        Fix the build after r69808.
+        
+        * WebCore.xcodeproj/project.pbxproj:
+        * platform/network/cf/ProxyServerCFNet.cpp:
+        (WebCore::proxyServersForURL):
+
 2010-10-14  Gavin Barraclough  <barraclough at apple.com>
 
         Windows build fix following r69806.
diff --git a/WebCore/WebCore.exp.in b/WebCore/WebCore.exp.in
index fcb0efd..a2882c3 100644
--- a/WebCore/WebCore.exp.in
+++ b/WebCore/WebCore.exp.in
@@ -422,7 +422,7 @@ __ZN7WebCore17openTemporaryFileEPKcRi
 __ZN7WebCore18SearchPopupMenuMacC1EPNS_15PopupMenuClientE
 __ZN7WebCore18isStartOfParagraphERKNS_15VisiblePositionE
 __ZN7WebCore18pluginScriptObjectEPN3JSC9ExecStateEPNS_13JSHTMLElementE
-__ZN7WebCore18proxyServersForURLERKNS_4KURLE
+__ZN7WebCore18proxyServersForURLERKNS_4KURLEPKNS_17NetworkingContextE
 __ZN7WebCore19AnimationController16resumeAnimationsEPNS_8DocumentE
 __ZN7WebCore19AnimationController17suspendAnimationsEPNS_8DocumentE
 __ZN7WebCore19AnimationController20pauseAnimationAtTimeEPNS_12RenderObjectERKN3WTF6StringEd
diff --git a/WebCore/WebCore.xcodeproj/project.pbxproj b/WebCore/WebCore.xcodeproj/project.pbxproj
index e10bef0..98b4e2a 100644
--- a/WebCore/WebCore.xcodeproj/project.pbxproj
+++ b/WebCore/WebCore.xcodeproj/project.pbxproj
@@ -21128,6 +21128,7 @@
 			isa = PBXProject;
 			buildConfigurationList = 149C284308902B11008A9EFC /* Build configuration list for PBXProject "WebCore" */;
 			compatibilityVersion = "Xcode 2.4";
+			developmentRegion = English;
 			hasScannedForEncodings = 1;
 			knownRegions = (
 				English,
diff --git a/WebCore/platform/network/cf/ProxyServerCFNet.cpp b/WebCore/platform/network/cf/ProxyServerCFNet.cpp
index 9720695..3bef808 100644
--- a/WebCore/platform/network/cf/ProxyServerCFNet.cpp
+++ b/WebCore/platform/network/cf/ProxyServerCFNet.cpp
@@ -88,7 +88,7 @@ Vector<ProxyServer> proxyServersForURL(const KURL& url, const NetworkingContext*
     
 }
 #else
-Vector<ProxyServer> proxyServersForURL(const KURL&)
+Vector<ProxyServer> proxyServersForURL(const KURL&, const NetworkingContext*)
 {
     // FIXME: Implement.
     return Vector<ProxyServer>();

-- 
WebKit Debian packaging