ms2ger avatar ms2ger committed f7ec0e0

Merge.

Comments (0)

Files changed (31)

JSObject2JSObjectMap

  LIBXUL_LIBRARY = 1
  EXPORTS = \
 -		xpcpublic.h \
+-		dombindings.h \
 -		dombindings_gen.h
--
 +  xpcpublic.h \
++  dombindings.h \
 +  dombindings_gen.h \
 +  JSObject2JSObjectMap.h \
 +  $(NULL)
-+  
+ 
  CPPSRCS		= \
  		nsScriptError.cpp \
  		nsXPConnect.cpp \
  		XPCComponents.cpp \
  		XPCContext.cpp \
  		XPCConvert.cpp \
- 		XPCDebug.cpp \
 diff --git a/js/xpconnect/src/XPCJSRuntime.cpp b/js/xpconnect/src/XPCJSRuntime.cpp
 --- a/js/xpconnect/src/XPCJSRuntime.cpp
 +++ b/js/xpconnect/src/XPCJSRuntime.cpp
 diff --git a/js/xpconnect/src/Makefile.in b/js/xpconnect/src/Makefile.in
 --- a/js/xpconnect/src/Makefile.in
 +++ b/js/xpconnect/src/Makefile.in
-@@ -85,16 +85,17 @@ CPPSRCS		= \
+@@ -86,16 +86,17 @@ CPPSRCS		= \
  		XPCWrappedNativeProto.cpp \
  		XPCWrappedNativeScope.cpp \
  		XPCJSWeakReference.cpp \
 diff --git a/js/xpconnect/src/dombindings.cpp b/js/xpconnect/src/dombindings.cpp
 --- a/js/xpconnect/src/dombindings.cpp
 +++ b/js/xpconnect/src/dombindings.cpp
-@@ -52,16 +52,17 @@
+@@ -51,16 +51,17 @@
+ #include "nsGlobalWindow.h"
  
  #include "nsWrapperCacheInlines.h"
  
  #include "jsapi.h"
- 
- #include "jscntxt.h" // js::AutoIdVector
+ #include "jsatom.h"
  
  using namespace JS;
 +using namespace xpc;
- using js::AutoIdVector;
  
  namespace mozilla {
  namespace dom {
  
  
  static jsid s_constructor_id = JSID_VOID;
-@@ -92,24 +93,16 @@ DefineStaticJSVals(JSContext *cx)
+ static jsid s_prototype_id = JSID_VOID;
+@@ -90,24 +91,16 @@ DefineStaticJSVals(JSContext *cx)
             SET_JSID_TO_STRING(cx, length) &&
             DefinePropertyStaticJSVals(cx);
  }
  #include "XPCWrappedNativeTearOff.h"
  #include "XPCWrapper.h"
  
- #include "jsapi.h"
+ #include "nsCOMPtr.h"
 diff --git a/js/xpconnect/src/XPCThrower.cpp b/js/xpconnect/src/XPCThrower.cpp
 --- a/js/xpconnect/src/XPCThrower.cpp
 +++ b/js/xpconnect/src/XPCThrower.cpp
  #include "XPCTraceableVariant.h"
  #include "XPCWrapper.h"
  
- #include "jscntxt.h" // JS_CHECK_RECURSION
+ #include "jsfriendapi.h"
  
  NS_IMPL_CYCLE_COLLECTION_CLASS(XPCVariant)
  
  #include "WrapperFactory.h"
  #include "XPCCallContext.h"
  #include "XPCJSObjectHolder.h"
-@@ -82,19 +84,21 @@ using namespace mozilla;
+@@ -84,19 +86,21 @@ using namespace mozilla;
  #endif // STRICT_CHECK_OF_UNICODE
  
  #define ILLEGAL_CHAR_RANGE(c) (0!=((c) & 0x80))
          const nsXPTParamInfo& param = info.params[i];
          const nsXPTType& type = param.GetType();
  
-@@ -105,17 +109,17 @@ XPCConvert::IsMethodReflectable(const XP
+@@ -107,17 +111,17 @@ XPCConvert::IsMethodReflectable(const XP
      }
      return true;
  }
          (jsclass->flags & JSCLASS_PRIVATE_IS_NSISUPPORTS)) {
          *iface = (nsISupports*) xpc_GetJSPrivate(obj);
          return true;
-@@ -148,26 +152,26 @@ AddXPCOMUCStringFinalizer()
+@@ -150,26 +154,26 @@ AddXPCOMUCStringFinalizer()
          return false;
      }
  
  
      // Allow wrong compartment or unset ScopeForNewObject when the caller knows
      // the value is primitive (viz., XPCNativeMember::GetConstantValue).
