Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ed's fix for bug where multiple window closing caused null ptr error

Browse Source 
author = edburns
r = ashuk


git-svn-id: svn://10.0.0.236/trunk@71180 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
ashuk%eng.sun.com
2000-05-31 21:55:49 +00:00
parent 62677f207f
commit 3887ea225b
2 changed files with 239 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

324
mozilla/java/webclient/src_moz/DocumentLoaderObserverImpl.h
View File

@@ -1,161 +1,163 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
*
* 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 RaptorCanvas.
*
* The Initial Developer of the Original Code is Kirk Baker and
* Ian Wilkinson. Portions created by Kirk Baker and Ian Wilkinson are
* Copyright (C) 1999 Kirk Baker and Ian Wilkinson. All
* Rights Reserved.
*
* Contributor(s): Kirk Baker <kbaker@eb.com>
* Ian Wilkinson <iw@ennoble.com>
* Mark Lin <mark.lin@eng.sun.com>
* Mark Goddard
* Ed Burns <edburns@acm.org>
* Ann Sunhachawee
*/
#ifndef DocumentLoaderObserverImpl_h
#define DocumentLoaderObserverImpl_h
#include "nsISupports.h"
#include "nsISupportsUtils.h"
#include "nsString.h"
#include "nsIDocumentLoaderObserver.h"
#include "nsIDOMMouseListener.h"
class nsIURI;
#include "jni_util.h"
#include "nsCOMPtr.h"
/**
* We define a local IID to allow the addDocumentLoadListener and
* addMouseListener functions in EventRegistration.{h,cpp} to
* interrogate the currently installed DocumentLoaderObserver instance
* in mozilla.
*/
#define NS_IDOCLOADEROBSERVERIMPL_IID_STR "fdadb2e0-3028-11d4-8a96-0080c7b9c5ba"
#define NS_IDOCLOADEROBSERVERIMPL_IID {0xfdadb2e0, 0x3028, 0x11d4, { 0x8a, 0x96, 0x00, 0x80, 0xc7, 0xb9, 0xc5, 0xba }}
/**
* This class is the shim between the mozilla listener event system for
* document load events and the java DocumentLoadListener interface.
* For each of the On* methods, we call the appropriate method in java.
* See the implementation of OnEndDocumentLoad for an example.
* A DocumentLoaderObserverImpl instance has a "jobject target", which
* is the Java object that should ultimately receive the events. This
* target will be null if the user just wants to listen for mouse
* events. It willl be non-null if the user wants to listen for
* DocumentLoad events.
* It also hosts a nsIDOMMouseListener instance, which piggybacks on the
* nsIDocumentLoaderObserver instance.
*/
class DocumentLoaderObserverImpl : public nsIDocumentLoaderObserver {
NS_DECL_ISUPPORTS
public:
typedef enum {
START_DOCUMENT_LOAD_EVENT_MASK = 0,
END_DOCUMENT_LOAD_EVENT_MASK,
START_URL_LOAD_EVENT_MASK,
END_URL_LOAD_EVENT_MASK,
PROGRESS_URL_LOAD_EVENT_MASK,
STATUS_URL_LOAD_EVENT_MASK,
UNKNOWN_CONTENT_EVENT_MASK,
FETCH_INTERRUPT_EVENT_MASK,
NUMBER_OF_MASK_NAMES
} EVENT_MASK_NAMES;
#ifdef XP_UNIX
static jlong maskValues [NUMBER_OF_MASK_NAMES];
#else
static jlong maskValues [DocumentLoaderObserverImpl::EVENT_MASK_NAMES::NUMBER_OF_MASK_NAMES];
#endif
static char *maskNames [];
DocumentLoaderObserverImpl(JNIEnv *yourJNIEnv,
WebShellInitContext *yourInitContext);
DocumentLoaderObserverImpl();
virtual ~DocumentLoaderObserverImpl() {};
/* nsIDocumentLoaderObserver methods */
NS_IMETHOD OnStartDocumentLoad(nsIDocumentLoader* loader,
nsIURI* aURL,
const char* aCommand);
NS_IMETHOD OnEndDocumentLoad(nsIDocumentLoader* loader,
nsIChannel* channel,
nsresult aStatus);
NS_IMETHOD OnStartURLLoad(nsIDocumentLoader* loader,
nsIChannel* channel);
NS_IMETHOD OnProgressURLLoad(nsIDocumentLoader* loader,
nsIChannel* channel,
PRUint32 aProgress,
PRUint32 aProgressMax);
NS_IMETHOD OnStatusURLLoad(nsIDocumentLoader* loader,
nsIChannel* channel,
nsString& aMsg);
NS_IMETHOD OnEndURLLoad(nsIDocumentLoader* loader,
nsIChannel* channel,
nsresult aStatus);
NS_IMETHOD HandleUnknownContentType(nsIDocumentLoader* loader,
nsIChannel* channel,
const char *aContentType,
const char *aCommand);
//
// Methods for NS_IDOCLOADEROBSERVERIMPL_IID
//
/**
* Called in EventRegistration.{h,cpp} addMouseListener.
*/
NS_IMETHOD AddMouseListener(nsCOMPtr<nsIDOMMouseListener> toAdd);
NS_IMETHOD RemoveMouseListener(nsCOMPtr<nsIDOMMouseListener> toRemove);
NS_IMETHOD SetTarget(jobject newTarget);
NS_IMETHOD ClearTarget(void);
protected:
JNIEnv *mJNIEnv;
WebShellInitContext *mInitContext;
jobject mTarget;
nsCOMPtr<nsIDOMMouseListener> mMouseListener;
};
#endif // DocumentLoaderObserverImpl_h
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
*
* 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 RaptorCanvas.
*
* The Initial Developer of the Original Code is Kirk Baker and
* Ian Wilkinson. Portions created by Kirk Baker and Ian Wilkinson are
* Copyright (C) 1999 Kirk Baker and Ian Wilkinson. All
* Rights Reserved.
*
* Contributor(s): Kirk Baker <kbaker@eb.com>
* Ian Wilkinson <iw@ennoble.com>
* Mark Lin <mark.lin@eng.sun.com>
* Mark Goddard
* Ed Burns <edburns@acm.org>
* Ann Sunhachawee
*/
#ifndef DocumentLoaderObserverImpl_h
#define DocumentLoaderObserverImpl_h
#include "nsISupports.h"
#include "nsISupportsUtils.h"
#include "nsString.h"
#include "nsIDocumentLoaderObserver.h"
#include "nsIDOMMouseListener.h"
#include "nsIDOMEventTarget.h"
class nsIURI;
#include "jni_util.h"
#include "nsCOMPtr.h"
/**
* We define a local IID to allow the addDocumentLoadListener and
* addMouseListener functions in EventRegistration.{h,cpp} to
* interrogate the currently installed DocumentLoaderObserver instance
* in mozilla.
*/
#define NS_IDOCLOADEROBSERVERIMPL_IID_STR "fdadb2e0-3028-11d4-8a96-0080c7b9c5ba"
#define NS_IDOCLOADEROBSERVERIMPL_IID {0xfdadb2e0, 0x3028, 0x11d4, { 0x8a, 0x96, 0x00, 0x80, 0xc7, 0xb9, 0xc5, 0xba }}
/**
* This class is the shim between the mozilla listener event system for
* document load events and the java DocumentLoadListener interface.
* For each of the On* methods, we call the appropriate method in java.
* See the implementation of OnEndDocumentLoad for an example.
* A DocumentLoaderObserverImpl instance has a "jobject target", which
* is the Java object that should ultimately receive the events. This
* target will be null if the user just wants to listen for mouse
* events. It willl be non-null if the user wants to listen for
* DocumentLoad events.
* It also hosts a nsIDOMMouseListener instance, which piggybacks on the
* nsIDocumentLoaderObserver instance.
*/
class DocumentLoaderObserverImpl : public nsIDocumentLoaderObserver {
NS_DECL_ISUPPORTS
public:
typedef enum {
START_DOCUMENT_LOAD_EVENT_MASK = 0,
END_DOCUMENT_LOAD_EVENT_MASK,
START_URL_LOAD_EVENT_MASK,
END_URL_LOAD_EVENT_MASK,
PROGRESS_URL_LOAD_EVENT_MASK,
STATUS_URL_LOAD_EVENT_MASK,
UNKNOWN_CONTENT_EVENT_MASK,
FETCH_INTERRUPT_EVENT_MASK,
NUMBER_OF_MASK_NAMES
} EVENT_MASK_NAMES;
#ifdef XP_UNIX
static jlong maskValues [NUMBER_OF_MASK_NAMES];
#else
static jlong maskValues [DocumentLoaderObserverImpl::EVENT_MASK_NAMES::NUMBER_OF_MASK_NAMES];
#endif
static char *maskNames [];
DocumentLoaderObserverImpl(JNIEnv *yourJNIEnv,
WebShellInitContext *yourInitContext);
DocumentLoaderObserverImpl();
virtual ~DocumentLoaderObserverImpl();
/* nsIDocumentLoaderObserver methods */
NS_IMETHOD OnStartDocumentLoad(nsIDocumentLoader* loader,
nsIURI* aURL,
const char* aCommand);
NS_IMETHOD OnEndDocumentLoad(nsIDocumentLoader* loader,
nsIChannel* channel,
nsresult aStatus);
NS_IMETHOD OnStartURLLoad(nsIDocumentLoader* loader,
nsIChannel* channel);
NS_IMETHOD OnProgressURLLoad(nsIDocumentLoader* loader,
nsIChannel* channel,
PRUint32 aProgress,
PRUint32 aProgressMax);
NS_IMETHOD OnStatusURLLoad(nsIDocumentLoader* loader,
nsIChannel* channel,
nsString& aMsg);
NS_IMETHOD OnEndURLLoad(nsIDocumentLoader* loader,
nsIChannel* channel,
nsresult aStatus);
NS_IMETHOD HandleUnknownContentType(nsIDocumentLoader* loader,
nsIChannel* channel,
const char *aContentType,
const char *aCommand);
//
// Methods for NS_IDOCLOADEROBSERVERIMPL_IID
//
/**
* Called in EventRegistration.{h,cpp} addMouseListener.
*/
NS_IMETHOD AddMouseListener(nsCOMPtr<nsIDOMMouseListener> toAdd);
NS_IMETHOD RemoveMouseListener(void);
NS_IMETHOD SetTarget(jobject newTarget);
NS_IMETHOD ClearTarget(void);
protected:
JNIEnv *mJNIEnv;
WebShellInitContext *mInitContext;
jobject mTarget;
nsCOMPtr<nsIDOMMouseListener> mMouseListener;
nsCOMPtr<nsIDOMEventTarget> mDomEventTarget;
};
#endif // DocumentLoaderObserverImpl_h

