workaround for bug=30927

git-svn-id: svn://10.0.0.236/branches/M15-patch@72213 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/java/dom/jni/javaDOMGlobals.h

@@ -0,0 +1,105 @@
+/* 
+ 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 Sun Microsystems,
+ Inc. Portions created by Sun are
+ Copyright (C) 1999 Sun Microsystems, Inc. All
+ Rights Reserved.
+
+ Contributor(s): 
+*/
+
+#ifndef __JavaDOMGlobals_h__
+#define __JavaDOMGlobals_h__
+
+#include "jni.h"
+#include "prclist.h"
+#include "nsError.h"
+
+#ifdef ERROR
+#undef ERROR
+#endif
+
+class nsISupports;
+class nsIDOMNode;
+struct PRLogModuleInfo;
+struct PRLock;
+
+class JavaDOMGlobals {
+
+ public:
+  static jclass attrClass;
+  static jclass cDataSectionClass;
+  static jclass commentClass;
+  static jclass documentClass;
+  static jclass documentFragmentClass;
+  static jclass documentTypeClass;
+  static jclass domImplementationClass;
+  static jclass elementClass;
+  static jclass entityClass;
+  static jclass entityReferenceClass;
+  static jclass namedNodeMapClass;
+  static jclass nodeClass;
+  static jclass nodeListClass;
+  static jclass notationClass;
+  static jclass processingInstructionClass;
+  static jclass textClass;
+
+  static jfieldID nodePtrFID;
+  static jfieldID nodeListPtrFID;
+  static jfieldID domImplementationPtrFID;
+
+  static jfieldID nodeTypeAttributeFID;
+  static jfieldID nodeTypeCDataSectionFID;
+  static jfieldID nodeTypeCommentFID;
+  static jfieldID nodeTypeDocumentFragmentFID;
+  static jfieldID nodeTypeDocumentFID;
+  static jfieldID nodeTypeDocumentTypeFID;
+  static jfieldID nodeTypeElementFID;
+  static jfieldID nodeTypeEntityFID;
+  static jfieldID nodeTypeEntityReferenceFID;
+  static jfieldID nodeTypeNotationFID;
+  static jfieldID nodeTypeProcessingInstructionFID;
+  static jfieldID nodeTypeTextFID;
+
+  static jclass domExceptionClass;
+  static jmethodID domExceptionInitMID;
+  static jclass runtimeExceptionClass;
+  static jmethodID runtimeExceptionInitMID;
+
+  static const char* const DOM_EXCEPTION_MESSAGE[];
+
+  typedef enum ExceptionType { EXCEPTION_RUNTIME, 
+			       EXCEPTION_DOM } ExceptionType;
+  
+  static PRLogModuleInfo* log;
+  static PRCList garbage;
+  static PRLock* garbageLock;
+
+  static PRInt32 javaMaxInt;
+
+  static void Initialize(JNIEnv *env);
+  static void Destroy(JNIEnv *env);
+  static jobject CreateNodeSubtype(JNIEnv *env, 
+				   nsIDOMNode *node);
+
+  static void AddToGarbage(nsISupports* domObject);
+  static void TakeOutGarbage();
+
+  static void ThrowException(JNIEnv *env,
+                             const char * message = NULL,
+                             nsresult rv = NS_OK,
+                             ExceptionType exceptionType = EXCEPTION_RUNTIME);
+};
+  
+#endif /* __JavaDOMGlobals_h__ */

mozilla/js/src/jsregexp.h

