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
182 lines
4.8 KiB
C++
182 lines
4.8 KiB
C++
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
|
|
*
|
|
* The contents of this file are subject to the Netscape 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/NPL/
|
|
*
|
|
* 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 mozilla.org code.
|
|
*
|
|
* The Initial Developer of the Original Code is Netscape
|
|
* Communications Corporation. Portions created by Netscape are
|
|
* Copyright (C) 1998 Netscape Communications Corporation. All
|
|
* Rights Reserved.
|
|
*
|
|
* Contributor(s): Ashutosh Kulkarni <ashuk@eng.sun.com>
|
|
* Ed Burns <edburns@acm.org>
|
|
*
|
|
*/
|
|
|
|
#ifndef BROWSERCONTAINER_H
|
|
#define BROWSERCONTAINER_H
|
|
|
|
#include "nsISupports.h"
|
|
#include "nsISupportsUtils.h"
|
|
#include "nsString.h"
|
|
#include "nsIDOMMouseListener.h"
|
|
#include "nsIDOMMouseEvent.h"
|
|
#include "nsIDOMEventTarget.h"
|
|
#include "nsIWebBrowserChrome.h"
|
|
#include "nsIWebProgressListener.h"
|
|
#include "nsIWebProgress.h"
|
|
#include "nsIWebShell.h" // We still have to implement nsIWebShellContainer
|
|
// in order to receveive some DocumentLoaderObserver
|
|
// events. edburns
|
|
#include "nsIURIContentListener.h"
|
|
#include "nsIDocShellTreeOwner.h"
|
|
#include "nsIInterfaceRequestor.h"
|
|
#include "nsIPrompt.h"
|
|
#include "nsIAuthPrompt.h"
|
|
#include "nsCWebBrowser.h"
|
|
#include "nsWeakReference.h"
|
|
|
|
#include "wcIBrowserContainer.h"
|
|
|
|
#include "ns_util.h"
|
|
|
|
class nsIURI;
|
|
|
|
// This is the class that handles the XPCOM side of things, callback
|
|
// interfaces into the web shell and so forth.
|
|
|
|
class CBrowserContainer :
|
|
public nsIBaseWindow,
|
|
public nsIWebBrowserChrome,
|
|
public nsIWebProgressListener,
|
|
public nsIWebShellContainer,
|
|
public nsIURIContentListener,
|
|
public nsIDocShellTreeOwner,
|
|
public nsIInterfaceRequestor,
|
|
public nsIPrompt,
|
|
public nsIAuthPrompt,
|
|
public nsIDOMMouseListener,
|
|
public wcIBrowserContainer,
|
|
public nsSupportsWeakReference
|
|
{
|
|
|
|
public:
|
|
|
|
|
|
public:
|
|
CBrowserContainer(nsIWebBrowser *pOwner, JNIEnv *yourJNIEnv, NativeBrowserControl *yourInitContext);
|
|
|
|
CBrowserContainer();
|
|
|
|
public:
|
|
virtual ~CBrowserContainer();
|
|
|
|
// Protected members
|
|
protected:
|
|
nsIWebBrowser *m_pOwner;
|
|
JNIEnv *mJNIEnv;
|
|
NativeBrowserControl *mInitContext;
|
|
jobject mDocTarget;
|
|
jobject mMouseTarget;
|
|
jobject mPrompt;
|
|
nsCOMPtr<nsIDOMEventTarget> mDomEventTarget;
|
|
PRInt32 mBlurSuppressionLevel;
|
|
static PRInt32 mInstanceCount;
|
|
|
|
//
|
|
// The following arguments are used in the takeActionOnNode method.
|
|
//
|
|
|
|
/**
|
|
* 0 is the leaf depth. That's why we call it the inverse depth.
|
|
*/
|
|
|
|
PRInt32 inverseDepth;
|
|
|
|
/**
|
|
* The properties table, created during a mouseEvent handler
|
|
*/
|
|
|
|
jobject properties;
|
|
|
|
/**
|
|
* the nsIDOMEvent in the current event
|
|
*/
|
|
|
|
nsCOMPtr<nsIDOMEvent> currentDOMEvent;
|
|
|
|
//
|
|
// End of ivars used in takeActionOnNode
|
|
//
|
|
|
|
|
|
public:
|
|
NS_DECL_ISUPPORTS
|
|
NS_DECL_NSIBASEWINDOW
|
|
NS_DECL_NSIWEBBROWSERCHROME
|
|
NS_DECL_NSIDOCSHELLTREEOWNER
|
|
NS_DECL_NSIURICONTENTLISTENER
|
|
NS_DECL_NSIINTERFACEREQUESTOR
|
|
NS_DECL_NSIWEBPROGRESSLISTENER
|
|
|
|
NS_DECL_WCIBROWSERCONTAINER
|
|
|
|
// "Services" accessed through nsIInterfaceRequestor
|
|
NS_DECL_NSIPROMPT
|
|
NS_DECL_NSIAUTHPROMPT
|
|
|
|
// nsIDOMMouseListener
|
|
|
|
NS_IMETHOD HandleEvent(nsIDOMEvent* aEvent);
|
|
NS_IMETHOD MouseDown(nsIDOMEvent* aMouseEvent);
|
|
NS_IMETHOD MouseUp(nsIDOMEvent* aMouseEvent);
|
|
NS_IMETHOD MouseClick(nsIDOMEvent* aMouseEvent);
|
|
NS_IMETHOD MouseDblClick(nsIDOMEvent* aMouseEvent);
|
|
NS_IMETHOD MouseOver(nsIDOMEvent* aMouseEvent);
|
|
NS_IMETHOD MouseOut(nsIDOMEvent* aMouseEvent);
|
|
|
|
// nsIWebShellContainer
|
|
NS_IMETHOD WillLoadURL(nsIWebShell* aShell,
|
|
const PRUnichar* aURL,
|
|
nsLoadType aReason);
|
|
|
|
NS_IMETHOD BeginLoadURL(nsIWebShell* aShell,
|
|
const PRUnichar* aURL);
|
|
|
|
NS_IMETHOD EndLoadURL(nsIWebShell* aShell,
|
|
const PRUnichar* aURL,
|
|
nsresult aStatus);
|
|
|
|
protected:
|
|
//
|
|
// Local methods
|
|
//
|
|
jobject JNICALL getPropertiesFromEvent(nsIDOMEvent *aMouseEvent);
|
|
|
|
void JNICALL addMouseEventDataToProperties(nsIDOMEvent *aMouseEvent);
|
|
|
|
/**
|
|
* Called from our nsIWebProgressListener.OnStateChanged()
|
|
*/
|
|
|
|
nsresult JNICALL doStartDocumentLoad(const PRUnichar *documentName);
|
|
nsresult JNICALL doEndDocumentLoad(nsIWebProgress *aWebProgress);
|
|
nsresult JNICALL doStartURLLoad(const PRUnichar *documentName);
|
|
nsresult JNICALL doEndURLLoad(const PRUnichar *documentName);
|
|
|
|
static nsresult JNICALL takeActionOnNode(nsCOMPtr<nsIDOMNode> curNode,
|
|
void *yourObject);
|
|
};
|
|
|
|
#endif
|
|
|