[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[rjw]

The following commit has been merged in the debian/unstable branch:
commit f28e4f46d17182a2f02a993ffd406674c85402c8
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Mar 10 21:50:02 2004 +0000

    	Updated header to include proposed changes from
    	plugin-futures list.  Calls from plugin to JavaScript
    	are now asynchronous.
    
            Reviewed by Chris.
    
            * bindings/NP_runtime.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6197 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 7d23565..1209a52 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,13 @@
+2004-03-10  Richard Williamson   <rjw at apple.com>
+
+	Updated header to include proposed changes from
+	plugin-futures list.  Calls from plugin to JavaScript
+	are now asynchronous.
+
+        Reviewed by Chris.
+
+        * bindings/NP_runtime.h:
+
 === Safari-131 ===
 
 2004-03-04  Richard Williamson   <rjw at apple.com>
diff --git a/JavaScriptCore/bindings/npruntime.h b/JavaScriptCore/bindings/npruntime.h
index 04be188..f613476 100644
--- a/JavaScriptCore/bindings/npruntime.h
+++ b/JavaScriptCore/bindings/npruntime.h
@@ -21,6 +21,14 @@
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
+ *
+ * Revision 1 (March 4, 2004):
+ * Initial proposal.
+ *
+ * Revision 2 (March 10, 2004):
+ * All calls into JavaScript were made asynchronous.  Results are
+ * provided via the NP_JavaScriptResultInterface callback.
+ *
  */
 #ifndef _NP_RUNTIME_H_
 #define _NP_RUNTIME_H_
@@ -188,14 +196,24 @@ typedef NP_Object NP_String;
 
 /*
     Functions to access JavaScript Objects represented by NP_JavaScriptObject.
+    
+    Calls to JavaScript objects are asynchronous.  If a function returns a value, it
+    will be supplied via the NP_JavaScriptResultInterface callback.
+    
+    Calls made from plugin code to JavaScript may be made from any thread.
+    
+    Calls made from JavaScript to the plugin will always be made on the main
+    user agent thread, this include calls to NP_JavaScriptResultInterface callbacks.
 */
-NP_Object *NP_Call (NP_JavaScriptObject *obj, NP_Identifier methodName, NP_Object **args, unsigned argCount);
-NP_Object *NP_Evaluate (NP_JavaScriptObject *obj, NP_String *script);
-NP_Object *NP_GetProperty (NP_JavaScriptObject *obj, NP_Identifier  propertyName);
+typedef void (*NP_JavaScriptResultInterface)(NP_Object *obj);
+
+void NP_Call (NP_JavaScriptObject *obj, NP_Identifier methodName, NP_Object **args, unsigned argCount, NP_JavaScriptResultInterface result);
+void NP_Evaluate (NP_JavaScriptObject *obj, NP_String *script, NP_JavaScriptResultInterface result);
+void NP_GetProperty (NP_JavaScriptObject *obj, NP_Identifier  propertyName, NP_JavaScriptResultInterface);
 void NP_SetProperty (NP_JavaScriptObject *obj, NP_Identifier  propertyName, NP_Object *value);
 void NP_RemoveProperty (NP_JavaScriptObject *obj, NP_Identifier propertyName);
-NP_String *NP_ToString (NP_JavaScriptObject *obj);
-NP_Object *NP_GetPropertyAtIndex (NP_JavaScriptObject *obj, int32_t index);
+void NP_ToString (NP_JavaScriptObject *obj, NP_JavaScriptResultInterface);
+void NP_GetPropertyAtIndex (NP_JavaScriptObject *obj, int32_t index, NP_JavaScriptResultInterface);
 void NP_SetPropertyAtIndex (NP_JavaScriptObject *obj, unsigned index, NP_Object *value);
 
 /*

-- 
WebKit Debian packaging