150
mozilla/java/webclient/src_moz/EventRegistration.h
View File

@@ -1,74 +1,76 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
*
* 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 RaptorCanvas.
*
* The Initial Developer of the Original Code is Kirk Baker and
* Ian Wilkinson. Portions created by Kirk Baker and Ian Wilkinson are
* Copyright (C) 1999 Kirk Baker and Ian Wilkinson. All
* Rights Reserved.
*
* Contributor(s): Kirk Baker <kbaker@eb.com>
* Ian Wilkinson <iw@ennoble.com>
* Mark Lin <mark.lin@eng.sun.com>
* Mark Goddard
* Ed Burns <edburns@acm.org>
* Ann Sunhachawee
*/
#ifndef EventRegistration_h
#define EventRegistration_h
#include "jni_util.h"
/**
* This file contains methods to add and remove listeners.
*/
/**
* This function creates an instance of DocumentLoaderObserverImpl,
* which is the shim between the mozilla nsIDocumentLoaderObserver class
* and the Java DocumentLoadListener interface. See
* DocumentLoaderObserverImpl.h
* PENDING(): implement removeDocumentLoadListener
* PENDING(): implement the ability to have multiple listener instances
* per listener types, all of which get notified.
*/
void addDocumentLoadListener(JNIEnv *env, WebShellInitContext *initContext,
jobject listener);
/**
* This function creates an instance of DOMMouseListenerImpl,
* which is the shim between the mozilla nsIDOMMouseListener class
* and the Java MouseListener interface. See
* DocumentLoaderObserverImpl.h
* PENDING(): implement removeMouseListener
* PENDING(): implement the ability to have multiple listener instances
* per listener types, all of which get notified.
*/
void addMouseListener(JNIEnv *env, WebShellInitContext *initContext,
jobject listener);
#endif
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
*
* 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 RaptorCanvas.
*
* The Initial Developer of the Original Code is Kirk Baker and
* Ian Wilkinson. Portions created by Kirk Baker and Ian Wilkinson are
* Copyright (C) 1999 Kirk Baker and Ian Wilkinson. All
* Rights Reserved.
*
* Contributor(s): Kirk Baker <kbaker@eb.com>
* Ian Wilkinson <iw@ennoble.com>
* Mark Lin <mark.lin@eng.sun.com>
* Mark Goddard
* Ed Burns <edburns@acm.org>
* Ann Sunhachawee
*/
#ifndef EventRegistration_h
#define EventRegistration_h
#include "jni_util.h"
/**
* This file contains methods to add and remove listeners.
*/
/**
* This function creates an instance of DocumentLoaderObserverImpl,
* which is the shim between the mozilla nsIDocumentLoaderObserver class
* and the Java DocumentLoadListener interface. See
* DocumentLoaderObserverImpl.h
* PENDING(): implement removeDocumentLoadListener
* PENDING(): implement the ability to have multiple listener instances
* per listener types, all of which get notified.
*/
void addDocumentLoadListener(JNIEnv *env, WebShellInitContext *initContext,
jobject listener);
/**
* This function creates an instance of DOMMouseListenerImpl,
* which is the shim between the mozilla nsIDOMMouseListener class
* and the Java MouseListener interface. See
* DocumentLoaderObserverImpl.h
* PENDING(): implement removeMouseListener
* PENDING(): implement the ability to have multiple listener instances
* per listener types, all of which get notified.
*/
void addMouseListener(JNIEnv *env, WebShellInitContext *initContext,
jobject listener);
void removeAllListeners(JNIEnv *env, WebShellInitContext *initContext);
#endif