- rename initContext to NativeBrowserControl, at both the native and
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:
@@ -41,22 +41,22 @@
|
||||
|
||||
class wsCopySelectionEvent : public nsActionEvent {
|
||||
public:
|
||||
wsCopySelectionEvent(WebShellInitContext *yourInitContext);
|
||||
wsCopySelectionEvent(NativeBrowserControl *yourInitContext);
|
||||
void * handleEvent (void);
|
||||
|
||||
protected:
|
||||
WebShellInitContext *mInitContext;
|
||||
NativeBrowserControl *mInitContext;
|
||||
};
|
||||
|
||||
class wsFindEvent : public nsActionEvent {
|
||||
public:
|
||||
wsFindEvent(WebShellInitContext *yourInitContext, jstring searchString,
|
||||
wsFindEvent(NativeBrowserControl *yourInitContext, jstring searchString,
|
||||
jboolean forward, jboolean matchCase);
|
||||
wsFindEvent(WebShellInitContext *yourInitContext);
|
||||
wsFindEvent(NativeBrowserControl *yourInitContext);
|
||||
void * handleEvent (void);
|
||||
|
||||
protected:
|
||||
WebShellInitContext *mInitContext;
|
||||
NativeBrowserControl *mInitContext;
|
||||
jstring mSearchString;
|
||||
jboolean mForward;
|
||||
jboolean mMatchCase;
|
||||
@@ -64,19 +64,19 @@ protected:
|
||||
|
||||
class wsGetURLEvent : public nsActionEvent {
|
||||
public:
|
||||
wsGetURLEvent (WebShellInitContext *yourInitContext);
|
||||
wsGetURLEvent (NativeBrowserControl *yourInitContext);
|
||||
void * handleEvent (void);
|
||||
protected:
|
||||
WebShellInitContext *mInitContext;
|
||||
NativeBrowserControl *mInitContext;
|
||||
};
|
||||
|
||||
class wsSelectAllEvent : public nsActionEvent {
|
||||
public:
|
||||
wsSelectAllEvent(WebShellInitContext *yourInitContext);
|
||||
wsSelectAllEvent(NativeBrowserControl *yourInitContext);
|
||||
void * handleEvent (void);
|
||||
|
||||
protected:
|
||||
WebShellInitContext *mInitContext;
|
||||
NativeBrowserControl *mInitContext;
|
||||
};
|
||||
|
||||
/* PENDING(ashuk): remove this from here and in the motif directory
|
||||
@@ -105,43 +105,43 @@ protected:
|
||||
|
||||
class wsPrintEvent : public nsActionEvent {
|
||||
public:
|
||||
wsPrintEvent(WebShellInitContext *yourInitContext);
|
||||
wsPrintEvent(NativeBrowserControl *yourInitContext);
|
||||
void * handleEvent (void);
|
||||
|
||||
protected:
|
||||
WebShellInitContext *mInitContext;
|
||||
NativeBrowserControl *mInitContext;
|
||||
};
|
||||
|
||||
class wsPrintPreviewEvent : public nsActionEvent {
|
||||
public:
|
||||
wsPrintPreviewEvent(WebShellInitContext *yourInitContext, jboolean preview);
|
||||
wsPrintPreviewEvent(NativeBrowserControl *yourInitContext, jboolean preview);
|
||||
void * handleEvent (void);
|
||||
|
||||
protected:
|
||||
WebShellInitContext *mInitContext;
|
||||
NativeBrowserControl *mInitContext;
|
||||
jboolean mInPreview;
|
||||
};
|
||||
|
||||
class wsGetSelectionEvent: public nsActionEvent {
|
||||
public:
|
||||
wsGetSelectionEvent (JNIEnv *yourEnv, WebShellInitContext *yourInitContext, jobject yourSelection);
|
||||
wsGetSelectionEvent (JNIEnv *yourEnv, NativeBrowserControl *yourInitContext, jobject yourSelection);
|
||||
void * handleEvent (void);
|
||||
|
||||
protected:
|
||||
JNIEnv * mEnv;
|
||||
WebShellInitContext *mInitContext;
|
||||
NativeBrowserControl *mInitContext;
|
||||
jobject mSelection;
|
||||
};
|
||||
|
||||
|
||||
class wsHighlightSelectionEvent: public nsActionEvent {
|
||||
public:
|
||||
wsHighlightSelectionEvent (JNIEnv *yourEnv, WebShellInitContext *yourInitContext, jobject startContainer, jobject endContainer, PRInt32 startOffset, PRInt32 endOffset);
|
||||
wsHighlightSelectionEvent (JNIEnv *yourEnv, NativeBrowserControl *yourInitContext, jobject startContainer, jobject endContainer, PRInt32 startOffset, PRInt32 endOffset);
|
||||
void * handleEvent (void);
|
||||
|
||||
protected:
|
||||
JNIEnv *mEnv;
|
||||
WebShellInitContext *mInitContext;
|
||||
NativeBrowserControl *mInitContext;
|
||||
jobject mStartContainer;
|
||||
jobject mEndContainer;
|
||||
PRInt32 mStartOffset;
|
||||
@@ -151,11 +151,11 @@ protected:
|
||||
|
||||
class wsClearAllSelectionEvent: public nsActionEvent {
|
||||
public:
|
||||
wsClearAllSelectionEvent (WebShellInitContext *yourInitContext);
|
||||
wsClearAllSelectionEvent (NativeBrowserControl *yourInitContext);
|
||||
void * handleEvent (void);
|
||||
|
||||
protected:
|
||||
WebShellInitContext *mInitContext;
|
||||
NativeBrowserControl *mInitContext;
|
||||
};
|
||||
|
||||
#endif /* CurrentPageActionEvents_h___ */
|
||||
|
||||
Reference in New Issue
Block a user