mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-02-14 20:22:00 +00:00
![edburns%acm.org](/assets/img/avatar_default.png)
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.
161 lines
4.9 KiB
C++
161 lines
4.9 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): Ed Burns <edburns@acm.org>
|
|
*/
|
|
|
|
#include "org_mozilla_webclient_impl_wrapper_0005fnative_BookmarksImpl.h"
|
|
|
|
#include "rdf_util.h"
|
|
#include "ns_util.h"
|
|
|
|
#include "nsCOMPtr.h"
|
|
#include "nsISimpleEnumerator.h"
|
|
#include "nsString.h"
|
|
|
|
JNIEXPORT void JNICALL Java_org_mozilla_webclient_impl_wrapper_1native_BookmarksImpl_nativeStartup
|
|
(JNIEnv *env, jobject obj, jint nativeContext)
|
|
{
|
|
PR_LOG(prLogModuleInfo, PR_LOG_DEBUG,
|
|
("BookmarksImpl_nativeStartup: entering\n"));
|
|
NativeWrapperFactory *wcContext = (NativeWrapperFactory *) nativeContext;
|
|
|
|
PR_ASSERT(wcContext);
|
|
nsresult rv;
|
|
|
|
rv = rdf_startup();
|
|
|
|
if (NS_FAILED(rv)) {
|
|
::util_ThrowExceptionToJava(env, "Can't initialize bookmarks.");
|
|
return;
|
|
}
|
|
|
|
PR_LOG(prLogModuleInfo, PR_LOG_DEBUG,
|
|
("BookmarksImpl_nativeStartup: exiting\n"));
|
|
}
|
|
|
|
JNIEXPORT void JNICALL Java_org_mozilla_webclient_impl_wrapper_1native_BookmarksImpl_nativeShutdown
|
|
(JNIEnv *env, jobject obj, jint nativeContext)
|
|
{
|
|
PR_LOG(prLogModuleInfo, PR_LOG_DEBUG,
|
|
("BookmarksImpl_nativeShutdown: entering\n"));
|
|
NativeWrapperFactory *wcContext = (NativeWrapperFactory *) nativeContext;
|
|
|
|
PR_ASSERT(wcContext);
|
|
nsresult rv;
|
|
|
|
rv = rdf_shutdown();
|
|
|
|
if (NS_FAILED(rv)) {
|
|
::util_ThrowExceptionToJava(env, "Can't shutdown bookmarks.");
|
|
return;
|
|
}
|
|
|
|
PR_LOG(prLogModuleInfo, PR_LOG_DEBUG,
|
|
("BookmarksImpl_nativeShutdown: exiting\n"));
|
|
}
|
|
|
|
|
|
JNIEXPORT void JNICALL
|
|
Java_org_mozilla_webclient_impl_wrapper_1native_BookmarksImpl_nativeAddBookmark
|
|
(JNIEnv *, jobject, jint, jobject)
|
|
{
|
|
|
|
}
|
|
|
|
JNIEXPORT jint JNICALL Java_org_mozilla_webclient_impl_wrapper_1native_BookmarksImpl_nativeGetBookmarks
|
|
(JNIEnv *env, jobject obj, jint nativeContext)
|
|
{
|
|
jint result = -1;
|
|
|
|
PR_LOG(prLogModuleInfo, PR_LOG_DEBUG,
|
|
("BookmarksImpl_nativeGetBookmarks: entering\n"));
|
|
NativeWrapperFactory *wcContext = (NativeWrapperFactory *) nativeContext;
|
|
|
|
PR_ASSERT(wcContext);
|
|
PR_ASSERT(kNC_BookmarksRoot);
|
|
|
|
result = (jint) kNC_BookmarksRoot.get();
|
|
|
|
PR_LOG(prLogModuleInfo, PR_LOG_DEBUG,
|
|
("BookmarksImpl_nativeGetBookmarks: exiting\n"));
|
|
|
|
return result;
|
|
}
|
|
|
|
JNIEXPORT jint JNICALL
|
|
Java_org_mozilla_webclient_impl_wrapper_1native_BookmarksImpl_nativeNewRDFNode
|
|
(JNIEnv *env, jobject obj, jint nativeContext, jstring urlString,
|
|
jboolean isFolder)
|
|
{
|
|
PR_LOG(prLogModuleInfo, PR_LOG_DEBUG,
|
|
("BookmarksImpl_nativeNewRDFNode: entering\n"));
|
|
NativeWrapperFactory *wcContext = (NativeWrapperFactory *) nativeContext;
|
|
|
|
PR_ASSERT(wcContext);
|
|
jint result = -1;
|
|
|
|
PRUnichar *url = (PRUnichar *) ::util_GetStringChars(env, urlString);
|
|
if (!url) {
|
|
::util_ThrowExceptionToJava(env, "Exception: can't get new RDFNode, can't create url string");
|
|
return result;
|
|
}
|
|
|
|
nsresult rv;
|
|
nsCOMPtr<nsIRDFResource> newNode;
|
|
|
|
rv = gRDF->GetUnicodeResource(nsDependentString(url),
|
|
getter_AddRefs(newNode));
|
|
if (NS_FAILED(rv)) {
|
|
::util_ThrowExceptionToJava(env, "Exception: nativeNewRDFNode: can't create new nsIRDFResource.");
|
|
return result;
|
|
}
|
|
|
|
if (isFolder) {
|
|
rv = gRDFCU->MakeSeq(gBookmarksDataSource, newNode, nsnull);
|
|
if (NS_FAILED(rv)) {
|
|
::util_ThrowExceptionToJava(env, "Exception: unable to make new folder as a sequence.");
|
|
return result;
|
|
}
|
|
rv = gBookmarksDataSource->Assert(newNode, kRDF_type,
|
|
kNC_Folder, PR_TRUE);
|
|
if (rv != NS_OK) {
|
|
::util_ThrowExceptionToJava(env, "Exception: unable to mark new folder as folder.");
|
|
|
|
return result;
|
|
}
|
|
}
|
|
|
|
/*
|
|
|
|
* Do the AddRef here.
|
|
|
|
*/
|
|
|
|
result = (jint) newNode.get();
|
|
((nsISupports *)result)->AddRef();
|
|
|
|
::util_ReleaseStringChars(env, urlString, url);
|
|
|
|
PR_LOG(prLogModuleInfo, PR_LOG_DEBUG,
|
|
("BookmarksImpl_nativeNewRDFNode: exiting\n"));
|
|
|
|
return result;
|
|
}
|