[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 bf6ff4d339b15dd9f27e352d6c9a656913c16d6d
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 29 21:24:05 2010 +0000

    Add GetWindowScriptNPObject message
    https://bugs.webkit.org/show_bug.cgi?id=48670
    
    Reviewed by Adam Roben.
    
    * PluginProcess/PluginControllerProxy.cpp:
    (WebKit::PluginControllerProxy::windowScriptNPObject):
    Send the GetWindowScriptNPObject message.
    
    * WebProcess/Plugins/PluginProxy.cpp:
    (WebKit::PluginProxy::getWindowScriptNPObject):
    Add stub.
    
    * WebProcess/Plugins/PluginProxy.messages.in:
    Add GetWindowScriptNPObject message.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70927 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index c3d3e0a..f9edce3 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,5 +1,23 @@
 2010-10-29  Anders Carlsson  <andersca at apple.com>
 
+        Reviewed by Adam Roben.
+
+        Add GetWindowScriptNPObject message
+        https://bugs.webkit.org/show_bug.cgi?id=48670
+
+        * PluginProcess/PluginControllerProxy.cpp:
+        (WebKit::PluginControllerProxy::windowScriptNPObject):
+        Send the GetWindowScriptNPObject message.
+
+        * WebProcess/Plugins/PluginProxy.cpp:
+        (WebKit::PluginProxy::getWindowScriptNPObject):
+        Add stub.
+
+        * WebProcess/Plugins/PluginProxy.messages.in:
+        Add GetWindowScriptNPObject message.
+
+2010-10-29  Anders Carlsson  <andersca at apple.com>
+
         Reviewed by Dan Bernstein.
 
         Change the Connection::sendSync timeout parameter to have the NoTimeout argument as a default
diff --git a/WebKit2/PluginProcess/PluginControllerProxy.cpp b/WebKit2/PluginProcess/PluginControllerProxy.cpp
index ec5f665..f780e19 100644
--- a/WebKit2/PluginProcess/PluginControllerProxy.cpp
+++ b/WebKit2/PluginProcess/PluginControllerProxy.cpp
@@ -161,6 +161,15 @@ void PluginControllerProxy::cancelManualStreamLoad()
 
 NPObject* PluginControllerProxy::windowScriptNPObject()
 {
+    uint64_t windowScriptNPObjectID = 0;
+
+    if (!m_connection->connection()->sendSync(Messages::PluginProxy::GetWindowScriptNPObject(), Messages::PluginProxy::GetWindowScriptNPObject::Reply(windowScriptNPObjectID), m_pluginInstanceID))
+        return 0;
+
+    if (!windowScriptNPObjectID)
+        return 0;
+
+    // FIXME: Do something with the windowScriptNPObjectID.
     notImplemented();
     return 0;
 }
diff --git a/WebKit2/WebProcess/Plugins/PluginProxy.cpp b/WebKit2/WebProcess/Plugins/PluginProxy.cpp
index 755c0c9..91167f2 100644
--- a/WebKit2/WebProcess/Plugins/PluginProxy.cpp
+++ b/WebKit2/WebProcess/Plugins/PluginProxy.cpp
@@ -342,7 +342,13 @@ void PluginProxy::setCookiesForURL(const String& urlString, const String& cookie
 {
     m_pluginController->setCookiesForURL(urlString, cookieString);
 }
-    
+
+void PluginProxy::getWindowScriptNPObject(uint64_t& windowScriptNPObjectID)
+{
+    // FIXME: Actually get the window script object here.
+    windowScriptNPObjectID = 0;
+}
+
 void PluginProxy::update(const IntRect& paintedRect)
 {
     if (paintedRect == m_frameRect)
diff --git a/WebKit2/WebProcess/Plugins/PluginProxy.h b/WebKit2/WebProcess/Plugins/PluginProxy.h
index ce2d84b..93bc7a0 100644
--- a/WebKit2/WebProcess/Plugins/PluginProxy.h
+++ b/WebKit2/WebProcess/Plugins/PluginProxy.h
@@ -97,7 +97,8 @@ private:
     void proxiesForURL(const String& urlString, String& proxyString);
     void cookiesForURL(const String& urlString, String& cookieString);
     void setCookiesForURL(const String& urlString, const String& cookieString);
-    
+    void getWindowScriptNPObject(uint64_t& windowScriptNPObjectID);
+
     RefPtr<PluginProcessConnection> m_connection;
     uint64_t m_pluginInstanceID;
 
diff --git a/WebKit2/WebProcess/Plugins/PluginProxy.messages.in b/WebKit2/WebProcess/Plugins/PluginProxy.messages.in
index 39de361..3a844f2 100644
--- a/WebKit2/WebProcess/Plugins/PluginProxy.messages.in
+++ b/WebKit2/WebProcess/Plugins/PluginProxy.messages.in
@@ -37,6 +37,9 @@ messages -> PluginProxy {
 
     # Sets the cookies for the given URL.
     SetCookiesForURL(WTF::String urlString, WTF::String cookieString)
+
+    # Gets a reference to the window NPObject.
+    GetWindowScriptNPObject() -> (uint64_t windowScriptNPObjectID)
 }
 
 #endif

-- 
WebKit Debian packaging