r=ashuk
The following files are in the fix for this bug:
M CBrowserContainer.cpp
M CurrentPageImpl.cpp
M HistoryImpl.cpp
M NavigationImpl.cpp
Here is the reason for the bug:
User presses "Refresh" button. This causes the following code to be executed:
public void refresh(long loadFlags)
{
ParameterCheck.noLessThan(loadFlags, 0);
myFactory.throwExceptionIfNotInitialized();
Assert.assert(-1 != nativeWebShell);
synchronized(myBrowserControl) {
nativeRefresh(nativeWebShell, loadFlags);
}
}
In the process of refresh, on another thread, the user's
eventDispatched() method is called, which calls history.canBack():
public boolean canBack()
{
myFactory.throwExceptionIfNotInitialized();
Assert.assert(-1 != nativeWebShell);
boolean result = false;
synchronized(myBrowserControl) {
result = nativeCanBack(nativeWebShell);
}
return result;
}
This call blocks on trying to acquire the lock for myBrowserControl, and
the load can't proceed until canBack() returns. DEADLOCK.
-------------
The fix is to use PostEvent instead of PostSynchronous event. This
causes the call to nativeRefresh to return immediately.
git-svn-id: svn://10.0.0.236/branches/JAVADEV_RTM_20001102@86938 18797224-902f-48f8-a5cc-f745e15eee43
300 lines
8.9 KiB
C++
300 lines
8.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): 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>
|
|
*/
|
|
|
|
#include "HistoryImpl.h"
|
|
|
|
#include "HistoryActionEvents.h"
|
|
|
|
#include "ns_util.h"
|
|
|
|
|
|
JNIEXPORT void JNICALL
|
|
Java_org_mozilla_webclient_wrapper_1native_HistoryImpl_nativeBack
|
|
(JNIEnv *env, jobject obj, jint webShellPtr)
|
|
{
|
|
JNIEnv * pEnv = env;
|
|
jobject jobj = obj;
|
|
|
|
WebShellInitContext* initContext = (WebShellInitContext *) webShellPtr;
|
|
|
|
if (initContext == nsnull) {
|
|
::util_ThrowExceptionToJava(env, "Exception: null webShellPtr passed to raptorWebShellBack");
|
|
return;
|
|
}
|
|
|
|
if (initContext->initComplete) {
|
|
wsBackEvent * actionEvent =
|
|
new wsBackEvent(initContext->webNavigation);
|
|
PLEvent * event = (PLEvent*) *actionEvent;
|
|
|
|
::util_PostEvent(initContext, event);
|
|
}
|
|
|
|
return;
|
|
}
|
|
|
|
JNIEXPORT jboolean
|
|
JNICALL Java_org_mozilla_webclient_wrapper_1native_HistoryImpl_nativeCanBack
|
|
(JNIEnv *env, jobject obj, jint webShellPtr)
|
|
{
|
|
jboolean result = JNI_FALSE;
|
|
JNIEnv * pEnv = env;
|
|
jobject jobj = obj;
|
|
void * voidResult;
|
|
// PRBool voidResult;
|
|
|
|
WebShellInitContext* initContext = (WebShellInitContext *) webShellPtr;
|
|
|
|
if (initContext == nsnull) {
|
|
::util_ThrowExceptionToJava(env, "Exception: null webShellPtr passed to raptorWebShellCanBack");
|
|
return result;
|
|
}
|
|
|
|
if (initContext->initComplete) {
|
|
wsCanBackEvent * actionEvent =
|
|
new wsCanBackEvent(initContext->webNavigation);
|
|
PLEvent * event = (PLEvent*) *actionEvent;
|
|
|
|
voidResult = ::util_PostSynchronousEvent(initContext, event);
|
|
|
|
result = (PR_FALSE == ((PRBool) voidResult)) ? JNI_FALSE : JNI_TRUE;
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
JNIEXPORT jobjectArray JNICALL Java_org_mozilla_webclient_wrapper_1native_HistoryImpl_nativeGetBackList
|
|
(JNIEnv *env, jobject obj, jint webShellPtr)
|
|
{
|
|
jobjectArray result = nsnull;
|
|
|
|
return result;
|
|
}
|
|
|
|
JNIEXPORT void JNICALL
|
|
Java_org_mozilla_webclient_wrapper_1native_HistoryImpl_nativeClearHistory
|
|
(JNIEnv *env, jobject obj, jint webShellPtr)
|
|
{
|
|
|
|
}
|
|
|
|
JNIEXPORT void JNICALL Java_org_mozilla_webclient_wrapper_1native_HistoryImpl_nativeForward
|
|
(JNIEnv *env, jobject obj, jint webShellPtr)
|
|
{
|
|
JNIEnv * pEnv = env;
|
|
jobject jobj = obj;
|
|
|
|
WebShellInitContext* initContext = (WebShellInitContext *) webShellPtr;
|
|
|
|
if (initContext == nsnull) {
|
|
::util_ThrowExceptionToJava(env, "Exception: null webShellPtr passed to raptorWebShellForward");
|
|
return;
|
|
}
|
|
|
|
if (initContext->initComplete) {
|
|
wsForwardEvent * actionEvent =
|
|
new wsForwardEvent(initContext->webNavigation);
|
|
PLEvent * event = (PLEvent*) *actionEvent;
|
|
|
|
::util_PostEvent(initContext, event);
|
|
}
|
|
|
|
return;
|
|
}
|
|
|
|
JNIEXPORT jboolean JNICALL Java_org_mozilla_webclient_wrapper_1native_HistoryImpl_nativeCanForward
|
|
(JNIEnv *env, jobject obj, jint webShellPtr)
|
|
{
|
|
jboolean result = JNI_FALSE;
|
|
JNIEnv * pEnv = env;
|
|
jobject jobj = obj;
|
|
void * voidResult;
|
|
|
|
WebShellInitContext* initContext = (WebShellInitContext *) webShellPtr;
|
|
|
|
if (initContext == nsnull) {
|
|
::util_ThrowExceptionToJava(env, "Exception: null webShellPtr passed to raptorWebShellCanForward");
|
|
return result;
|
|
}
|
|
|
|
if (initContext->initComplete) {
|
|
wsCanForwardEvent * actionEvent =
|
|
new wsCanForwardEvent(initContext->webNavigation);
|
|
PLEvent * event = (PLEvent*) *actionEvent;
|
|
|
|
voidResult = ::util_PostSynchronousEvent(initContext, event);
|
|
|
|
result = (PR_FALSE == ((PRBool) voidResult)) ? JNI_FALSE : JNI_TRUE;
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
JNIEXPORT jobjectArray JNICALL Java_org_mozilla_webclient_wrapper_1native_HistoryImpl_nativeGetForwardList
|
|
(JNIEnv *env, jobject obj, jint webShellPtr)
|
|
{
|
|
jobjectArray result = nsnull;
|
|
|
|
return result;
|
|
}
|
|
|
|
JNIEXPORT jobjectArray JNICALL Java_org_mozilla_webclient_wrapper_1native_HistoryImpl_nativeGetHistory
|
|
(JNIEnv *env, jobject obj, jint webShellPtr)
|
|
{
|
|
jobjectArray result = nsnull;
|
|
|
|
return result;
|
|
}
|
|
|
|
JNIEXPORT jobject JNICALL
|
|
Java_org_mozilla_webclient_wrapper_1native_HistoryImpl_nativeGetHistoryEntry
|
|
(JNIEnv *env, jobject obj, jint webShellPtr, jint historyIndex)
|
|
{
|
|
jobject result = nsnull;
|
|
|
|
return result;
|
|
}
|
|
|
|
JNIEXPORT jint JNICALL
|
|
Java_org_mozilla_webclient_wrapper_1native_HistoryImpl_nativeGetCurrentHistoryIndex
|
|
(JNIEnv *env, jobject obj, jint webShellPtr)
|
|
{
|
|
JNIEnv * pEnv = env;
|
|
jobject jobj = obj;
|
|
void * voidResult = nsnull;
|
|
jint result = -1;
|
|
|
|
WebShellInitContext* initContext = (WebShellInitContext *) webShellPtr;
|
|
|
|
if (initContext == nsnull) {
|
|
::util_ThrowExceptionToJava(env, "Exception: null webShellPtr passed to raptorWebShellGetHistoryIndex");
|
|
return result;
|
|
}
|
|
|
|
if (initContext->initComplete) {
|
|
wsGetHistoryIndexEvent * actionEvent =
|
|
new wsGetHistoryIndexEvent(initContext);
|
|
PLEvent * event = (PLEvent*) *actionEvent;
|
|
|
|
voidResult = ::util_PostSynchronousEvent(initContext, event);
|
|
|
|
result = (jint) voidResult;
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
JNIEXPORT void JNICALL
|
|
Java_org_mozilla_webclient_wrapper_1native_HistoryImpl_nativeSetCurrentHistoryIndex
|
|
(JNIEnv *env, jobject obj, jint webShellPtr, jint historyIndex)
|
|
{
|
|
JNIEnv * pEnv = env;
|
|
jobject jobj = obj;
|
|
|
|
WebShellInitContext* initContext = (WebShellInitContext *) webShellPtr;
|
|
|
|
if (initContext == nsnull) {
|
|
::util_ThrowExceptionToJava(env, "Exception: null webShellPtr passed to nativeSetCurrentHistoryIndex");
|
|
return;
|
|
}
|
|
|
|
if (initContext->initComplete) {
|
|
wsGoToEvent * actionEvent =
|
|
new wsGoToEvent(initContext->webNavigation, historyIndex);
|
|
PLEvent * event = (PLEvent*) *actionEvent;
|
|
|
|
::util_PostEvent(initContext, event);
|
|
}
|
|
|
|
return;
|
|
}
|
|
|
|
JNIEXPORT jint JNICALL
|
|
Java_org_mozilla_webclient_wrapper_1native_HistoryImpl_nativeGetHistoryLength
|
|
(JNIEnv *env, jobject obj, jint webShellPtr)
|
|
{
|
|
JNIEnv * pEnv = env;
|
|
jobject jobj = obj;
|
|
void * voidResult = nsnull;
|
|
jint result = -1;
|
|
|
|
WebShellInitContext* initContext = (WebShellInitContext *) webShellPtr;
|
|
|
|
if (initContext == nsnull) {
|
|
::util_ThrowExceptionToJava(env, "Exception: null webShellPtr passed to raptorWebShellGetHistoryLength");
|
|
return result;
|
|
}
|
|
|
|
if (initContext->initComplete) {
|
|
wsGetHistoryLengthEvent * actionEvent =
|
|
new wsGetHistoryLengthEvent(initContext);
|
|
PLEvent * event = (PLEvent*) *actionEvent;
|
|
|
|
voidResult = ::util_PostSynchronousEvent(initContext, event);
|
|
|
|
result = (jint) voidResult;
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
JNIEXPORT jstring JNICALL Java_org_mozilla_webclient_wrapper_1native_HistoryImpl_nativeGetURLForIndex
|
|
(JNIEnv *env, jobject obj, jint webShellPtr, jint historyIndex)
|
|
{
|
|
JNIEnv * pEnv = env;
|
|
jobject jobj = obj;
|
|
char * charResult = nsnull;
|
|
jstring urlString = nsnull;
|
|
|
|
WebShellInitContext* initContext = (WebShellInitContext *) webShellPtr;
|
|
|
|
if (initContext == nsnull) {
|
|
::util_ThrowExceptionToJava(env, "Exception: null webShellPtr passed to raptorWebShellGetURL");
|
|
return nsnull;
|
|
}
|
|
|
|
if (initContext->initComplete) {
|
|
wsGetURLForIndexEvent * actionEvent =
|
|
new wsGetURLForIndexEvent(initContext, historyIndex);
|
|
PLEvent * event = (PLEvent*) *actionEvent;
|
|
|
|
charResult = (char *) ::util_PostSynchronousEvent(initContext, event);
|
|
|
|
if (charResult != nsnull) {
|
|
urlString = ::util_NewStringUTF(env, (const char *) charResult);
|
|
}
|
|
else {
|
|
::util_ThrowExceptionToJava(env, "raptorWebShellGetURL Exception: GetURL() returned nsnull");
|
|
return nsnull;
|
|
}
|
|
|
|
nsCRT::free(charResult);
|
|
}
|
|
|
|
return urlString;
|
|
}
|