-@@ -440,20 +444,20 @@ CheckJSCharInCharRange(jschar c)
+@@ -442,20 +446,20 @@ CheckJSCharInCharRange(jschar c)
      }
  
      return true;
      int32_t  ti;
      uint32_t tu;
      jsdouble td;
-@@ -910,25 +914,25 @@ CreateHolderIfNeeded(XPCCallContext& ccx
+@@ -912,25 +916,25 @@ CreateHolderIfNeeded(XPCCallContext& ccx
      *d = OBJECT_TO_JSVAL(obj);
  
      return true;
      if (dest)
          *dest = nsnull;
      nsISupports *src = aHelper.Object();
-@@ -1188,21 +1192,21 @@ XPCConvert::NativeInterface2JSObject(XPC
+@@ -1190,21 +1194,21 @@ XPCConvert::NativeInterface2JSObject(XPC
  
      return true;
  }
      JSContext* cx = ccx.GetJSContext();
  
      JSAutoEnterCompartment ac;
-@@ -1288,22 +1292,22 @@ XPCConvert::JSObject2NativeInterface(XPC
+@@ -1290,22 +1294,22 @@ XPCConvert::JSObject2NativeInterface(XPC
      return false;
  }
  
      char* sz = nsnull;
      nsXPIDLString xmsg;
      nsCAutoString sxmsg;
-@@ -1352,21 +1356,21 @@ public:
+@@ -1354,21 +1358,21 @@ public:
  
  private:
      JSContext * const mContext;
-     js::AutoValueRooter tvr;
+     JS::AutoValueRooter tvr;
  };
  
  // static
          // we have a JSObject
          JSObject* obj = JSVAL_TO_OBJECT(s);
  
-@@ -1520,22 +1524,22 @@ XPCConvert::JSValToXPCException(XPCCallC
+@@ -1522,22 +1526,22 @@ XPCConvert::JSValToXPCException(XPCCallC
      }
      return NS_ERROR_FAILURE;
  }
          if (report && report->ucmessage) {
              bestMessage = (const PRUnichar *)report->ucmessage;
          } else if (message) {
-@@ -1578,20 +1582,20 @@ XPCConvert::JSErrorToXPCException(XPCCal
+@@ -1580,20 +1584,20 @@ XPCConvert::JSErrorToXPCException(XPCCal
  // array fun...
  
  #ifdef POPULATE
      if (!ccx.IsValid())
          return false;
  
-@@ -1714,22 +1718,22 @@ CheckTargetAndPopulate(const nsXPTType& 
+@@ -1716,22 +1720,22 @@ CheckTargetAndPopulate(const nsXPTType& 
  // JSarray2Native whenever a TypedArray is met. ArrayBuffers
  // are not accepted; create a properly typed array view on them
  // first. The element type of array must match the XPCOM
      // Check the actual length of the input array against the
      // given size_is.
      uint32_t len = JS_GetTypedArrayLength(jsArray);
-@@ -1820,19 +1824,19 @@ XPCConvert::JSTypedArray2Native(XPCCallC
+@@ -1822,19 +1826,19 @@ XPCConvert::JSTypedArray2Native(XPCCallC
      if (pErr)
          *pErr = NS_OK;
  
      // No Action, FRee memory, RElease object
      enum CleanupMode {na, fr, re};
  
-@@ -1963,21 +1967,21 @@ failure:
+@@ -1965,21 +1969,21 @@ failure:
  
      return false;
  
          *pErr = NS_ERROR_XPC_BAD_CONVERT_NATIVE;
  
      switch (type.TagPart()) {
-@@ -2007,19 +2011,19 @@ XPCConvert::NativeStringWithSize2JS(JSCo
+@@ -2009,19 +2013,19 @@ XPCConvert::NativeStringWithSize2JS(JSCo
              XPC_LOG_ERROR(("XPCConvert::NativeStringWithSize2JS : unsupported type"));
              return false;
      }
  
      uint32_t len;
  
-@@ -2129,8 +2133,9 @@ XPCConvert::JSStringWithSize2Native(XPCC
+@@ -2131,8 +2135,9 @@ XPCConvert::JSStringWithSize2Native(XPCC
              return true;
          }
          default:
  #include "XPCWrappedNative.h"
  #include "XPCWrapper.h"
  
- NS_IMPL_CYCLE_COLLECTION_CLASS(XPCVariant)
+ #include "jsfriendapi.h"
  
 diff --git a/js/xpconnect/src/XPCWrappedJSClass.cpp b/js/xpconnect/src/XPCWrappedJSClass.cpp
 --- a/js/xpconnect/src/XPCWrappedJSClass.cpp
 diff --git a/js/xpconnect/src/xpcprivate.h b/js/xpconnect/src/xpcprivate.h
 --- a/js/xpconnect/src/xpcprivate.h
 +++ b/js/xpconnect/src/xpcprivate.h
-@@ -453,172 +453,16 @@ enum WrapperType {
+@@ -449,172 +449,16 @@ enum WrapperType {
  /***************************************************************************
  ****************************************************************************
  *

XPCJSObjectHolder

 diff --git a/js/xpconnect/src/Makefile.in b/js/xpconnect/src/Makefile.in
 --- a/js/xpconnect/src/Makefile.in
 +++ b/js/xpconnect/src/Makefile.in
-@@ -58,16 +58,17 @@ CPPSRCS		= \
+@@ -59,16 +59,17 @@ CPPSRCS		= \
  		nsXPConnect.cpp \
  		XPCCallContext.cpp \
  		XPCComponents.cpp \
  
  #include "nsWrapperCacheInlines.h"
  
- #include "jscntxt.h" // js::ThreadData, JS_TRACER_INIT, context->stackLimit, cx->outstandingRequests,
- // cx->globalObject, sizeof(JSContext), js::CompartmentVector, cx->stack.empty()
- 
+ NS_IMPL_THREADSAFE_ISUPPORTS7(nsXPConnect,
+                               nsIXPConnect,
+                               nsISupportsWeakReference,
 diff --git a/js/xpconnect/src/xpcprivate.h b/js/xpconnect/src/xpcprivate.h
 --- a/js/xpconnect/src/xpcprivate.h
 +++ b/js/xpconnect/src/xpcprivate.h
  #include "nsArrayEnumerator.h"
  #include "nsJSUtils.h"
  
- #include "jscntxt.h" // mJSContext->errorReporter, js::AutoValueVector
+ #include "jsapi.h"
 diff --git a/js/xpconnect/src/XPCWrappedNative.cpp b/js/xpconnect/src/XPCWrappedNative.cpp
 --- a/js/xpconnect/src/XPCWrappedNative.cpp
 +++ b/js/xpconnect/src/XPCWrappedNative.cpp
 diff --git a/js/xpconnect/src/xpcprivate.h b/js/xpconnect/src/xpcprivate.h
 --- a/js/xpconnect/src/xpcprivate.h
 +++ b/js/xpconnect/src/xpcprivate.h
-@@ -451,35 +451,16 @@ enum WrapperType {
+@@ -449,35 +449,16 @@ enum WrapperType {
  /***************************************************************************
  ****************************************************************************
  *

XPCLazyCallContext

 diff --git a/js/xpconnect/src/Makefile.in b/js/xpconnect/src/Makefile.in
 --- a/js/xpconnect/src/Makefile.in
 +++ b/js/xpconnect/src/Makefile.in
-@@ -62,16 +62,17 @@ CPPSRCS		= \
+@@ -63,16 +63,17 @@ CPPSRCS		= \
  		XPCComponents.cpp \
  		XPCContext.cpp \
  		XPCConvert.cpp \
  #include "XPCWrappedNativeTearOff.h"
  #include "XPCWrapper.h"
  
- #include "jsapi.h"
+ #include "nsCOMPtr.h"
 diff --git a/js/xpconnect/src/XPCQuickStubs.h b/js/xpconnect/src/XPCQuickStubs.h
 --- a/js/xpconnect/src/XPCQuickStubs.h
 +++ b/js/xpconnect/src/XPCQuickStubs.h
  #include "XPCTraceableVariant.h"
  #include "XPCWrapper.h"
  
- #include "jscntxt.h" // JS_CHECK_RECURSION
+ #include "jsfriendapi.h"
  
  NS_IMPL_CYCLE_COLLECTION_CLASS(XPCVariant)
  
  #include "nsArrayEnumerator.h"
  #include "nsJSUtils.h"
  
- #include "jscntxt.h" // mJSContext->errorReporter, js::AutoValueVector
+ #include "jsapi.h"
 diff --git a/js/xpconnect/src/XPCWrappedNative.cpp b/js/xpconnect/src/XPCWrappedNative.cpp
 --- a/js/xpconnect/src/XPCWrappedNative.cpp
 +++ b/js/xpconnect/src/XPCWrappedNative.cpp
  #include "nsArrayEnumerator.h"
  #include "nsJSUtils.h"
  
- #include "jscntxt.h" // mJSContext->errorReporter, js::AutoValueVector
+ #include "jsapi.h"
  
  NS_IMPL_THREADSAFE_ISUPPORTS1(nsXPCWrappedJSClass, nsIXPCWrappedJSClass)
  
  #include "XPCWrappedNativeTearOff.h"
  #include "XPCWrapper.h"
  
- #include "jsapi.h"
+ #include "nsCOMPtr.h"
 diff --git a/js/xpconnect/src/XPCWrappedNative.cpp b/js/xpconnect/src/XPCWrappedNative.cpp
 --- a/js/xpconnect/src/XPCWrappedNative.cpp
 +++ b/js/xpconnect/src/XPCWrappedNative.cpp
  #include "XPCWrappedNativeTearOff.h"
  #include "XPCWrapper.h"
  
- #include "jsapi.h"
- #include "jscntxt.h"  /* for error messages */
+ #include "nsCOMPtr.h"
+ 
 diff --git a/js/xpconnect/src/XPCWrappedNative.cpp b/js/xpconnect/src/XPCWrappedNative.cpp
 --- a/js/xpconnect/src/XPCWrappedNative.cpp
 +++ b/js/xpconnect/src/XPCWrappedNative.cpp
 diff --git a/js/xpconnect/src/Makefile.in b/js/xpconnect/src/Makefile.in
 --- a/js/xpconnect/src/Makefile.in
 +++ b/js/xpconnect/src/Makefile.in
-@@ -63,17 +63,18 @@ CPPSRCS		= \
+@@ -64,17 +64,18 @@ CPPSRCS		= \
  		XPCDebug.cpp \
  		XPCException.cpp \
  		XPCJSID.cpp \
  #include "mozilla/Preferences.h"
  #include "mozilla/Telemetry.h"
  
-@@ -2237,49 +2238,16 @@ XPCJSRuntime::DebugDump(PRInt16 depth)
+@@ -2202,49 +2203,16 @@ XPCJSRuntime::DebugDump(PRInt16 depth)
  
          XPC_LOG_OUTDENT();
  #endif
  #include "XPCWrappedNativeTearOff.h"
  #include "XPCWrapper.h"
  
- #include "jsapi.h"
- #include "jscntxt.h"  /* for error messages */
+ #include "nsCOMPtr.h"
+ 
 diff --git a/js/xpconnect/src/XPCString.cpp b/js/xpconnect/src/XPCString.cpp
 --- a/js/xpconnect/src/XPCString.cpp
 +++ b/js/xpconnect/src/XPCString.cpp
  
      PRUint32 length = readable.Length();
  
-     JSAtom *atom;
-     if (length == 0 && (atom = cx->runtime->atomState.emptyAtom)) {
-@@ -129,8 +133,10 @@ XPCStringConvert::ReadableToJSVal(JSCont
+     if (length == 0)
+         return JS_GetEmptyStringValue(cx);
+@@ -127,8 +131,10 @@ XPCStringConvert::ReadableToJSVal(JSCont
          chars[length] = 0;
  
          str = JS_NewUCString(cx, chars, length);
 diff --git a/js/xpconnect/src/xpcprivate.h b/js/xpconnect/src/xpcprivate.h
 --- a/js/xpconnect/src/xpcprivate.h
 +++ b/js/xpconnect/src/xpcprivate.h
-@@ -451,33 +451,16 @@ enum WrapperType {
+@@ -449,33 +449,16 @@ enum WrapperType {
  /***************************************************************************
  ****************************************************************************
  *

XPCStringConvert-classinfo

 @@ -43,16 +43,17 @@
  // JavaScript includes
  #include "jsapi.h"
+ #include "jsfriendapi.h"
  #include "jsprvtd.h"    // we are using private JS typedefs...
- #include "jscntxt.h"
  #include "jsdbgapi.h"
  #include "WrapperFactory.h"
  #include "AccessCheck.h"
  #include "nsCRT.h"
  #include "nsCRTGlue.h"
  #include "nsIServiceManager.h"
-@@ -8337,22 +8338,17 @@ nsDOMStringMapSH::GetProperty(nsIXPConne
+@@ -8364,22 +8365,17 @@ nsDOMStringMapSH::GetProperty(nsIXPConne
    nsresult rv = dataset->GetDataAttr(propName, propVal);
    NS_ENSURE_SUCCESS(rv, rv);
  
                                JSObject *obj, jsid id, jsval *vp,
                                bool *_retval)
  {
-@@ -9909,24 +9905,20 @@ nsStringArraySH::GetProperty(nsIXPConnec
+@@ -9936,24 +9932,20 @@ nsStringArraySH::GetProperty(nsIXPConnec
  
    nsresult rv = GetStringAt(GetNative(wrapper, obj), n, val);
    NS_ENSURE_SUCCESS(rv, rv);
 diff --git a/js/xpconnect/src/XPCComponents.cpp b/js/xpconnect/src/XPCComponents.cpp
 --- a/js/xpconnect/src/XPCComponents.cpp
 +++ b/js/xpconnect/src/XPCComponents.cpp
-@@ -49,16 +49,17 @@
+@@ -51,16 +51,17 @@
  #include "XPCContext.h"
  #include "xpcIJSModuleLoader.h"
  #include "XPCJSRuntime.h"
  #include "XPCWrappedNativeTearOff.h"
  #include "XPCWrapper.h"
  
- #include "jsapi.h"
- #include "jscntxt.h"  /* for error messages */
+ #include "nsCOMPtr.h"
+ 
 diff --git a/js/xpconnect/src/XPCThrower.cpp b/js/xpconnect/src/XPCThrower.cpp
 --- a/js/xpconnect/src/XPCThrower.cpp
 +++ b/js/xpconnect/src/XPCThrower.cpp
 diff --git a/js/xpconnect/src/xpcprivate.h b/js/xpconnect/src/xpcprivate.h
 --- a/js/xpconnect/src/xpcprivate.h
 +++ b/js/xpconnect/src/xpcprivate.h
-@@ -453,45 +453,16 @@ enum WrapperType {
+@@ -449,45 +449,16 @@ enum WrapperType {
  /***************************************************************************
  ****************************************************************************
  *

XPCTraceableVariant

 diff --git a/js/xpconnect/src/Makefile.in b/js/xpconnect/src/Makefile.in
 --- a/js/xpconnect/src/Makefile.in
 +++ b/js/xpconnect/src/Makefile.in
-@@ -70,16 +70,17 @@ CPPSRCS		= \
+@@ -71,16 +71,17 @@ CPPSRCS		= \
  		XPCMaps.cpp \
  		XPCModule.cpp \
  		XPCRootSetElem.cpp \
 +#include "XPCTraceableVariant.h"
  #include "XPCWrapper.h"
  
- #include "jscntxt.h" // JS_CHECK_RECURSION
+ #include "jsfriendapi.h"
  
  NS_IMPL_CYCLE_COLLECTION_CLASS(XPCVariant)
  
 diff --git a/js/xpconnect/src/XPCQuickStubs.cpp b/js/xpconnect/src/XPCQuickStubs.cpp
 --- a/js/xpconnect/src/XPCQuickStubs.cpp
 +++ b/js/xpconnect/src/XPCQuickStubs.cpp
-@@ -33,24 +33,25 @@
+@@ -33,25 +33,27 @@
   * 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.
 +#include "XPCVariant.h"
 +#include "XPCWrapper.h"
 +
++#include "nsCOMPtr.h"
++
  #include "jsapi.h"
- #include "jscntxt.h"  /* for error messages */
- #include "nsCOMPtr.h"
+ #include "jsatom.h"
+ #include "jsfriendapi.h"
+-#include "nsCOMPtr.h"
 -#include "xpcprivate.h"
 -#include "XPCInlines.h"
 -#include "XPCQuickStubs.h"
  #include "xpcprivate.h"
  #include "XPCWrapper.h"
  
- #include "jscntxt.h" // JS_CHECK_RECURSION
+ #include "jsfriendapi.h"
  
  NS_IMPL_CYCLE_COLLECTION_CLASS(XPCVariant)
  
  #include "nsWrapperCacheInlines.h"
  
  #include "jsapi.h"
- 
- #include "jscntxt.h" // js::AutoIdVector
+ #include "jsatom.h"
  
  using namespace JS;
- using js::AutoIdVector;
+ 
+ namespace mozilla {
 diff --git a/js/xpconnect/src/nsXPConnect.cpp b/js/xpconnect/src/nsXPConnect.cpp
 --- a/js/xpconnect/src/nsXPConnect.cpp
 +++ b/js/xpconnect/src/nsXPConnect.cpp
  #include "XPCWrappedNativeTearOff.h"
  #include "XPCWrapper.h"
  
- #include "jsapi.h"
- #include "jscntxt.h"  /* for error messages */
  #include "nsCOMPtr.h"
  
+ #include "jsapi.h"
+ #include "jsatom.h"
 diff --git a/js/xpconnect/src/XPCQuickStubs.h b/js/xpconnect/src/XPCQuickStubs.h
 --- a/js/xpconnect/src/XPCQuickStubs.h
 +++ b/js/xpconnect/src/XPCQuickStubs.h
 +#include "XPCWrappedNative.h"
  #include "XPCWrapper.h"
  
- #include "jscntxt.h" // JS_CHECK_RECURSION
+ #include "jsfriendapi.h"
  
  NS_IMPL_CYCLE_COLLECTION_CLASS(XPCVariant)
  

XPCWrappedNativeProto

  #include "XPCWrappedNativeTearOff.h"
  #include "XPCWrapper.h"
  
- #include "jsapi.h"
- #include "jscntxt.h"  /* for error messages */
  #include "nsCOMPtr.h"
  
- using namespace mozilla;
+ #include "jsapi.h"
+ #include "jsatom.h"
+ #include "jsfriendapi.h"
 diff --git a/js/xpconnect/src/XPCWrappedNative.cpp b/js/xpconnect/src/XPCWrappedNative.cpp
 --- a/js/xpconnect/src/XPCWrappedNative.cpp
 +++ b/js/xpconnect/src/XPCWrappedNative.cpp

XPCWrappedNativeScope

  #include "nsArrayEnumerator.h"
  #include "nsJSUtils.h"
  
- #include "jscntxt.h" // mJSContext->errorReporter, js::AutoValueVector
+ #include "jsapi.h"
  
  NS_IMPL_THREADSAFE_ISUPPORTS1(nsXPCWrappedJSClass, nsIXPCWrappedJSClass)
 diff --git a/js/xpconnect/src/XPCWrappedNative.cpp b/js/xpconnect/src/XPCWrappedNative.cpp

XPCWrappedNativeTearOff

 +#include "XPCWrappedNativeTearOff.h"
  #include "XPCWrapper.h"
  
- #include "jsapi.h"
- #include "jscntxt.h"  /* for error messages */
  #include "nsCOMPtr.h"
  
- using namespace mozilla;
+ #include "jsapi.h"
+ #include "jsatom.h"
+ #include "jsfriendapi.h"
  
 diff --git a/js/xpconnect/src/XPCQuickStubs.h b/js/xpconnect/src/XPCQuickStubs.h
 --- a/js/xpconnect/src/XPCQuickStubs.h
 diff --git a/js/xpconnect/src/XPCComponents.cpp b/js/xpconnect/src/XPCComponents.cpp
 --- a/js/xpconnect/src/XPCComponents.cpp
 +++ b/js/xpconnect/src/XPCComponents.cpp
-@@ -37,16 +37,17 @@
-  * 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
+@@ -39,16 +39,17 @@
   * the terms of any one of the MPL, the GPL or the LGPL.
   *
   * ***** END LICENSE BLOCK ***** */
  
  /* The "Components" xpcom objects for JavaScript. */
  
+ #include "mozilla/unused.h"
+ 
 +#include "nsJSCID.h"
  #include "nsJSID.h"
  #include "nsJSIID.h"
  
  #if defined(DEBUG_jband) || defined(DEBUG_jst) || defined(DEBUG_dbradley) || defined(DEBUG_shaver_no) || defined(DEBUG_timeless)
  #define DEBUG_xpc_hacker
-@@ -457,43 +456,16 @@ enum WrapperType {
+@@ -455,43 +454,16 @@ enum WrapperType {
  ****************************************************************************
  ***************************************************************************/
  
 diff --git a/js/xpconnect/src/XPCComponents.cpp b/js/xpconnect/src/XPCComponents.cpp
 --- a/js/xpconnect/src/XPCComponents.cpp
 +++ b/js/xpconnect/src/XPCComponents.cpp
-@@ -37,16 +37,17 @@
-  * 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
+@@ -39,16 +39,17 @@
   * the terms of any one of the MPL, the GPL or the LGPL.
   *
   * ***** END LICENSE BLOCK ***** */
  
  /* The "Components" xpcom objects for JavaScript. */
  
+ #include "mozilla/unused.h"
+ 
 +#include "nsJSID.h"
  #include "nsXPCException.h"
  #include "nsXPConnect.h"
  
  #if defined(DEBUG_jband) || defined(DEBUG_jst) || defined(DEBUG_dbradley) || defined(DEBUG_shaver_no) || defined(DEBUG_timeless)
  #define DEBUG_xpc_hacker
-@@ -452,58 +453,20 @@ enum WrapperType {
+@@ -450,58 +451,20 @@ enum WrapperType {
  ****************************************************************************
  *
  * All manner of utility classes follow...
 diff --git a/js/xpconnect/src/XPCComponents.cpp b/js/xpconnect/src/XPCComponents.cpp
 --- a/js/xpconnect/src/XPCComponents.cpp
 +++ b/js/xpconnect/src/XPCComponents.cpp
-@@ -38,16 +38,17 @@
-  * 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.
+@@ -40,16 +40,17 @@
   *
   * ***** END LICENSE BLOCK ***** */
  
  /* The "Components" xpcom objects for JavaScript. */
  
+ #include "mozilla/unused.h"
+ 
  #include "nsJSID.h"
 +#include "nsJSIID.h"
  #include "nsXPCException.h"
 diff --git a/js/xpconnect/src/xpcprivate.h b/js/xpconnect/src/xpcprivate.h
 --- a/js/xpconnect/src/xpcprivate.h
 +++ b/js/xpconnect/src/xpcprivate.h
-@@ -457,43 +457,16 @@ enum WrapperType {
+@@ -455,43 +455,16 @@ enum WrapperType {
  ****************************************************************************
  ***************************************************************************/
  
 diff --git a/js/xpconnect/src/XPCComponents.cpp b/js/xpconnect/src/XPCComponents.cpp
 --- a/js/xpconnect/src/XPCComponents.cpp
 +++ b/js/xpconnect/src/XPCComponents.cpp
-@@ -37,16 +37,17 @@
-  * 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
+@@ -39,16 +39,17 @@
   * the terms of any one of the MPL, the GPL or the LGPL.
   *
   * ***** END LICENSE BLOCK ***** */
  
  /* The "Components" xpcom objects for JavaScript. */
  
+ #include "mozilla/unused.h"
+ 
 +#include "nsXPCException.h"
  #include "nsXPConnect.h"
  #include "PrincipalHolder.h"
 diff --git a/js/xpconnect/src/xpcprivate.h b/js/xpconnect/src/xpcprivate.h
 --- a/js/xpconnect/src/xpcprivate.h
 +++ b/js/xpconnect/src/xpcprivate.h
-@@ -451,66 +451,16 @@ enum WrapperType {
+@@ -449,66 +449,16 @@ enum WrapperType {
  /***************************************************************************
  ****************************************************************************
  *
  #include "nsWrapperCacheInlines.h"
  
  #include "jsapi.h"
+ #include "jsfriendapi.h"
  #include "jstypedarray.h"
  
- #include "jscntxt.h" // cx->compartment
+ using namespace mozilla;
  
- using namespace mozilla;
 diff --git a/js/xpconnect/src/XPCInlines.h b/js/xpconnect/src/XPCInlines.h
 --- a/js/xpconnect/src/XPCInlines.h
 +++ b/js/xpconnect/src/XPCInlines.h
 diff --git a/js/xpconnect/src/XPCQuickStubs.cpp b/js/xpconnect/src/XPCQuickStubs.cpp
 --- a/js/xpconnect/src/XPCQuickStubs.cpp
 +++ b/js/xpconnect/src/XPCQuickStubs.cpp
-@@ -40,16 +40,17 @@
- 
+@@ -41,16 +41,17 @@
  #include "jsapi.h"
- #include "jscntxt.h"  /* for error messages */
+ #include "jsatom.h"
+ #include "jsfriendapi.h"
  #include "nsCOMPtr.h"
  #include "xpcprivate.h"
  #include "XPCInlines.h"
 +#include "nsArrayEnumerator.h"
  #include "nsJSUtils.h"
  
- #include "jscntxt.h" // mJSContext->errorReporter, js::AutoValueVector
+ #include "jsapi.h"
  
  NS_IMPL_THREADSAFE_ISUPPORTS1(nsXPCWrappedJSClass, nsIXPCWrappedJSClass)
  

nsXPCWrappedJSClass

 diff --git a/js/xpconnect/src/xpcprivate.h b/js/xpconnect/src/xpcprivate.h
 --- a/js/xpconnect/src/xpcprivate.h
 +++ b/js/xpconnect/src/xpcprivate.h
-@@ -448,134 +448,16 @@ enum WrapperType {
+@@ -444,134 +444,16 @@ enum WrapperType {
      SOW             = 1 << 5
  };
  
  #include "XPCTraceableVariant.h"
  #include "XPCWrapper.h"
  
- #include "jscntxt.h" // JS_CHECK_RECURSION
+ #include "jsfriendapi.h"
  
  NS_IMPL_CYCLE_COLLECTION_CLASS(XPCVariant)
  
 diff --git a/js/xpconnect/src/XPCComponents.cpp b/js/xpconnect/src/XPCComponents.cpp
 --- a/js/xpconnect/src/XPCComponents.cpp
 +++ b/js/xpconnect/src/XPCComponents.cpp
-@@ -47,16 +47,17 @@
+@@ -49,16 +49,17 @@
  #include "WrapperFactory.h"
  #include "XPCCallContext.h"
  #include "XPCContext.h"
 diff --git a/js/xpconnect/src/xpcprivate.h b/js/xpconnect/src/xpcprivate.h
 --- a/js/xpconnect/src/xpcprivate.h
 +++ b/js/xpconnect/src/xpcprivate.h
-@@ -453,114 +453,17 @@ enum WrapperType {
+@@ -449,114 +449,17 @@ enum WrapperType {
  /***************************************************************************
  ****************************************************************************
  *
  #include "nsJSUtils.h"
 +#include "nsStringGlue.h"
  
+ #include "jsapi.h"
+ 
  NS_IMPL_THREADSAFE_ISUPPORTS1(nsXPCWrappedJSClass, nsIXPCWrappedJSClass)
  
  // the value of this variable is never used - we use its address as a sentinel
  static uint32_t zero_methods_descriptor;
  
- bool AutoScriptEvaluate::StartEvaluating(JSObject *scope, JSErrorReporter errorReporter)
- {
-@@ -402,16 +406,30 @@ nsXPCWrappedJSClass::GetNamedPropertyAsV
+@@ -404,16 +408,30 @@ nsXPCWrappedJSClass::GetNamedPropertyAsV
      ok = JS_ValueToId(cx, aName, &id) &&
           GetNamedPropertyAsVariantRaw(ccx, aJSObj, id, aResult, &rv);
  
                                               nsISimpleEnumerator** aEnumerate)
  {
      JSContext* cx = ccx.GetJSContext();
-     nsresult retval = NS_ERROR_FAILURE;
+ 
 diff --git a/js/xpconnect/src/xpcprivate.h b/js/xpconnect/src/xpcprivate.h
 --- a/js/xpconnect/src/xpcprivate.h
 +++ b/js/xpconnect/src/xpcprivate.h
-@@ -453,31 +453,16 @@ enum WrapperType {
+@@ -449,31 +449,16 @@ enum WrapperType {
  /***************************************************************************
  ****************************************************************************
  *
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.