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/netwerk/dns/src/nsDnsService.h

@@ -1,153 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; 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 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 Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1999 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef nsDNSService_h__
-#define nsDNSService_h__
-
-#include "nsIDNSService.h"
-#include "nsIRunnable.h"
-#include "nsIObserver.h"
-#include "nsIThread.h"
-#include "nsISupportsArray.h"
-#if defined(XP_MAC)
-#include <OSUtils.h>
-#include <OpenTransport.h>
-#include <OpenTptInternet.h>
-#elif defined (XP_WIN)
-#include <windows.h>
-#include <Winsock2.h>
-#endif
-#include "nsCOMPtr.h"
-#include "prclist.h"
-#include "prcvar.h"
-#include "pldhash.h"
-
-#ifdef DEBUG
-#define DNS_TIMING 1
-#endif
-
-class nsIDNSListener;
-class nsDNSLookup;
-
-/******************************************************************************
- *  nsDNSService
- *****************************************************************************/
-class nsDNSService : public nsIDNSService,
-                     public nsIRunnable,
-                     public nsIObserver
-{
-public:
-    NS_DECL_ISUPPORTS
-    NS_DECL_NSIRUNNABLE
-    NS_DECL_NSIDNSSERVICE
-    NS_DECL_NSIOBSERVER
-    
-    // nsDNSService methods:
-    nsDNSService();
-    virtual ~nsDNSService();
- 
-    // Define a Create method to be used with a factory:
-    static NS_METHOD        Create( nsISupports * outer,
-                                    const nsIID & iid,
-                                    void **       result);
-    
-    static void             Lock();
-    static void             Unlock();
-
-    void                    EnqueuePendingQ(nsDNSLookup * lookup);
-    nsDNSLookup *           DequeuePendingQ();
-    
-    static PRInt32          ExpirationInterval();
-
-    static nsDNSService *   gService;
-
-private:
-    nsresult                LateInit();
-    nsresult                InstallPrefObserver();
-    nsresult                RemovePrefObserver();
-    nsDNSLookup *           FindOrCreateLookup( const char *  hostName);
-    void                    EvictLookup( nsDNSLookup * lookup);
-    void                    AddToEvictionQ( nsDNSLookup *  lookup);
-    void                    AbortLookups();
-    
-        
-    static PRBool           gNeedLateInitialization;
-    static PLDHashTableOps  gHashTableOps;
-
-    PRLock *                mDNSServiceLock;
-    PRCondVar *             mDNSCondVar;
-    PLDHashTable            mHashTable;
-    PRCList                 mPendingQ;
-    PRCList                 mEvictionQ;
-    PRInt32                 mEvictionQCount;
-    PRInt32                 mMaxCachedLookups;
-    PRInt32                 mExpirationInterval;
-    
-    char *                  mMyIPAddress;
-    nsCOMPtr<nsIThread>     mThread;
-    PRUint32                mState;
-
-    enum {
-        DNS_NOT_INITIALIZED = 0,
-        DNS_RUNNING         = 1,
-        DNS_SHUTTING_DOWN   = 2,
-        DNS_SHUTDOWN        = 3
-    };
-
-#if defined(XP_MAC)
-    friend pascal void      nsDnsServiceNotifierRoutine(void * contextPtr, OTEventCode code, OTResult result, void * cookie);
-public:
-    InetSvcRef              mServiceRef;
-    OTNotifyUPP             nsDnsServiceNotifierRoutineUPP;
-#if TARGET_CARBON
-    OTClientContextPtr      mClientContext;
-#endif /* TARGET_CARBON */
-private:
-#endif /* XP_MAC */
-
-#if defined(XP_WIN)
-    friend static
-    LRESULT CALLBACK        nsDNSEventProc( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
-public:
-
-    PRUint32                AllocMsgID( void);
-    HWND                    mDNSWindow;
-
-private:
-    void                    FreeMsgID( PRUint32 msgID);
-	LRESULT                 ProcessLookup( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
- 
-    PRUint32                mMsgIDBitVector[4];
-#endif /* XP_WIN */
-
-
-#ifdef DNS_TIMING
-    friend class nsDNSRequest;
-
-    double              mCount;
-    double              mTimes;
-    double              mSquaredTimes;
-    FILE *              mOut;
-#endif
-};
-
-#endif /* nsDNSService_h__ */