@@ -1,124 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape 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/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express oqr
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- *
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU Public License (the "GPL"), in which case the
- * provisions of the GPL are applicable instead of those above.
- * If you wish to allow use of your version of this file only
- * under the terms of the GPL and not to allow others to use your
- * version of this file under the NPL, indicate your decision by
- * deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL.  If you do not delete
- * the provisions above, a recipient may use your version of this
- * file under either the NPL or the GPL.
- */
-
-#ifndef jsregexp_h___
-#define jsregexp_h___
-/*
- * JS regular expression interface.
- */
-#include <stddef.h>
-#include "jspubtd.h"
-#include "jsstr.h"
-
-struct JSRegExpStatics {
-    JSString    *input;         /* input string to match (perl $_, GC root) */
-    JSBool      multiline;      /* whether input contains newlines (perl $*) */
-    uintN       parenCount;     /* number of valid elements in parens[] */
-    uintN       moreLength;     /* number of allocated elements in moreParens */
-    JSSubString parens[9];      /* last set of parens matched (perl $1, $2) */
-    JSSubString *moreParens;    /* null or realloc'd vector for $10, etc. */
-    JSSubString lastMatch;      /* last string matched (perl $&) */
-    JSSubString lastParen;      /* last paren matched (perl $+) */
-    JSSubString leftContext;    /* input to left of last match (perl $`) */
-    JSSubString rightContext;   /* input to right of last match (perl $') */
-};
-
-/*
- * This macro is safe because moreParens is guaranteed to be allocated and big
- * enough to hold parenCount, or else be null when parenCount is 0.
- */
-#define REGEXP_PAREN_SUBSTRING(res, num)                                      \
-    (((jsuint)(num) < (jsuint)(res)->parenCount)                              \
-     ? ((jsuint)(num) < 9)                                                    \
-       ? &(res)->parens[num]                                                  \
-       : &(res)->moreParens[(num) - 9]                                        \
-     : &js_EmptySubString)
-
-struct JSRegExp {
-    jsrefcount      nrefs;
-    JSString        *source;        /* locked source string, sans // */
-    uintN           lastIndex;      /* index after last match (perl4 compat) */
-    JSHashTable     *lastIndexMap;  /* string to lastIndex map (perl5 compat) */
-    uintN           parenCount;     /* number of parenthesized submatches */
-    uint8           flags;          /* flags, see jsapi.h */
-    struct RENode   *ren;           /* regular expression tree root */
-};
-
-extern JSRegExp *
-js_NewRegExp(JSContext *cx, JSString *str, uintN flags, JSBool flat);
-
-extern JSRegExp *
-js_NewRegExpOpt(JSContext *cx, JSString *str, JSString *opt, JSBool flat);
-
-extern void
-js_DestroyRegExp(JSContext *cx, JSRegExp *re);
-
-/*
- * Execute re on input str at *indexp, returning null in *rval on mismatch.
- * On match, return true if test is true, otherwise return an array object.
- * Update *indexp and cx->regExpStatics always on match.
- */
-extern JSBool
-js_ExecuteRegExp(JSContext *cx, JSRegExp *re, JSString *str, size_t *indexp,
-		 JSBool test, jsval *rval);
-
-/*
- * These two add and remove GC roots, respectively, so their calls must be
- * well-ordered.
- */
-extern JSBool
-js_InitRegExpStatics(JSContext *cx, JSRegExpStatics *res);
-
-extern void
-js_FreeRegExpStatics(JSContext *cx, JSRegExpStatics *res);
-
-#define JSVAL_IS_REGEXP(cx, v)                                                \
-    (JSVAL_IS_OBJECT(v) && JSVAL_TO_OBJECT(v) &&                              \
-     OBJ_GET_CLASS(cx, JSVAL_TO_OBJECT(v)) == &js_RegExpClass)
-
-extern JSClass js_RegExpClass;
-
-extern JSObject *
-js_InitRegExpClass(JSContext *cx, JSObject *obj);
-
-/*
- * Create a new RegExp object.
- */
-extern JSObject *
-js_NewRegExpObject(JSContext *cx, jschar *chars, size_t length, uintN flags);
-
-extern JSBool
-js_XDRRegExp(JSXDRState *xdr, JSObject **objp);
-
-#endif /* jsregexp_h___ */

