Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- rename initContext to NativeBrowserControl, at both the native and

Browse Source 
java layers.

- Rework NativeEventThread to be usable without having the
  browserControl window realized.

- change who owns the NativEventThread to be the BrowserControl, by
  proxy through WrapperFactoryImpl.  Again, this is with a view toward
  using webclient without the browserControl window realized.

A webclient/src_moz/NativeBrowserControl.h
A webclient/src_moz/NativeBrowserControl.cpp

- Centerpiece of native Object hierarchy.  Owned by NativeEventThread.

M webclient/build-tests.xml

- reformat

- add new test, currently failing, for Navigation.

M webclient/classes_spec/org/mozilla/webclient/impl/BrowserControlImpl.java

- destroy our nativeBrowserControl.

M webclient/classes_spec/org/mozilla/webclient/impl/WrapperFactory.java

- Added API for obtaining the NativeEventThread for a BrowserControl.

M webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/BookmarksImpl.java
M webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/CurrentPageImpl.java
M webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/EventRegistrationImpl.java
M webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/HistoryImpl.java
M webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/NavigationImpl.java

- rename nativeWebShell to nativeBrowserControl

M webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/ImplObjectNative.java

- rename nativeWebShell to nativeBrowserControl

- add method to get the NativeEventThread for this instance.

M webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/NativeEventThread.java

- remove dependency on WindowControl

- make this class be the owner of the nativeBrowserControl instance.

- rename nativeWebShell to nativeBrowserControl

- renamed nativeInitialize to nativeStartup

- added nativeShutdown

M webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/WindowControlImpl.java

- remove delete() method.

- no longer owns NativeEventThread

- no longer owns nativeBrowserControl

M webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/WrapperFactoryImpl.java

- Take over NativeEventThread ownership responsibilities from
  WindowControlImpl (by proxy for BrowserControl).

M webclient/src_moz/CBrowserContainer.cpp
M webclient/src_moz/CBrowserContainer.h
M webclient/src_moz/CurrentPageActionEvents.cpp
M webclient/src_moz/CurrentPageActionEvents.h
M webclient/src_moz/CurrentPageImpl.cpp
M webclient/src_moz/HistoryActionEvents.cpp
M webclient/src_moz/HistoryActionEvents.h
M webclient/src_moz/HistoryImpl.cpp
M webclient/src_moz/NativeEventThreadActionEvents.cpp
M webclient/src_moz/NativeEventThreadActionEvents.h
M webclient/src_moz/NavigationActionEvents.cpp
M webclient/src_moz/NavigationActionEvents.h
M webclient/src_moz/NavigationImpl.cpp
M webclient/src_moz/PromptActionEvents.cpp
M webclient/src_moz/PromptActionEvents.h
M webclient/src_moz/WindowControlActionEvents.cpp
M webclient/src_moz/WindowControlActionEvents.h
M webclient/src_moz/WindowCreator.cpp
M webclient/src_moz/WindowCreator.h

- rename nativeWebShell to nativeBrowserControl

M webclient/src_moz/Makefile.in

- comment out not yet fixed per-window sources

- add NativeBrowserControl.cpp

M webclient/src_moz/NativeEventThread.cpp

- major refactoring.  Much of the work is now being done in
  NativeBrowserControl.cpp

M webclient/src_moz/WindowControlImpl.cpp

- remove functionality now located in NativeEventThread and
  NativeBrowserControl.

M webclient/src_moz/WrapperFactoryImpl.cpp

- flesh out native{Create,Destroy}BrowserControl.

M webclient/src_moz/ns_globals.h

- remove gActionQueue and gEmbeddedThread.  Moved into class
  NativeBrowserControl.

M webclient/src_moz/ns_util.cpp

- rename initContext to NativeBrowserControl

- get action queue from NativeBrowserControl

M webclient/src_moz/ns_util.h

- remove WebShellInitContext!  It's finally a class now, called
  NativeBrowserControl.

M webclient/test/automated/src/classes/org/mozilla/webclient/impl/wrapper_native/WrapperFactoryImplTest.java

- added new testcase to show create/deleteBrowserControl works.


git-svn-id: svn://10.0.0.236/trunk@154679 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
edburns%acm.org
2004-04-10 21:50:39 +00:00
parent 5155cf3732
commit 2642d50ece
41 changed files with 861 additions and 812 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
mozilla/java/webclient/src_moz/ns_util.h
View File

@@ -43,7 +43,6 @@
#include "nsIWebBrowser.h"
#include "nsIDocShell.h" // so we can save our nsIDocShell
#include "nsIBaseWindow.h" // to get methods like SetVisibility
#include "nsIWebNavigation.h" // for all Navigation commands
#include "nsIPresShell.h"
#include "nsIThread.h" // for PRThread
#include "nsIWebShell.h" // for nsIWebShell
@@ -72,46 +71,14 @@
// local classes
//
// PENDING(edburns): this should be a class, and we should define a
// constructor and destructor for it.
struct WebShellInitContext {
#ifdef XP_UNIX
GtkWidget * parentHWnd;
#else
// PENDING(mark): Don't we need something for Mac?
HWND parentHWnd;
#endif
nsCOMPtr<nsIWebShell> webShell;
nsCOMPtr<nsIDocShell> docShell;
nsCOMPtr<nsIBaseWindow> baseWindow;
nsCOMPtr<nsIWebNavigation> webNavigation;
nsCOMPtr<nsIPresShell> presShell;
nsCOMPtr<nsIWebBrowser> webBrowser;
// PLEventQueue * actionQueue;
// PRThread * embeddedThread;
JNIEnv * env;
jobject nativeEventThread;
int stopThread;
int initComplete;
int initFailCode;
int x;
int y;
int w;
int h;
int gtkWinPtr;
nsCOMPtr<nsIDOMDocument> currentDocument;
nsCOMPtr<wcIBrowserContainer> browserContainer;
// This struct contains all per-window information not specific to mozilla
ShareInitContext shareContext;
};
class nsIProfile;
class nsIProfileInternal;
class nsIPref;
class nsIAppShell;
class NativeBrowserControl;
typedef struct WebclientContext {
struct WebclientContext {
nsIProfile *sProfile;
nsIProfileInternal *sProfileInternal;
nsIPref *sPrefs;
@@ -142,7 +109,7 @@ extern const char *gSupportedListenerInterfaces[]; // defined in ns_util.cpp
* http://lxr.mozilla.org/mozilla/source/xpcom/threads/plevent.c#248
* which simply uses nice monitors to insert the event into the provided
* event queue, which is from WebShellInitContext->actionQueue, which is
* event queue, which is from NativeBrowserControl->actionQueue, which is
* created in NativeEventThread.cpp:InitMozillaStuff(). The events are
* processed in NativeEventThread.cpp:processEventLoop, which is called
* from the Java NativeEventThread.run(). See the code and comments for
@@ -150,7 +117,7 @@ extern const char *gSupportedListenerInterfaces[]; // defined in ns_util.cpp
*/
void util_PostEvent (WebShellInitContext * initContext, PLEvent * event);
void util_PostEvent (NativeBrowserControl * initContext, PLEvent * event);
/**
@@ -166,7 +133,7 @@ void util_PostEvent (WebShellInitContext * initContext, PLEvent * event);
*/
void * util_PostSynchronousEvent (WebShellInitContext * initContext, PLEvent * event);
void * util_PostSynchronousEvent (NativeBrowserControl * initContext, PLEvent * event);
typedef struct _wsStringStruct {
const PRUnichar *uniStr;