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
117 lines
3.3 KiB
C++
117 lines
3.3 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
|
|
*
|
|
* The contents of this file are subject to the Mozilla Public
|
|
* License Version 1.1 (the "License"); you may not use this file
|
|
* except in compliance with the License. You may obtain a copy of
|
|
* the License at http://www.mozilla.org/MPL/
|
|
*
|
|
* Software distributed under the License is distributed on an "AS
|
|
* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
|
|
* implied. See the License for the specific language governing
|
|
* rights and limitations under the License.
|
|
*
|
|
* The Original Code is RaptorCanvas.
|
|
*
|
|
* The Initial Developer of the Original Code is Kirk Baker and
|
|
* Ian Wilkinson. Portions created by Kirk Baker and Ian Wilkinson are
|
|
* Copyright (C) 1999 Kirk Baker and Ian Wilkinson. All
|
|
* Rights Reserved.
|
|
*
|
|
* Contributor(s): Kirk Baker <kbaker@eb.com>
|
|
* Ian Wilkinson <iw@ennoble.com>
|
|
* Mark Lin <mark.lin@eng.sun.com>
|
|
* Mark Goddard
|
|
* Ed Burns <edburns@acm.org>
|
|
* Ashutosh Kulkarni <ashuk@eng.sun.com>
|
|
* Ann Sunhachawee
|
|
*/
|
|
|
|
#ifndef NativeBrowserControl_h
|
|
#define NativeBrowserControl_h
|
|
|
|
#include <nsCOMPtr.h>
|
|
#include <nsIWebNavigation.h> // for all Navigation commands
|
|
#include <nsISHistory.h>
|
|
#include <nsIDOMEventReceiver.h>
|
|
|
|
#ifdef XP_PC
|
|
#include <windows.h> // for HWND
|
|
#endif
|
|
|
|
#include "ns_util.h"
|
|
|
|
class EmbedWindow;
|
|
|
|
/**
|
|
* <p>Native analog to BrowserControl. Hosts per-window things. Maps
|
|
* closely to EmbedPrivate in GtkEmbed.</p>
|
|
*
|
|
*/
|
|
|
|
class NativeBrowserControl {
|
|
|
|
public:
|
|
|
|
NativeBrowserControl();
|
|
~NativeBrowserControl();
|
|
|
|
//
|
|
// public API
|
|
//
|
|
|
|
nsresult Init (JNIEnv *env, jobject nativeEventThread);
|
|
nsresult Realize (void* parentWinPtr, PRBool *aAlreadyRealized);
|
|
void Unrealize (void);
|
|
void Show (void);
|
|
void Hide (void);
|
|
void Resize (PRUint32 aWidth, PRUint32 aHeight);
|
|
void Destroy (void);
|
|
|
|
/**
|
|
|
|
* This function processes methods inserted into NativeBrowserControl's
|
|
* actionQueue. It is called once during the initialization of the
|
|
* NativeEventThread java thread, and infinitely in
|
|
* NativeEventThread.run()'s event loop. The call to PL_HandleEvent
|
|
* below, ends up calling the nsActionEvent subclass's handleEvent()
|
|
* method. After which it calls nsActionEvent::destroyEvent().
|
|
|
|
*/
|
|
|
|
PRUint32 ProcessEventLoop(void);
|
|
nsresult GetFailureCode (void);
|
|
static PRBool IsInitialized (void);
|
|
|
|
//
|
|
// Relationship ivars
|
|
//
|
|
|
|
#ifdef XP_UNIX
|
|
GtkWidget * parentHWnd;
|
|
#else
|
|
HWND parentHWnd;
|
|
#endif
|
|
|
|
nsCOMPtr<nsIWebNavigation> mNavigation;
|
|
nsCOMPtr<nsISHistory> mSessionHistory;
|
|
|
|
EmbedWindow * mWindow;
|
|
nsCOMPtr<nsISupports> mWindowGuard;
|
|
JNIEnv * mEnv;
|
|
jobject mNativeEventThread;
|
|
ShareInitContext mShareContext;
|
|
|
|
//
|
|
// Class vars
|
|
//
|
|
static PLEventQueue * sActionQueue;
|
|
static PRThread * sEmbeddedThread;
|
|
|
|
private:
|
|
nsresult mFailureCode;
|
|
static PRBool sInitComplete;
|
|
|
|
};
|
|
|
|
#endif // NativeBrowserControl_h
|