mozilla/js/src/jsstr.h

@@ -1,293 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape 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/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express oqr
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- *
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU Public License (the "GPL"), in which case the
- * provisions of the GPL are applicable instead of those above.
- * If you wish to allow use of your version of this file only
- * under the terms of the GPL and not to allow others to use your
- * version of this file under the NPL, indicate your decision by
- * deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL.  If you do not delete
- * the provisions above, a recipient may use your version of this
- * file under either the NPL or the GPL.
- */
-
-#ifndef jsstr_h___
-#define jsstr_h___
-/*
- * JS string type implementation.
- *
- * A JS string is a counted array of unicode characters.  To support handoff
- * of API client memory, the chars are allocated separately from the length,
- * necessitating a pointer after the count, to form a string header.  String
- * headers are GC'ed while string bytes are allocated from the malloc heap.
- *
- * When a string is treated as an object (by following it with . or []), the
- * runtime wraps it with a JSObject whose valueOf method returns the unwrapped
- * string header.
- */
-#include <ctype.h>
-#include "jspubtd.h"
-#include "jsprvtd.h"
-#include "jshash.h"
-
-JS_BEGIN_EXTERN_C
-
-struct JSString {
-    size_t          length;
-    jschar          *chars;
-};
-
-struct JSSubString {
-    size_t          length;
-    const jschar    *chars;
-};
-
-extern jschar      js_empty_ucstr[];
-extern JSSubString js_EmptySubString;
-
-/* Unicode character attribute lookup tables. */
-extern const uint8 js_X[];
-extern const uint8 js_Y[];
-extern const uint32 js_A[];
-
-/* Enumerated Unicode general category types. */
-typedef enum JSCharType {
-    JSCT_UNASSIGNED             = 0,
-    JSCT_UPPERCASE_LETTER       = 1,
-    JSCT_LOWERCASE_LETTER       = 2,
-    JSCT_TITLECASE_LETTER       = 3,
-    JSCT_MODIFIER_LETTER        = 4,
-    JSCT_OTHER_LETTER           = 5,
-    JSCT_NON_SPACING_MARK       = 6,
-    JSCT_ENCLOSING_MARK         = 7,
-    JSCT_COMBINING_SPACING_MARK = 8,
-    JSCT_DECIMAL_DIGIT_NUMBER   = 9,
-    JSCT_LETTER_NUMBER          = 10,
-    JSCT_OTHER_NUMBER           = 11,
-    JSCT_SPACE_SEPARATOR        = 12,
-    JSCT_LINE_SEPARATOR         = 13,
-    JSCT_PARAGRAPH_SEPARATOR    = 14,
-    JSCT_CONTROL                = 15,
-    JSCT_FORMAT                 = 16,
-    JSCT_PRIVATE_USE            = 18,
-    JSCT_SURROGATE              = 19,
-    JSCT_DASH_PUNCTUATION       = 20,
-    JSCT_START_PUNCTUATION      = 21,
-    JSCT_END_PUNCTUATION        = 22,
-    JSCT_CONNECTOR_PUNCTUATION  = 23,
-    JSCT_OTHER_PUNCTUATION      = 24,
-    JSCT_MATH_SYMBOL            = 25,
-    JSCT_CURRENCY_SYMBOL        = 26,
-    JSCT_MODIFIER_SYMBOL        = 27,
-    JSCT_OTHER_SYMBOL           = 28
-} JSCharType;
-
-/* Character classifying and mapping macros, based on java.lang.Character. */
-#define JS_CCODE(c)     (js_A[js_Y[(js_X[(uint16)(c)>>6]<<6)|((c)&0x3F)]])
-#define JS_CTYPE(c)     (JS_CCODE(c) & 0x1F)
-
-#define JS_ISALPHA(c)   ((((1 << JSCT_UPPERCASE_LETTER) |                     \
-			   (1 << JSCT_LOWERCASE_LETTER) |                     \
-			   (1 << JSCT_TITLECASE_LETTER) |                     \
-			   (1 << JSCT_MODIFIER_LETTER) |                      \
-			   (1 << JSCT_OTHER_LETTER))                          \
-			  >> JS_CTYPE(c)) & 1)
-
-#define JS_ISALNUM(c)   ((((1 << JSCT_UPPERCASE_LETTER) |                     \
-			   (1 << JSCT_LOWERCASE_LETTER) |                     \
-			   (1 << JSCT_TITLECASE_LETTER) |                     \
-			   (1 << JSCT_MODIFIER_LETTER) |                      \
-			   (1 << JSCT_OTHER_LETTER) |                         \
-			   (1 << JSCT_DECIMAL_DIGIT_NUMBER))                  \
-			  >> JS_CTYPE(c)) & 1)
-
-#define JS_ISWORD(c)    (JS_ISALNUM(c) || (c) == '_')
-
-/* XXXbe unify on A/X/Y tbls, avoid ctype.h? */
-#define JS_ISIDENT(c)   ((c) < 128 && (isalpha(c) || (c) == '_' || (c) == '$'))
-#define JS_ISIDENT2(c)  ((c) < 128 && (isalnum(c) || (c) == '_' || (c) == '$'))
-
-#define JS_ISDIGIT(c)   (JS_CTYPE(c) == JSCT_DECIMAL_DIGIT_NUMBER)
-
-/* XXXbe fs, etc. ? */
-#define JS_ISSPACE(c)   ((JS_CCODE(c) & 0x00070000) == 0x00040000)
-#define JS_ISPRINT(c)   ((c) < 128 && isprint(c))
-
-#define JS_ISUPPER(c)   (JS_CTYPE(c) == JSCT_UPPERCASE_LETTER)
-#define JS_ISLOWER(c)   (JS_CTYPE(c) == JSCT_LOWERCASE_LETTER)
-
-#define JS_TOUPPER(c)   ((JS_CCODE(c) & 0x00100000) ? (c) - ((int32)JS_CCODE(c) >> 22) : (c))
-#define JS_TOLOWER(c)   ((JS_CCODE(c) & 0x00200000) ? (c) + ((int32)JS_CCODE(c) >> 22) : (c))
-
-#define JS_TOCTRL(c)    ((c) ^ 64)      /* XXX unsafe! requires uppercase c */
-
-/* Shorthands for ASCII (7-bit) decimal and hex conversion. */
-#define JS7_ISDEC(c)    ((c) < 128 && isdigit(c))
-#define JS7_UNDEC(c)    ((c) - '0')
-#define JS7_ISHEX(c)    ((c) < 128 && isxdigit(c))
-#define JS7_UNHEX(c)    (uintN)(isdigit(c) ? (c) - '0' : 10 + tolower(c) - 'a')
-#define JS7_ISLET(c)    ((c) < 128 && isalpha(c))
-
-/* Initialize truly global state associated with JS strings. */
-extern JSBool
-js_InitStringGlobals(void);
-
-extern void
-js_FreeStringGlobals(void);
-
-/* Initialize the String class, returning its prototype object. */
-extern JSObject *
-js_InitStringClass(JSContext *cx, JSObject *obj);
-
-/* GC-allocate a string descriptor for the given malloc-allocated chars. */
-extern JSString *
-js_NewString(JSContext *cx, jschar *chars, size_t length, uintN gcflag);
-
-/* Copy a counted string and GC-allocate a descriptor for it. */
-extern JSString *
-js_NewStringCopyN(JSContext *cx, const jschar *s, size_t n, uintN gcflag);
-
-/* Copy a C string and GC-allocate a descriptor for it. */
-extern JSString *
-js_NewStringCopyZ(JSContext *cx, const jschar *s, uintN gcflag);
-
-/* Free the chars held by str when it is finalized by the GC. */
-extern void
-js_FinalizeString(JSContext *cx, JSString *str);
-
-/* String finalize observer callbacks are called like so: cb(cx, str, arg). */
-typedef void
-(* CRT_CALL JSStringFinalizeCallback)(JSContext *cx, JSString *str, void *arg);
-
-extern JS_FRIEND_API(JSBool)
-js_AddStringFinalizeObserver(JSContext *cx, const JSString *str,
-                             JSStringFinalizeCallback cb, void *arg);
-
-extern JS_FRIEND_API(void)
-js_RemoveStringFinalizeObserver(JSContext *cx, const JSString *str,
-                                JSStringFinalizeCallback cb, void *arg);
-
-/* Wrap a string value in a String object. */
-extern JSObject *
-js_StringToObject(JSContext *cx, JSString *str);
-
-/*
- * Convert a value to a string, returning null after reporting an error,
- * otherwise returning a new string reference.
- */
-extern JSString *
-js_ValueToString(JSContext *cx, jsval v);
-
-/*
- * Convert a value to its source expression, returning null after reporting
- * an error, otherwise returning a new string reference.
- */
-extern JSString *
-js_ValueToSource(JSContext *cx, jsval v);
-
-#ifdef HT_ENUMERATE_NEXT	/* XXX don't require jshash.h */
-/*
- * Compute a hash function from str.
- */
-extern JSHashNumber
-js_HashString(const JSString *str);
-#endif
-
-/*
- * Return less than, equal to, or greater than zero depending on whether
- * str1 is less than, equal to, or greater than str2.
- */
-extern intN
-js_CompareStrings(const JSString *str1, const JSString *str2);
-
-/*
- * Boyer-Moore-Horspool superlinear search for pat:patlen in text:textlen.
- * The patlen argument must be positive and no greater than BMH_PATLEN_MAX.
- * The start argument tells where in text to begin the search.
- *
- * Return the index of pat in text, or -1 if not found.
- */
-#define BMH_CHARSET_SIZE 256    /* ISO-Latin-1 */
-#define BMH_PATLEN_MAX   255    /* skip table element is uint8 */
-
-#define BMH_BAD_PATTERN  (-2)   /* return value if pat is not ISO-Latin-1 */
-
-extern jsint
-js_BoyerMooreHorspool(const jschar *text, jsint textlen,
-		      const jschar *pat, jsint patlen,
-		      jsint start);
-
-extern size_t
-js_strlen(const jschar *s);
-
-extern jschar *
-js_strchr(const jschar *s, jschar c);
-
-extern jschar *
-js_strncpy(jschar *t, const jschar *s, size_t n);
-
-/*
- * Return s advanced past any Unicode white space characters.
- */
-extern const jschar *
-js_SkipWhiteSpace(const jschar *s);
-
-/*
- * Inflate bytes to JS chars and vice versa.  Report out of memory via cx
- * and return null on error, otherwise return the jschar or byte vector that
- * was JS_malloc'ed.
- */
-extern jschar *
-js_InflateString(JSContext *cx, const char *bytes, size_t length);
-
-extern char *
-js_DeflateString(JSContext *cx, const jschar *chars, size_t length);
-
-/*
- * Associate bytes with str in the deflated string cache, returning true on
- * successful association, false on out of memory.
- */
-extern JSBool
-js_SetStringBytes(JSString *str, char *bytes, size_t length);
-
-/*
- * Find or create a deflated string cache entry for str that contains its
- * characters chopped from Unicode code points into bytes.
- */
-extern char *
-js_GetStringBytes(JSString *str);
-
-/*
- * Returns an escaped version of character string str.
- * */
-char*
-js_escape(JSContext *cx, JSObject *obj, char *str);
-
-/* XXX exported to jsfile.c, but without js_* namespace prefix! */
-JSBool
-str_escape(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-
-JS_END_EXTERN_C
-
-#endif /* jsstr_h___ */