runs, but nothing else does. As you all probably already know, all mozilla API calls have to happen on the same thread. For webclient, this will be the NativeEventThread. This change-bundle does many many things, here are the main ones. These changes are in concert with the checkin I just did to the diagram at <http://www.mozilla.org/projects/blackwood/webclient/design/20040306-webclient-2_0.zargo>. M classes_spec/org/mozilla/webclient/impl/WrapperFactory.java M classes_spec/org/mozilla/webclient/impl/wrapper_native/WrapperFactoryImpl.java * <p>This class is the hub of the startup and shutdown sequence for * Webclient. It is a singleton and owns references to other app * singletons:</p> * * <ul> * <li><p>{@link NativeEventThread}</p></li> * * <li><p>{@link Bookmarks}</p></li> * * <li><p>{@link Preferences}</p></li> * * <li><p>{@link ProfileManager}</p></li> * <li><p>the native object singleton corresponding to this java * object (if necessary)</p></li> * * </ul> * * <p>It maintains a set of {@link BrowserControlImpl} instances so that * we may return the native pointer for each one.</p> * * <p>This class is responsible for creating and initializing and * deleting {@link BrowserControlImpl} instances, as well as ensuring * that the native counterpart is proprely maintained in kind.</p> * * <p>This class has a tight contract with {@link * NativeEventThread}.</p> - make BrowserControl creation and deletion part of this classes responsibilities. - introduce NativeWrapperFactory concept. - own the one and only NativeEventThread. M classes_spec/org/mozilla/webclient/impl/wrapper_native/NativeEventThread.java - make this a singleton. - remove dependencies on BrowserControl and nativeBrowserControl * <p>This is a singleton class. All native events pass thru this class * by virtue of the {@link #pushRunnable} or {@link pushNotifyRunnable} * methods.</p> - remove listener logic. This'll go into EventRegistration, where it belongs. A src_moz/NativeWrapperFactory.cpp A src_moz/NativeWrapperFactory.h - takes the place of the old WebclientContext - is now a class M classes_spec/org/mozilla/webclient/impl/BrowserControlImpl.java - this no longer destroys the nativeBrowserControl. That is now done by WrapperFactoryImpl. M classes_spec/org/mozilla/webclient/impl/WebclientFactoryImpl.java - no longer maintain browserControlCount. M classes_spec/org/mozilla/webclient/impl/wrapper_native/BookmarksImpl.java M classes_spec/org/mozilla/webclient/impl/wrapper_native/NavigationImpl.java M classes_spec/org/mozilla/webclient/impl/wrapper_native/PreferencesImpl.java M classes_spec/org/mozilla/webclient/impl/wrapper_native/ProfileManagerImpl.java - rename NativeContext to NativeWrapperFactory, to illustrate its singletonness. M classes_spec/org/mozilla/webclient/impl/wrapper_native/EventRegistrationImpl.java - comment out a bunch of stuff in anticipation of the new threading model, currently being fleshed out. M classes_spec/org/mozilla/webclient/impl/wrapper_native/ImplObjectNative.java - NativeEventThread is singleton M src_moz/BookmarksImpl.cpp M src_moz/PreferencesImpl.cpp M src_moz/ProfileManagerImpl.cpp M src_moz/RDFEnumeration.cpp M src_moz/RDFTreeNode.cpp - rename WebclientContext to NativeWrapperFactory. M src_moz/EmbedWindow.cpp - mBaseWindow->Destroy(); + if (mBaseWindow) { + mBaseWindow->Destroy(); + } M src_moz/Makefile.in - Bring back NavigationImpl - add NativeWrapperFactory. M src_moz/NativeBrowserControl.cpp M src_moz/NativeBrowserControl.h - move event queue and java related stuff to NativeWrapperFactory. This class is now essentially a copy of EmbedPrivate in GtkEmbed. M src_moz/NativeEventThread.cpp - remove methods, most of it has moved to WrapperFactoryImpl/NativeWrapperFactory. M src_moz/NavigationImpl.cpp - comment out all methods but LoadURI. M src_moz/WrapperFactoryImpl.cpp - take functionality over from NativeEventThread. M src_moz/ns_util.cpp M src_moz/ns_util.h - the eventQueue is owned by NativeWrapperFactory now. M src_moz/rdf_util.cpp M src_share/jni_util.cpp - make all exceptions RuntimeExceptions, so they can be thrown from a Runnable. M test/automated/src/classes/org/mozilla/webclient/impl/wrapper_native/WrapperFactoryImplTest.java - comment out the meat of this test until I figure out how to test it. M test/automated/src/test/BrowserControlFactoryTest_correct - new content. git-svn-id: svn://10.0.0.236/trunk@154953 18797224-902f-48f8-a5cc-f745e15eee43
153 lines
4.2 KiB
C
153 lines
4.2 KiB
C
/* -*- 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>
|
|
* Ashutosh Kulkarni <ashuk@eng.sun.com>
|
|
* Ann Sunhachawee
|
|
*/
|
|
|
|
|
|
/**
|
|
|
|
* Util methods
|
|
|
|
*/
|
|
|
|
#ifndef ns_util_h
|
|
#define ns_util_h
|
|
|
|
#include "jni_util.h" // located in ../src_share,
|
|
// pulls in ../src_share/jni_util_export.h
|
|
|
|
#include "nsCOMPtr.h" // so we can save the docShell
|
|
#include "nsIWebBrowser.h"
|
|
#include "nsIDocShell.h" // so we can save our nsIDocShell
|
|
#include "nsIBaseWindow.h" // to get methods like SetVisibility
|
|
#include "nsIPresShell.h"
|
|
#include "nsIThread.h" // for PRThread
|
|
#include "nsIWebShell.h" // for nsIWebShell
|
|
#include "nsIEventQueueService.h" // for PLEventQueue
|
|
#include "nsIDOMDocument.h"
|
|
|
|
#include "wcIBrowserContainer.h" // our BrowserContainer
|
|
|
|
#include "NativeWrapperFactory.h"
|
|
|
|
#include "ns_globals.h"
|
|
|
|
// Ashu
|
|
#ifdef XP_UNIX
|
|
#include "nsIWidget.h" // for GTKWidget
|
|
#include <gtk/gtk.h>
|
|
#endif
|
|
//
|
|
|
|
#if defined(XP_UNIX) || defined(XP_MAC) || defined(XP_BEOS)
|
|
|
|
#define WC_ITOA(intVal, buf, radix) sprintf(buf, "%d", intVal)
|
|
#else
|
|
#define WC_ITOA(intVal, buf, radix) itoa(intVal, buf, radix)
|
|
#endif
|
|
|
|
//
|
|
// local classes
|
|
//
|
|
|
|
|
|
enum {
|
|
kEventQueueError = 1,
|
|
kCreateWebShellError,
|
|
kCreateDocShellError,
|
|
kGetBaseWindowError,
|
|
kInitWebShellError,
|
|
kShowWebShellError,
|
|
kHistoryWebShellError,
|
|
kClipboardWebShellError,
|
|
kFindComponentError,
|
|
kGetContentViewerError,
|
|
kGetDOMWindowError
|
|
};
|
|
|
|
extern const char *gSupportedListenerInterfaces[]; // defined in ns_util.cpp
|
|
|
|
/**
|
|
|
|
* This method calls PL_PostEvent(),
|
|
|
|
* http://lxr.mozilla.org/mozilla/source/xpcom/threads/plevent.c#248
|
|
|
|
* which simply uses nice monitors to insert the event into the provided
|
|
* event queue, which is from NativeBrowserControl->actionQueue, which is
|
|
* created in NativeEventThread.cpp:InitMozillaStuff(). The events are
|
|
* processed in NativeEventThread.cpp:processEventLoop, which is called
|
|
* from the Java NativeEventThread.run(). See the code and comments for
|
|
* processEventLoop in NativeEventThread.cpp.
|
|
|
|
*/
|
|
|
|
void util_PostEvent (NativeBrowserControl * initContext, PLEvent * event);
|
|
|
|
|
|
/**
|
|
|
|
* This method calls PL_PostSynchronousEvent(),
|
|
|
|
* http://lxr.mozilla.org/mozilla/source/xpcom/threads/plevent.c#278
|
|
|
|
* which, instead of putting the event in the queue, as in
|
|
* util_PostEvent(), either calls the event's handler directly, or puts
|
|
* it in the queue and waits for it to be processed so it can return the
|
|
* result.
|
|
|
|
*/
|
|
|
|
void * util_PostSynchronousEvent (NativeBrowserControl * initContext, PLEvent * event);
|
|
|
|
typedef struct _wsStringStruct {
|
|
const PRUnichar *uniStr;
|
|
jstring jStr;
|
|
} wsStringStruct;
|
|
|
|
/**
|
|
|
|
* @param strings wsStringStruct []. A null terminated array of
|
|
* wsStringStruct instances. On return, the jStr of each element is the
|
|
* new jstring. Call util_DeleteJstringsFromUnichars to deallocate.
|
|
|
|
*/
|
|
|
|
nsresult util_CreateJstringsFromUnichars(wsStringStruct *strings,
|
|
PRInt32 arrayLen);
|
|
|
|
nsresult util_DeleteJstringsFromUnichars(wsStringStruct *strings,
|
|
PRInt32 arrayLen);
|
|
|
|
// hack functions to get around mozilla oddities
|
|
#ifdef XP_UNIX
|
|
jint util_GetGTKWinPtrFromCanvas(JNIEnv *env, jobject browserControlCanvas);
|
|
#endif
|
|
|
|
nsresult util_GetLocaleString(const char *aKey, PRUnichar **aResult);
|
|
|
|
#endif // ns_util_h
|