This checkin extracts the thread coordination mechanism used within

webclient into an internal contract so it can be used by dom.

M dom/classes/org/mozilla/dom/DOMAccessor.java

- use RunnableRunner and ReturnRunnable to do internal thread
  coordination.

M webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/BookmarksImpl.java
M webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/CocoaBrowserControlCanvas.java
M webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/CurrentPageImpl.java
M webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/EventRegistrationImpl.java
M webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/GtkBrowserControlCanvas.java
M webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/HistoryImpl.java
M webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/NavigationImpl.java
M webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/PreferencesImpl.java
M webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/ProfileManagerImpl.java
M webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/RDFEnumeration.java
M webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/Win32BrowserControlCanvas.java
M webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/WindowControlImpl.java
M webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/WrapperFactoryImpl.java

- Refactor to rename WCRunnable to ReturnRunnable.

M webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/NativeEventThread.java
A util/classes/org/mozilla/util/ReturnRunnable.java

- Implement new RunnableRunner interface.

R webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/WCRunnable.java
A util/classes/org/mozilla/util/RunnableRunner.java

- moved class


git-svn-id: svn://10.0.0.236/trunk@221794 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
edburns%acm.org
2007-03-12 20:39:22 +00:00
parent e84de3a337
commit 4c249b774c
17 changed files with 190 additions and 72 deletions

View File

@@ -80,22 +80,72 @@ package org.mozilla.dom;
import java.util.Vector;
import java.util.Enumeration;
import org.mozilla.util.ReturnRunnable;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import java.security.AccessController;
import org.mozilla.util.RunnableRunner;
public final class DOMAccessor {
private static final String JAVADOM_LOADED_PROPERTY_NAME =
"org.mozilla.webclient.impl.wrapper_native.javadomjni.loaded";
private static RunnableRunner runnableRunner = null;
private static Vector documentLoadListeners = new Vector();
private static JavaDOMPermission permission = new JavaDOMPermission("JavaDOM");
static {
System.loadLibrary("javadomjni");
private static boolean isNativeLibraryLoaded = false;
private static boolean isNativeLibraryLoadedPropertySet = false;
public static boolean isNativeLibraryLoaded() {
if (isNativeLibraryLoadedPropertySet) {
return isNativeLibraryLoaded;
}
boolean result = false;
String propValue = System.getProperty(JAVADOM_LOADED_PROPERTY_NAME);
if (null != propValue) {
try {
result = Boolean.valueOf(propValue).booleanValue();
}
catch (Exception e) {
result = isNativeLibraryLoaded;
}
}
else {
result = isNativeLibraryLoaded;
}
return result;
}
public static void setNativeLibraryLoaded(boolean newState) {
isNativeLibraryLoaded = newState;
isNativeLibraryLoadedPropertySet = true;
}
private void DOMAccessorImpl() {}
static {
if (!isNativeLibraryLoaded()) {
System.loadLibrary("javadomjni");
setNativeLibraryLoaded(true);
}
}
private void DOMAccessorImpl() {
if (null == runnableRunner) {
runnableRunner = new SameThreadRunnableRunner();
}
}
public static void setRunner(RunnableRunner runner) {
runnableRunner = runner;
}
public static RunnableRunner getRunner() {
return runnableRunner;
}
private static void register() {
nativeRegister();
@@ -218,4 +268,20 @@ public final class DOMAccessor {
}
doGC();
}
}
class SameThreadRunnableRunner implements RunnableRunner {
SameThreadRunnableRunner() {}
public void pushRunnable(Runnable toInvoke) {
toInvoke.run();
}
public Object pushBlockingReturnRunnable(ReturnRunnable toInvoke) throws RuntimeException {
toInvoke.run();
return toInvoke.getResult();
}
}