Bug 94199, part 2, add method to serialize/deserialize js function, r=mwu
authorNeil Deakin <neil@mozilla.com>
Thu, 03 Nov 2011 16:39:08 -0400
changeset 79698 44d61a68eae09394a289358361d846420de823c8
parent 79697 e0274a0c094e153c7e4a52c96d5ebd1d6dea8018
child 79699 c38c653aed70eb1580d3981ef1c379fed6e2eeef
push id3103
push userneil@mozilla.com
push dateThu, 03 Nov 2011 20:41:05 +0000
treeherdermozilla-inbound@797d8083efca [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmwu
bugs94199
milestone10.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 94199, part 2, add method to serialize/deserialize js function, r=mwu
content/xbl/src/Makefile.in
content/xbl/src/nsXBLSerialize.cpp
content/xbl/src/nsXBLSerialize.h
js/src/jsxdrapi.cpp
js/src/jsxdrapi.h
--- a/content/xbl/src/Makefile.in
+++ b/content/xbl/src/Makefile.in
@@ -59,16 +59,17 @@ CPPSRCS		= \
     nsXBLProtoImplField.cpp \
     nsXBLProtoImpl.cpp \
     nsXBLEventHandler.cpp \
     nsXBLWindowKeyHandler.cpp \
     nsXBLPrototypeHandler.cpp \
     nsXBLService.cpp \
     nsBindingManager.cpp \
     nsXBLInsertionPoint.cpp \
+    nsXBLSerialize.cpp \
 		$(NULL)
 
 EXPORTS   = \
   nsBindingManager.h \
   nsXBLBinding.h \
   $(NULL)
 
 include $(topsrcdir)/config/config.mk
new file mode 100644
--- /dev/null
+++ b/content/xbl/src/nsXBLSerialize.cpp
@@ -0,0 +1,128 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ *   Mozilla Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2011
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "nsXBLSerialize.h"
+#include "nsDOMScriptObjectHolder.h"
+#include "nsContentUtils.h"
+#include "jsxdrapi.h"
+
+nsresult
+XBL_SerializeFunction(nsIScriptContext* aContext,
+                      nsIObjectOutputStream* aStream,
+                      JSObject* aFunctionObject)
+{
+  nsresult rv = NS_OK;
+
+  JSContext* cx = (JSContext*) aContext->GetNativeContext();
+  JSXDRState *xdr = ::JS_XDRNewMem(cx, JSXDR_ENCODE);
+  if (!xdr)
+    return NS_ERROR_OUT_OF_MEMORY;
+  xdr->userdata = (void*) aStream;
+
+  jsval funval = OBJECT_TO_JSVAL(aFunctionObject);
+
+  JSAutoRequest ar(cx);
+  if (! ::JS_XDRFunctionObject(xdr, &aFunctionObject)) {
+    rv = NS_ERROR_FAILURE;
+  } else {
+    uint32 size;
+    const char* data = reinterpret_cast<const char*>
+                                         (::JS_XDRMemGetData(xdr, &size));
+    NS_ASSERTION(data, "no decoded JSXDRState data!");
+
+    rv = aStream->Write32(size);
+    if (NS_SUCCEEDED(rv))
+      rv = aStream->WriteBytes(data, size);
+  }
+
+  ::JS_XDRDestroy(xdr);
+
+  return rv;
+}
+
+// static
+nsresult
+XBL_DeserializeFunction(nsIScriptContext* aContext,
+                        nsIObjectInputStream* aStream,
+                        void* aHolder,
+                        PRUint32* aLineNumber,
+                        void **aScriptObject)
+{
+  *aScriptObject = nsnull;
+
+  nsresult rv = aStream->Read32(aLineNumber);
+  if (NS_FAILED(rv))
+    return rv;
+
+  JSObject* functionObject = nsnull;
+
+  PRUint32 size;
+  rv = aStream->Read32(&size);
+  if (NS_FAILED(rv))
+    return rv;
+
+  char* data;
+  rv = aStream->ReadBytes(size, &data);
+  if (NS_FAILED(rv))
+    return rv;
+
+  JSContext* cx = (JSContext*) aContext->GetNativeContext();
+  JSXDRState *xdr = ::JS_XDRNewMem(cx, JSXDR_DECODE);
+  if (!xdr) {
+    rv = NS_ERROR_OUT_OF_MEMORY;
+  } else {
+    xdr->userdata = (void*) aStream;
+    JSAutoRequest ar(cx);
+    ::JS_XDRMemSetData(xdr, data, size);
+
+    if (! ::JS_XDRFunctionObject(xdr, &functionObject)) {
+      rv = NS_ERROR_FAILURE;
+    }
+
+    uint32 junk;
+    data = (char*) ::JS_XDRMemGetData(xdr, &junk);
+    ::JS_XDRMemSetData(xdr, NULL, 0);
+    ::JS_XDRDestroy(xdr);
+  }
+
+  nsMemory::Free(data);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  *aScriptObject = functionObject;
+
+  return rv;
+}
new file mode 100644
--- /dev/null
+++ b/content/xbl/src/nsXBLSerialize.h
@@ -0,0 +1,59 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ *   Mozilla Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2011
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef nsXBLSerialize_h__
+#define nsXBLSerialize_h__
+
+#include "jsapi.h"
+
+#include "nsIScriptContext.h"
+#include "nsIObjectInputStream.h"
+#include "nsIObjectOutputStream.h"
+
+nsresult
+XBL_SerializeFunction(nsIScriptContext* aContext,
+                      nsIObjectOutputStream* aStream,
+                      JSObject* aFunctionObject);
+
+nsresult
+XBL_DeserializeFunction(nsIScriptContext* aContext,
+                        nsIObjectInputStream* aStream,
+                        void* aHolder,
+                        PRUint32* aLineNumber,
+                        void **aScriptObject);
+
+#endif // nsXBLSerialize_h__
--- a/js/src/jsxdrapi.cpp
+++ b/js/src/jsxdrapi.cpp
@@ -681,16 +681,32 @@ XDRScriptState::XDRScriptState(JSXDRStat
 XDRScriptState::~XDRScriptState()
 {
     xdr->state = NULL;
     if (xdr->mode == JSXDR_DECODE && filename && !filenameSaved)
         xdr->cx->free_((void *)filename);
 }
 
 JS_PUBLIC_API(JSBool)
+JS_XDRFunctionObject(JSXDRState *xdr, JSObject **objp)
+{
+    XDRScriptState fstate(xdr);
+
+    if (xdr->mode == JSXDR_ENCODE) {
+        JSFunction* fun = (*objp)->getFunctionPrivate();
+        if (!fun)
+            return false;
+
+        fstate.filename = fun->script()->filename;
+    }
+
+    return js_XDRFunctionObject(xdr, objp);
+}
+
+JS_PUBLIC_API(JSBool)
 JS_XDRScript(JSXDRState *xdr, JSScript **scriptp)
 {
     JS_ASSERT(!xdr->state);
 
     JSScript *script;
     uint32 magic;
     if (xdr->mode == JSXDR_DECODE) {
         script = NULL;
--- a/js/src/jsxdrapi.h
+++ b/js/src/jsxdrapi.h
@@ -181,16 +181,19 @@ JS_XDRStringOrNull(JSXDRState *xdr, JSSt
 
 extern JS_PUBLIC_API(JSBool)
 JS_XDRDouble(JSXDRState *xdr, jsdouble *dp);
 
 extern JS_PUBLIC_API(JSBool)
 JS_XDRValue(JSXDRState *xdr, jsval *vp);
 
 extern JS_PUBLIC_API(JSBool)
+JS_XDRFunctionObject(JSXDRState *xdr, JSObject **objp);
+
+extern JS_PUBLIC_API(JSBool)
 JS_XDRScript(JSXDRState *xdr, JSScript **scriptp);
 
 extern JS_PUBLIC_API(JSBool)
 JS_XDRRegisterClass(JSXDRState *xdr, JSClass *clasp, uint32 *lp);
 
 extern JS_PUBLIC_API(uint32)
 JS_XDRFindClassIdByName(JSXDRState *xdr, const char *name);