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:
@@ -29,8 +29,10 @@
|
||||
#include "nsIEventQueueService.h" // for PLEventQueue
|
||||
#include "nsIServiceManager.h" // for do_GetService
|
||||
#include "nsEmbedAPI.h" // for NS_HandleEmbeddingEvent
|
||||
#include <nsIWindowWatcher.h> // for initializing our window watcher service
|
||||
|
||||
#include "EmbedWindow.h"
|
||||
#include "WindowCreator.h"
|
||||
#include "EmbedProgress.h"
|
||||
#include "NativeBrowserControl.h"
|
||||
#include "ns_util.h"
|
||||
@@ -91,9 +93,15 @@ NativeBrowserControl::Init()
|
||||
|
||||
//
|
||||
// create the WindowCreator: see
|
||||
// NativeEventThread->InitializeWindowCreator
|
||||
//
|
||||
WindowCreator *creator = new WindowCreator(this);
|
||||
nsCOMPtr<nsIWindowCreator> windowCreator;
|
||||
windowCreator = NS_STATIC_CAST(nsIWindowCreator *, creator);
|
||||
|
||||
// Attach it via the watcher service
|
||||
nsCOMPtr<nsIWindowWatcher> watcher = do_GetService(NS_WINDOWWATCHER_CONTRACTID);
|
||||
if (watcher) {
|
||||
watcher->SetWindowCreator(windowCreator);
|
||||
}
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user