Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 03:45:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Author: Kyle Yuan

Browse Source 
r=edburns

bugfix from Kyle.  Prep for future work.
This commit is contained in:
edburns%acm.org 2003-05-14 15:54:45 +00:00
parent 9e9108a091
commit 8ab45e6186
4 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
java/webclient/src_moz/CBrowserContainer.cpp
View File

@ -598,7 +598,6 @@ NS_IMETHODIMP CBrowserContainer::OnStateChange(nsIWebProgress *aWebProgress,
return rv;
}
domWin->GetDocument(getter_AddRefs(mInitContext->currentDocument));
doStartDocumentLoad(uname.get());
}
if ((aStateFlags & STATE_STOP) && (aStateFlags & STATE_IS_DOCUMENT)) {

18
java/webclient/src_moz/NativeEventThread.cpp
View File

@ -230,11 +230,7 @@ JNIEXPORT void JNICALL Java_org_mozilla_webclient_wrapper_1native_NativeEventThr
return;
}
void* threadId = PR_GetCurrentThread();
if (threadId == (void *) gEmbeddedThread) {
// printf("--------- Thread ID ---- %p\n",gEmbeddedThread);
processEventLoop(initContext);
}
processEventLoop(initContext);
}
/**
@ -400,6 +396,12 @@ Java_org_mozilla_webclient_wrapper_1native_NativeEventThread_nativeRemoveAllList
int processEventLoop(WebShellInitContext * initContext)
{
if (PR_GetCurrentThread() != gEmbeddedThread)
return 0;
if (nsnull == initContext)
return 0;
#ifdef XP_UNIX
while(gtk_events_pending()) {
gtk_main_iteration();
@ -778,11 +780,7 @@ nsresult InitMozillaStuff (WebShellInitContext * initContext)
}
#endif
// PENDING(kyle): not sure if we need to check this, but it does prevent some crash from happening
void* threadId = PR_GetCurrentThread();
if (threadId == (void *) gEmbeddedThread)
// Just need to loop once to clear out events before returning
processEventLoop(initContext);
processEventLoop(initContext);
return rv;
}

7
java/webclient/src_moz/NativeEventThreadActionEvents.cpp
View File

@ -102,8 +102,9 @@ wsRealizeBrowserEvent::handleEvent ()
}
// create our BrowserContainer, which implements many many things.
CBrowserContainer *browserContainer;
mInitContext->browserContainer =
mInitContext->browserContainer = browserContainer =
new CBrowserContainer(mInitContext->webBrowser, mInitContext->env,
mInitContext);
@ -121,6 +122,10 @@ wsRealizeBrowserEvent::handleEvent ()
// set the docloaderobserver PENDING(edburns): how to we make our
// presence as a nsIWebProgressListener know?n
nsWeakPtr weakling(
dont_AddRef(NS_GetWeakReference(NS_STATIC_CAST(nsIWebProgressListener*, browserContainer))));
webBrowser->AddWebBrowserListener(weakling, NS_GET_IID(nsIWebProgressListener));
printf("Creation Done.....\n");
// Get the WebNavigation Object from the DocShell

5
java/webclient/src_moz/WindowCreator.cpp
View File

@ -65,11 +65,8 @@ WindowCreator::CreateChromeWindow(nsIWebBrowserChrome *parent,
0);
// check gNewWindowInitContext to see if the initialization had completed
void* threadId = PR_GetCurrentThread();
while (!gNewWindowInitContext) {
if (threadId == (void *) gEmbeddedThread) {
processEventLoop(mInitContext);
}
processEventLoop(mInitContext);
::PR_Sleep(PR_INTERVAL_NO_WAIT);
}