This checkin verifies that loading documents over HTTP works as

expected.

M src_moz/Makefile.in

- added WindowWatcher to compilation

M src_moz/NativeBrowserControl.cpp

- turn on our WindowWatcher.  Still need to flesh this out, but it
  seemed to be necessary for http to work.

M src_moz/WindowCreator.cpp
M src_moz/WindowCreator.h

- return to compilation

M src_moz/WrapperFactoryImpl.cpp

- hack to workaround bug posted to n.p.m.e by me today regarding
  nsIOService::SetOffline(TRUE) being called.  The workaround is to
  manually call nsIOService::SetOffline(FALSE) *after* the point in time
  where the "TRUE" call is made.

M test/automated/src/classes/org/mozilla/util/THTTPD.java

- tweaks to make this suitable for JUnit testing.

M test/automated/src/classes/org/mozilla/webclient/NavigationTest.java

- all navigation tests work.


git-svn-id: svn://10.0.0.236/trunk@158322 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
edburns%acm.org
2004-06-22 19:23:23 +00:00
parent 2bbd7e4852
commit 0007840201
7 changed files with 66 additions and 29 deletions

View File

@@ -31,6 +31,8 @@
#include "ns_util.h"
#include "nsCRT.h" // for nsCRT::strcmp
#include <nsIIOService.h> // PENDING(edburns): remove when the offline issue is resolved
#include <nsWidgetsCID.h> // for NS_APPSHELL_CID
#include <nsIComponentManager.h> // for do_CreateInstance
#include <nsILocalFile.h>
@@ -51,7 +53,10 @@
#include "NativeBrowserControl.h"
#include "nsNetCID.h" // for NS_IOSERVICE_CID
static NS_DEFINE_CID(kAppShellCID, NS_APPSHELL_CID);
static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
//
// global data
@@ -237,6 +242,18 @@ Java_org_mozilla_webclient_impl_wrapper_1native_WrapperFactoryImpl_nativeAppSetu
return;
}
nsCOMPtr<nsIIOService> ioService = do_GetService(kIOServiceCID, &rv);
if (NS_FAILED(rv)) {
::util_ThrowExceptionToJava(env, "Can't get IOService.");
return;
}
rv = ioService->SetOffline(PR_FALSE);
if (NS_FAILED(rv)) {
::util_ThrowExceptionToJava(env, "Can't get IOService.");
return;
}
PR_LOG(prLogModuleInfo, PR_LOG_DEBUG,
("WrapperFactoryImpl_nativeAppSetup: exiting\n"));