2010-10-14 Simon Fraser <simon.fraser@apple.com>
authorsimon.fraser@apple.com <simon.fraser@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 14 Oct 2010 22:56:16 +0000 (22:56 +0000)
committersimon.fraser@apple.com <simon.fraser@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 14 Oct 2010 22:56:16 +0000 (22:56 +0000)
        Fix the build after r69808.

        * WebCore.xcodeproj/project.pbxproj:
        * platform/network/cf/ProxyServerCFNet.cpp:
        (WebCore::proxyServersForURL):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@69811 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog
WebCore/WebCore.exp.in
WebCore/WebCore.xcodeproj/project.pbxproj
WebCore/platform/network/cf/ProxyServerCFNet.cpp

index e6acb80..124ca21 100644 (file)
@@ -1,3 +1,11 @@
+2010-10-14  Simon Fraser  <simon.fraser@apple.com>
+
+        Fix the build after r69808.
+        
+        * WebCore.xcodeproj/project.pbxproj:
+        * platform/network/cf/ProxyServerCFNet.cpp:
+        (WebCore::proxyServersForURL):
+
 2010-10-14  Gavin Barraclough  <barraclough@apple.com>
 
         Windows build fix following r69806.
index fcb0efd..a2882c3 100644 (file)
@@ -422,7 +422,7 @@ __ZN7WebCore17openTemporaryFileEPKcRi
 __ZN7WebCore18SearchPopupMenuMacC1EPNS_15PopupMenuClientE
 __ZN7WebCore18isStartOfParagraphERKNS_15VisiblePositionE
 __ZN7WebCore18pluginScriptObjectEPN3JSC9ExecStateEPNS_13JSHTMLElementE
-__ZN7WebCore18proxyServersForURLERKNS_4KURLE
+__ZN7WebCore18proxyServersForURLERKNS_4KURLEPKNS_17NetworkingContextE
 __ZN7WebCore19AnimationController16resumeAnimationsEPNS_8DocumentE
 __ZN7WebCore19AnimationController17suspendAnimationsEPNS_8DocumentE
 __ZN7WebCore19AnimationController20pauseAnimationAtTimeEPNS_12RenderObjectERKN3WTF6StringEd
index e10bef0..98b4e2a 100644 (file)
                        isa = PBXProject;
                        buildConfigurationList = 149C284308902B11008A9EFC /* Build configuration list for PBXProject "WebCore" */;
                        compatibilityVersion = "Xcode 2.4";
+                       developmentRegion = English;
                        hasScannedForEncodings = 1;
                        knownRegions = (
                                English,
index 9720695..3bef808 100644 (file)
@@ -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>();