This change-bundle allows Webclient to work on Mac OS X Cocoa.
A webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/NativeBrowserControlCanvas.java - The base class for all native browser controls M build.xml - rm -rf dist/classes on clean M dist/mcp-test/src/test/java/cardemo/CarDemoTest.java - disable, due to https://bugzilla.mozilla.org/show_bug.cgi?id=366619 not being fixed on FIREFOX_2_0_0_3_RELEASE branch. M dom/jni/nativeDOMProxyListener.cpp - Need extra void ** cast for first argument to AttachCurrentThread M dom/jni/org_mozilla_dom_ElementImpl.cpp - modify handleInterceptableAttr to adjust screenX,screenY per cross platform fudge factors. M dom/src/nsJavaDOMImpl.cpp - use %p instead of %x when printing out pointers - Need extra void ** cast for first argument to AttachCurrentThread M webclient/classes_spec/org/mozilla/mcp/MCP.java - remove fudge factor, moved into DOM layer. M webclient/classes_spec/org/mozilla/webclient/BrowserControlCanvas.java - add logging - push some code down to NativeBrowserControlCanvas M webclient/classes_spec/org/mozilla/webclient/NewWindowEvent.java - change the contract of how a new window event is handled. M webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/CocoaAppKitThreadDelegatingNativeEventThread.java - correctly case where exception is thrown on the AppKit thread when doing a ReturnRunnable. M webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/CocoaBrowserControlCanvas.java M webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/Win32BrowserControlCanvas.java - make this extend NativeBrowserControlCanvas M webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/EventRegistrationImpl.java - new contract for NewWindowListener M webclient/src_moz/NativeEventThread.cpp - fix compiler warning. M webclient/src_moz/WindowCreator.cpp - add logging M webclient/test/automated/src/classes/org/mozilla/webclient/DOMTest.java M webclient/test/automated/src/classes/org/mozilla/webclient/KeyListenerTest.java M webclient/test/automated/src/classes/org/mozilla/webclient/MouseListenerTest.java M webclient/test/automated/src/classes/org/mozilla/webclient/WindowCreatorTest.java - use dom to get the screen coordinates of elements on which to click, instead of using hard coded screen coordinates, which are not cross platform friendly. M webclient/test/automated/src/test/WindowCreatorTest0.html - add ids to some elements for use in testcases. git-svn-id: svn://10.0.0.236/trunk@228340 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -236,7 +236,7 @@ nsresult nsJavaDOMImpl::GetDocument(nsIWebProgress* aWebProgress,
|
||||
|
||||
fprintf(stderr,
|
||||
"nsJavaDOMImpl::GetDocument: failed: "
|
||||
"webProgress=%x, domWin=%x, domDoc=%x, "
|
||||
"webProgress=%p, domWin=%p, domDoc=%p, "
|
||||
"error=%d\n",
|
||||
aWebProgress,
|
||||
domWin.get(),
|
||||
@@ -549,7 +549,7 @@ JNIEnv* nsJavaDOMImpl::GetJNIEnv() {
|
||||
if (!jvm) {
|
||||
StartJVM();
|
||||
}
|
||||
jvm->AttachCurrentThread(&env,NULL);
|
||||
jvm->AttachCurrentThread((void **) &env,NULL);
|
||||
#endif /* JAVA_DOM_OJI_ENABLE */
|
||||
return env;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user