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
370 lines
12 KiB
C++
370 lines
12 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
|
|
*/
|
|
|
|
#include "org_mozilla_webclient_impl_wrapper_0005fnative_WrapperFactoryImpl.h"
|
|
|
|
#include "ns_util.h"
|
|
#include "nsCRT.h" // for nsCRT::strcmp
|
|
|
|
#include <nsWidgetsCID.h> // for NS_APPSHELL_CID
|
|
#include <nsIComponentManager.h> // for do_CreateInstance
|
|
#include <nsILocalFile.h>
|
|
#include <nsEmbedAPI.h> // for NS_InitEmbedding
|
|
#include <nsIComponentRegistrar.h>
|
|
#include <nsDependentString.h> // for nsDependentCString
|
|
|
|
#include <prenv.h> // for PR_SetEnv
|
|
|
|
#include <nsIAppShell.h>
|
|
|
|
#ifdef XP_UNIX
|
|
#include <unistd.h> // for getpid
|
|
#endif
|
|
#ifdef XP_PC
|
|
#include <windows.h> // for GetCurrentProcessId()
|
|
#endif
|
|
|
|
#include "NativeBrowserControl.h"
|
|
|
|
static NS_DEFINE_CID(kAppShellCID, NS_APPSHELL_CID);
|
|
|
|
//
|
|
// global data
|
|
//
|
|
|
|
PRLogModuleInfo *prLogModuleInfo = NULL; // declared in ns_globals.h
|
|
|
|
const char *gImplementedInterfaces[] = {
|
|
"webclient.WindowControl",
|
|
"webclient.Navigation",
|
|
"webclient.CurrentPage",
|
|
"webclient.History",
|
|
"webclient.EventRegistration",
|
|
"webclient.Bookmarks",
|
|
"webclient.Preferences",
|
|
"webclient.ProfileManager",
|
|
nsnull
|
|
};
|
|
|
|
char * errorMessages[] = {
|
|
"No Error",
|
|
"Could not obtain the event queue service.",
|
|
"Unable to create the WebShell instance.",
|
|
"Unable to initialize the WebShell instance.",
|
|
"Unable to show the WebShell."
|
|
};
|
|
|
|
|
|
//
|
|
// Local Functions
|
|
//
|
|
|
|
//
|
|
// Functions to hook into mozilla
|
|
//
|
|
|
|
JNIEXPORT jint JNICALL
|
|
Java_org_mozilla_webclient_impl_wrapper_1native_WrapperFactoryImpl_nativeCreateNativeWrapperFactory(
|
|
JNIEnv *env, jobject obj)
|
|
{
|
|
prLogModuleInfo = PR_NewLogModule("webclient");
|
|
NativeWrapperFactory *result = new NativeWrapperFactory();
|
|
return (jint) result;
|
|
}
|
|
|
|
|
|
|
|
JNIEXPORT void JNICALL
|
|
Java_org_mozilla_webclient_impl_wrapper_1native_WrapperFactoryImpl_nativeAppInitialize(
|
|
JNIEnv *env, jobject obj, jstring verifiedBinDirAbsolutePath, jint nativeWF, jobject nativeEventThread)
|
|
{
|
|
const char *nativePath = nsnull;
|
|
NativeWrapperFactory *nativeWrapperFactory = (NativeWrapperFactory *) nativeWF;
|
|
nsresult rv;
|
|
nsCOMPtr<nsILocalFile> binDir;
|
|
|
|
// PENDING(edburns): We need this for rdf_getChildCount
|
|
PR_SetEnv("XPCOM_CHECK_THREADSAFE=0");
|
|
|
|
//
|
|
// create an nsILocalFile from our argument
|
|
//
|
|
|
|
PR_LOG(prLogModuleInfo, PR_LOG_DEBUG,
|
|
("WrapperFactoryImpl_nativeAppInitialize: entering\n"));
|
|
|
|
nativePath = (const char *) ::util_GetStringUTFChars(env,
|
|
verifiedBinDirAbsolutePath);
|
|
PR_LOG(prLogModuleInfo, PR_LOG_DEBUG,
|
|
("WrapperFactoryImpl_nativeAppInitialize: nativeBinDir: %s\n",
|
|
nativePath));
|
|
|
|
if (nativePath) {
|
|
rv = NS_NewNativeLocalFile(nsDependentCString(nativePath), 1,
|
|
getter_AddRefs(binDir));
|
|
PR_LOG(prLogModuleInfo, PR_LOG_DEBUG,
|
|
("WrapperFactoryImpl_nativeAppInitialize: NS_NewNativeLocalFile rv: %d\n",
|
|
rv));
|
|
|
|
if (NS_FAILED(rv)) {
|
|
::util_ThrowExceptionToJava(env,
|
|
"Can't get nsILocalFile from bin directory");
|
|
}
|
|
}
|
|
::util_ReleaseStringUTFChars(env, verifiedBinDirAbsolutePath, nativePath);
|
|
|
|
//
|
|
// Make the all important NS_InitEmbedding call
|
|
//
|
|
|
|
rv = NS_InitEmbedding(binDir, nsnull);
|
|
PR_LOG(prLogModuleInfo, PR_LOG_DEBUG,
|
|
("WrapperFactoryImpl_nativeAppInitialize: NS_InitEmbedding rv: %d\n",
|
|
rv));
|
|
|
|
if (NS_FAILED(rv)) {
|
|
::util_ThrowExceptionToJava(env, "NS_InitEmbedding() failed.");
|
|
}
|
|
|
|
// the rest of the startup tasks are coordinated from the java side.
|
|
PR_LOG(prLogModuleInfo, PR_LOG_DEBUG,
|
|
("WrapperFactoryImpl_nativeAppInitialize: exiting\n"));
|
|
|
|
char propValue[50];
|
|
::util_getSystemProperty(env, "native.waitForDebugger", propValue, 50);
|
|
if (nsnull != propValue[0] &&
|
|
0 < nsCRT::strlen(propValue)) {
|
|
#ifdef XP_UNIX
|
|
pid_t pid = getpid();
|
|
printf("++++++++++++++++debug: pid is: %d\n", pid);
|
|
#endif
|
|
#ifdef XP_PC
|
|
printf("++++++++++++++++debug: pid is: %d\n", GetCurrentProcessId());
|
|
#endif
|
|
fflush(stdout);
|
|
PR_Sleep(700000);
|
|
}
|
|
|
|
// Store our pointer to the global vm
|
|
if (nsnull == gVm) { // declared in ../src_share/jni_util.h
|
|
::util_GetJavaVM(env, &gVm); // save this vm reference
|
|
}
|
|
|
|
util_InitializeShareInitContext(env, &(nativeWrapperFactory->shareContext));
|
|
rv = nativeWrapperFactory->Init(env, nativeEventThread);
|
|
if (NS_FAILED(rv)) {
|
|
::util_ThrowExceptionToJava(env,
|
|
"Failed to init NativeWrapperFactory");
|
|
}
|
|
}
|
|
|
|
JNIEXPORT void JNICALL
|
|
Java_org_mozilla_webclient_impl_wrapper_1native_WrapperFactoryImpl_nativeAppSetup
|
|
(JNIEnv *env, jobject obj, jint nativeContext)
|
|
{
|
|
PR_LOG(prLogModuleInfo, PR_LOG_DEBUG,
|
|
("WrapperFactoryImpl_nativeAppSetup: entering\n"));
|
|
nsresult rv;
|
|
NativeWrapperFactory *wcContext = (NativeWrapperFactory *) nativeContext;
|
|
|
|
PR_ASSERT(wcContext);
|
|
|
|
nsCOMPtr<nsIComponentRegistrar> cr;
|
|
rv = NS_GetComponentRegistrar(getter_AddRefs(cr));
|
|
if (NS_FAILED(rv)) {
|
|
::util_ThrowExceptionToJava(env,
|
|
"Failed to create Component Registrar");
|
|
return;
|
|
}
|
|
|
|
// appshell
|
|
// XXX startup appshell service?
|
|
// XXX create offscreen window for appshell service?
|
|
// XXX remove X prop from offscreen window?
|
|
|
|
nsCOMPtr<nsIAppShell> appShell;
|
|
appShell = do_CreateInstance(kAppShellCID);
|
|
if (!appShell) {
|
|
::util_ThrowExceptionToJava(env,
|
|
"Failed to create AppShell");
|
|
return;
|
|
}
|
|
wcContext->sAppShell = appShell.get();
|
|
NS_ADDREF(wcContext->sAppShell);
|
|
|
|
rv = wcContext->sAppShell->Create(0, nsnull);
|
|
PR_LOG(prLogModuleInfo, PR_LOG_DEBUG,
|
|
("WrapperFactoryImpl_nativeAppSetup: AppShell create rv: %d\n",
|
|
rv));
|
|
|
|
if (NS_FAILED(rv)) {
|
|
::util_ThrowExceptionToJava(env,
|
|
"Failed to create AppShell");
|
|
return;
|
|
}
|
|
rv = wcContext->sAppShell->Spinup();
|
|
PR_LOG(prLogModuleInfo, PR_LOG_DEBUG,
|
|
("WrapperFactoryImpl_nativeAppSetup: AppShell spinup rv: %d\n",
|
|
rv));
|
|
if (NS_FAILED(rv)) {
|
|
::util_ThrowExceptionToJava(env,
|
|
"Failed to Spinup AppShell");
|
|
return;
|
|
}
|
|
|
|
PR_LOG(prLogModuleInfo, PR_LOG_DEBUG,
|
|
("WrapperFactoryImpl_nativeAppSetup: exiting\n"));
|
|
|
|
}
|
|
|
|
|
|
JNIEXPORT void JNICALL
|
|
Java_org_mozilla_webclient_impl_wrapper_1native_WrapperFactoryImpl_nativeTerminate
|
|
(JNIEnv *env, jobject obj, jint nativeContext)
|
|
{
|
|
PR_LOG(prLogModuleInfo, PR_LOG_DEBUG,
|
|
("WrapperFactoryImpl_nativeTerminate: entering\n"));
|
|
nsresult rv;
|
|
NativeWrapperFactory *wcContext = (NativeWrapperFactory *) nativeContext;
|
|
|
|
PR_ASSERT(wcContext);
|
|
|
|
if (wcContext->sAppShell) {
|
|
rv = wcContext->sAppShell->Spindown();
|
|
PR_LOG(prLogModuleInfo, PR_LOG_DEBUG,
|
|
("WrapperFactoryImpl_nativeTerminate: Spindown rv: %d\n",
|
|
rv));
|
|
|
|
NS_RELEASE(wcContext->sAppShell);
|
|
wcContext->sAppShell = nsnull;
|
|
}
|
|
PR_ASSERT(nsnull == wcContext->sProfile);
|
|
PR_ASSERT(nsnull == wcContext->sProfileInternal);
|
|
|
|
util_DeallocateShareInitContext(env, &(wcContext->shareContext));
|
|
|
|
wcContext->Destroy();
|
|
|
|
delete wcContext;
|
|
|
|
// PENDING(edburns): do the rest of the stuff from
|
|
// mozilla/embedding/browser/gtk/src/EmbedPrivate.cpp::PopStartup(void),
|
|
// and NativeEventThread.cpp
|
|
|
|
// shut down XPCOM/Embedding
|
|
rv = NS_TermEmbedding();
|
|
PR_LOG(prLogModuleInfo, PR_LOG_DEBUG,
|
|
("WrapperFactoryImpl_nativeTerminate: NS_TermEmbedding rv: %d\n",
|
|
rv));
|
|
|
|
if (NS_FAILED(rv)) {
|
|
::util_ThrowExceptionToJava(env, "NS_TermEmbedding() failed.");
|
|
}
|
|
|
|
PR_LOG(prLogModuleInfo, PR_LOG_DEBUG,
|
|
("WrapperFactoryImpl_nativeTerminate: exiting\n"));
|
|
}
|
|
|
|
JNIEXPORT jboolean JNICALL
|
|
Java_org_mozilla_webclient_impl_wrapper_1native_WrapperFactoryImpl_nativeDoesImplement
|
|
(JNIEnv *env, jobject obj, jstring interfaceName)
|
|
{
|
|
const char *iName = (const char *) ::util_GetStringUTFChars(env,
|
|
interfaceName);
|
|
jboolean result = JNI_FALSE;
|
|
|
|
int i = 0;
|
|
|
|
if (nsnull == iName) {
|
|
return result;
|
|
}
|
|
|
|
while (nsnull != gImplementedInterfaces[i]) {
|
|
if (0 == nsCRT::strcmp(gImplementedInterfaces[i++], iName)) {
|
|
result = JNI_TRUE;
|
|
break;
|
|
}
|
|
}
|
|
::util_ReleaseStringUTFChars(env, interfaceName, iName);
|
|
|
|
return result;
|
|
}
|
|
|
|
JNIEXPORT jint JNICALL Java_org_mozilla_webclient_impl_wrapper_1native_WrapperFactoryImpl_nativeCreateBrowserControl
|
|
(JNIEnv *env, jobject obj) {
|
|
NativeBrowserControl* initContext = new NativeBrowserControl();
|
|
|
|
return (jint) initContext;
|
|
}
|
|
|
|
JNIEXPORT void JNICALL Java_org_mozilla_webclient_impl_wrapper_1native_WrapperFactoryImpl_nativeInitBrowserControl
|
|
(JNIEnv *env, jobject obj, jint nativeWFPtr, jint nativeBCPtr) {
|
|
nsresult rv = NS_ERROR_FAILURE;
|
|
NativeWrapperFactory * nativeWrapperFactory = (NativeWrapperFactory *) nativeWFPtr;
|
|
NativeBrowserControl * nativeBrowserControl = (NativeBrowserControl *) nativeBCPtr;
|
|
|
|
if (!nativeBrowserControl || !nativeWFPtr) {
|
|
::util_ThrowExceptionToJava(env,
|
|
"NULL nativeBCPtr passed to nativeInitBrowserControl.");
|
|
return;
|
|
}
|
|
rv = nativeBrowserControl->Init();
|
|
if (NS_FAILED(rv)) {
|
|
::util_ThrowExceptionToJava(env,
|
|
errorMessages[3]);
|
|
return;
|
|
}
|
|
nativeWrapperFactory->ProcessEventLoop();
|
|
|
|
while (!nativeWrapperFactory->IsInitialized()) {
|
|
|
|
::PR_Sleep(PR_INTERVAL_NO_WAIT);
|
|
|
|
if (NS_FAILED(nativeWrapperFactory->GetFailureCode())) {
|
|
::util_ThrowExceptionToJava(env, errorMessages[3]);
|
|
return;
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
JNIEXPORT jint JNICALL Java_org_mozilla_webclient_impl_wrapper_1native_WrapperFactoryImpl_nativeDestroyBrowserControl
|
|
(JNIEnv *env, jobject obj, jint nativeBC) {
|
|
NativeBrowserControl* nativeBrowserControl = (NativeBrowserControl *)nativeBC;
|
|
if (!nativeBrowserControl) {
|
|
::util_ThrowExceptionToJava(env,
|
|
"NULL nativeBCPtr passed to nativeDestroyBrowserControl.");
|
|
return -1;
|
|
}
|
|
nativeBrowserControl->Destroy();
|
|
|
|
delete nativeBrowserControl;
|
|
return 0;
|
|
}
|
|
|