[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
andersca at apple.com
andersca at apple.com
Wed Dec 22 14:03:38 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit ca48616b01430c0c9a75c0eccdfe33d7e2e9d31f
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Oct 2 00:11:08 2010 +0000
Fix Snow Leopard build.
* Plugins/Hosted/NetscapePluginInstanceProxy.mm:
(WebKit::NetscapePluginInstanceProxy::getProxy):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68956 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index da26c37..2f6f22c 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,5 +1,12 @@
2010-10-01 Anders Carlsson <andersca at apple.com>
+ Fix Snow Leopard build.
+
+ * Plugins/Hosted/NetscapePluginInstanceProxy.mm:
+ (WebKit::NetscapePluginInstanceProxy::getProxy):
+
+2010-10-01 Anders Carlsson <andersca at apple.com>
+
Reviewed by Dan Bernstein.
Add proxy server query function proxyServersForURL and change the Mac plug-in code to use it
diff --git a/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm b/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm
index 6ad0ae3..1a2b8a1 100644
--- a/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm
+++ b/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm
@@ -1558,7 +1558,7 @@ bool NetscapePluginInstanceProxy::getProxy(data_t urlData, mach_msg_type_number_
if (!url)
return false;
- Vector<ProxyServer> proxyServers = proxyServersForURL(URL);
+ Vector<ProxyServer> proxyServers = proxyServersForURL(url);
WTF::CString proxyStringUTF8 = toString(proxyServers).utf8();
proxyLength = proxyStringUTF8.length();
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list