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

[andersca at apple.com]

The following commit has been merged in the debian/experimental branch:
commit efd3aafbe3965d1097cd403135f41c55a0a9cad9
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 1 23:42:13 2010 +0000

    Implement proxiesForURL, cookiesForURL and setCookiesForURL
    https://bugs.webkit.org/show_bug.cgi?id=47029
    
    Reviewed by Sam Weinig.
    
    * WebProcess/Plugins/PluginView.cpp:
    (WebKit::PluginView::proxiesForURL):
    (WebKit::PluginView::cookiesForURL):
    (WebKit::PluginView::setCookiesForURL):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68952 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 73ff052..c35a928 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,15 @@
+2010-10-01  Anders Carlsson  <andersca at apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Implement proxiesForURL, cookiesForURL and setCookiesForURL
+        https://bugs.webkit.org/show_bug.cgi?id=47029
+
+        * WebProcess/Plugins/PluginView.cpp:
+        (WebKit::PluginView::proxiesForURL):
+        (WebKit::PluginView::cookiesForURL):
+        (WebKit::PluginView::setCookiesForURL):
+
 2010-10-01  Sam Weinig  <sam at webkit.org>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebKit2/WebProcess/Plugins/PluginView.cpp b/WebKit2/WebProcess/Plugins/PluginView.cpp
index d7f4b2b..06f1fd7 100644
--- a/WebKit2/WebProcess/Plugins/PluginView.cpp
+++ b/WebKit2/WebProcess/Plugins/PluginView.cpp
@@ -30,6 +30,7 @@
 #include "WebEvent.h"
 #include "WebPage.h"
 #include <WebCore/Chrome.h>
+#include <WebCore/CookieJar.h>
 #include <WebCore/DocumentLoader.h>
 #include <WebCore/Event.h>
 #include <WebCore/FocusController.h>
@@ -40,6 +41,7 @@
 #include <WebCore/HTMLPlugInElement.h>
 #include <WebCore/HostWindow.h>
 #include <WebCore/NetscapePlugInStreamLoader.h>
+#include <WebCore/ProxyServer.h>
 #include <WebCore/RenderEmbeddedObject.h>
 #include <WebCore/RenderLayer.h>
 #include <WebCore/ScrollView.h>
@@ -826,19 +828,18 @@ HWND PluginView::nativeParentWindow()
 
 String PluginView::proxiesForURL(const String& urlString)
 {
-    // FIXME: Implement.
-    return String();
+    Vector<ProxyServer> proxyServers = proxyServersForURL(KURL(KURL(), urlString));
+    return toString(proxyServers);
 }
 
 String PluginView::cookiesForURL(const String& urlString)
 {
-    // FIXME: Implement.
-    return String();
+    return cookies(m_pluginElement->document(), KURL(KURL(), urlString));
 }
 
 void PluginView::setCookiesForURL(const String& urlString, const String& cookieString)
 {
-    // FIXME: Implement.
+    setCookies(m_pluginElement->document(), KURL(KURL(), urlString), cookieString);
 }
     
 void PluginView::didFinishLoad(WebFrame* webFrame)

-- 
WebKit Debian packaging