Thanks again to Michael Klepikov for these fixes.
M dom/jni/org_mozilla_dom_NodeImpl.cpp - code around the absence of LowerCaseEqualsLiteral in nsTAString.h. I'm surprised the unit tests worked for me all aloung though. M webclient/build.xml - make run.test.browser depend on "main" M webclient/src_moz/EmbedProgress.cpp - deal with null URL passed to ::OnStateChange M webclient/src_moz/HistoryImpl.cpp - Don't cast to PRBool* when you don't need to. M webclient/test/manual/src/classes/org/mozilla/webclient/test/TestBrowser.java - don't swallow the exception from setAppData(). git-svn-id: svn://10.0.0.236/trunk@160299 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -67,16 +67,16 @@ JNICALL Java_org_mozilla_webclient_impl_wrapper_1native_HistoryImpl_nativeCanBac
|
||||
|
||||
if (nativeBrowserControl == nsnull) {
|
||||
::util_ThrowExceptionToJava(env, "Exception: null nativeBCPtr passed to nativeCanBack");
|
||||
return (result == PR_TRUE) ? JNI_TRUE : JNI_FALSE;
|
||||
return result ? JNI_TRUE : JNI_FALSE;
|
||||
}
|
||||
|
||||
nsresult rv =
|
||||
nativeBrowserControl->mNavigation->GetCanGoBack((PRBool *) &result);
|
||||
nativeBrowserControl->mNavigation->GetCanGoBack(&result);
|
||||
if (NS_FAILED(rv)) {
|
||||
::util_ThrowExceptionToJava(env, "Exception: Can't GetCanGoBack");
|
||||
}
|
||||
|
||||
return (result == PR_TRUE) ? JNI_TRUE : JNI_FALSE;
|
||||
return result ? JNI_TRUE : JNI_FALSE;
|
||||
}
|
||||
|
||||
JNIEXPORT void JNICALL
|
||||
@@ -106,7 +106,7 @@ JNIEXPORT jboolean
|
||||
JNICALL Java_org_mozilla_webclient_impl_wrapper_1native_HistoryImpl_nativeCanForward
|
||||
(JNIEnv *env, jobject obj, jint nativeBCPtr)
|
||||
{
|
||||
PRBool result = JNI_FALSE;
|
||||
PRBool result = PR_FALSE;
|
||||
JNIEnv * pEnv = env;
|
||||
jobject jobj = obj;
|
||||
|
||||
@@ -114,16 +114,16 @@ JNICALL Java_org_mozilla_webclient_impl_wrapper_1native_HistoryImpl_nativeCanFor
|
||||
|
||||
if (nativeBrowserControl == nsnull) {
|
||||
::util_ThrowExceptionToJava(env, "Exception: null nativeBCPtr passed to nativeCanForward");
|
||||
return (result == PR_TRUE) ? JNI_TRUE : JNI_FALSE;
|
||||
return result ? JNI_TRUE : JNI_FALSE;
|
||||
}
|
||||
|
||||
nsresult rv =
|
||||
nativeBrowserControl->mNavigation->GetCanGoForward((PRBool *) &result);
|
||||
nativeBrowserControl->mNavigation->GetCanGoForward(&result);
|
||||
if (NS_FAILED(rv)) {
|
||||
::util_ThrowExceptionToJava(env, "Exception: Can't GetCanGoForward");
|
||||
}
|
||||
|
||||
return (result == PR_TRUE) ? JNI_TRUE : JNI_FALSE;
|
||||
return result ? JNI_TRUE : JNI_FALSE;
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user