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
353 lines
12 KiB
C++
353 lines
12 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>
|
|
* Kyle Yuan <kyle.yuan@sun.com>
|
|
*/
|
|
|
|
/*
|
|
* CurrentPageImpl.cpp
|
|
*/
|
|
|
|
#include "org_mozilla_webclient_impl_wrapper_0005fnative_CurrentPageImpl.h"
|
|
|
|
#include "CurrentPageActionEvents.h"
|
|
|
|
#include "ns_util.h"
|
|
#include "rdf_util.h"
|
|
|
|
#include "nsCRT.h"
|
|
|
|
JNIEXPORT void JNICALL Java_org_mozilla_webclient_impl_wrapper_1native_CurrentPageImpl_nativeCopyCurrentSelectionToSystemClipboard
|
|
(JNIEnv *env, jobject obj, jint webShellPtr)
|
|
{
|
|
NativeBrowserControl* initContext = (NativeBrowserControl *) webShellPtr;
|
|
|
|
if (initContext->initComplete) {
|
|
wsCopySelectionEvent * actionEvent = new wsCopySelectionEvent(initContext);
|
|
PLEvent * event = (PLEvent*) *actionEvent;
|
|
::util_PostEvent(initContext, event);
|
|
}
|
|
|
|
}
|
|
|
|
JNIEXPORT void JNICALL Java_org_mozilla_webclient_impl_wrapper_1native_CurrentPageImpl_nativeGetSelection
|
|
(JNIEnv *env, jobject obj, jint webShellPtr, jobject selection)
|
|
{
|
|
NativeBrowserControl *initContext = (NativeBrowserControl *) webShellPtr;
|
|
|
|
if (initContext == nsnull) {
|
|
::util_ThrowExceptionToJava(env, "Exception: null webShellPtr passed nativeGetSelection");
|
|
return;
|
|
}
|
|
|
|
PR_ASSERT(initContext->initComplete);
|
|
|
|
if (selection == nsnull) {
|
|
::util_ThrowExceptionToJava(env, "Exception: null Selection object passed to raptorWebShellGetSelection");
|
|
return;
|
|
}
|
|
|
|
wsGetSelectionEvent *actionEvent = new wsGetSelectionEvent(env, initContext, selection);
|
|
|
|
PLEvent *event = (PLEvent *) *actionEvent;
|
|
::util_PostSynchronousEvent(initContext, event);
|
|
}
|
|
|
|
|
|
JNIEXPORT void JNICALL Java_org_mozilla_webclient_impl_wrapper_1native_CurrentPageImpl_nativeHighlightSelection
|
|
(JNIEnv *env, jobject obj, jint webShellPtr, jobject startContainer, jobject endContainer, jint startOffset, jint endOffset)
|
|
{
|
|
NativeBrowserControl *initContext = (NativeBrowserControl *) webShellPtr;
|
|
|
|
if (initContext == nsnull) {
|
|
::util_ThrowExceptionToJava(env, "Exception: null webShellPtr passed to nativeHighlightSelection");
|
|
return;
|
|
}
|
|
|
|
PR_ASSERT(initContext->initComplete);
|
|
|
|
wsHighlightSelectionEvent *actionEvent = new wsHighlightSelectionEvent(env, initContext, startContainer, endContainer, (PRInt32) startOffset, (PRInt32) endOffset);
|
|
PLEvent *event = (PLEvent *) *actionEvent;
|
|
::util_PostSynchronousEvent(initContext, event);
|
|
}
|
|
|
|
|
|
JNIEXPORT void JNICALL Java_org_mozilla_webclient_impl_wrapper_1native_CurrentPageImpl_nativeClearAllSelections
|
|
(JNIEnv *env, jobject obj, jint webShellPtr)
|
|
{
|
|
NativeBrowserControl *initContext = (NativeBrowserControl *) webShellPtr;
|
|
|
|
if (initContext == nsnull) {
|
|
::util_ThrowExceptionToJava(env, "Exception: null webShellPtr passed to nativeClearAllSelections");
|
|
return;
|
|
}
|
|
|
|
PR_ASSERT(initContext->initComplete);
|
|
|
|
wsClearAllSelectionEvent *actionEvent = new wsClearAllSelectionEvent(initContext);
|
|
|
|
PLEvent *event = (PLEvent *) *actionEvent;
|
|
::util_PostSynchronousEvent(initContext, event);
|
|
}
|
|
|
|
/*
|
|
* Class: org_mozilla_webclient_impl_wrapper_0005fnative_CurrentPageImpl
|
|
* Method: nativeFindInPage
|
|
* Signature: (Ljava/lang/String;ZZ)V
|
|
*/
|
|
JNIEXPORT void JNICALL Java_org_mozilla_webclient_impl_wrapper_1native_CurrentPageImpl_nativeFindInPage
|
|
(JNIEnv *env, jobject obj, jint webShellPtr, jstring searchString, jboolean forward, jboolean matchCase)
|
|
{
|
|
|
|
NativeBrowserControl* initContext = (NativeBrowserControl *) webShellPtr;
|
|
|
|
|
|
jstring searchStringGlobalRef = (jstring) ::util_NewGlobalRef(env, searchString);
|
|
if (!searchStringGlobalRef) {
|
|
initContext->initFailCode = kFindComponentError;
|
|
::util_ThrowExceptionToJava(env, "Exception: Can't create global ref for search string");
|
|
return;
|
|
}
|
|
|
|
if (initContext->initComplete) {
|
|
wsFindEvent * actionEvent = new wsFindEvent(initContext, searchStringGlobalRef,
|
|
forward, matchCase);
|
|
PLEvent * event = (PLEvent*) *actionEvent;
|
|
::util_PostEvent(initContext, event);
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
* Class: org_mozilla_webclient_impl_wrapper_0005fnative_CurrentPageImpl
|
|
* Method: nativeFindNextInPage
|
|
* Signature: (Z)V
|
|
*/
|
|
JNIEXPORT void JNICALL Java_org_mozilla_webclient_impl_wrapper_1native_CurrentPageImpl_nativeFindNextInPage
|
|
(JNIEnv *env, jobject obj, jint webShellPtr)
|
|
{
|
|
|
|
NativeBrowserControl* initContext = (NativeBrowserControl *) webShellPtr;
|
|
//First get the FindComponent object
|
|
|
|
PRBool found = PR_TRUE;
|
|
|
|
if (initContext->initComplete) {
|
|
wsFindEvent * actionEvent = new wsFindEvent(initContext);
|
|
PLEvent * event = (PLEvent*) *actionEvent;
|
|
::util_PostEvent(initContext, event);
|
|
}
|
|
|
|
}
|
|
|
|
/*
|
|
* Class: org_mozilla_webclient_impl_wrapper_0005fnative_CurrentPageImpl
|
|
* Method: nativeGetCurrentURL
|
|
* Signature: ()Ljava/lang/String;
|
|
*/
|
|
JNIEXPORT jstring JNICALL Java_org_mozilla_webclient_impl_wrapper_1native_CurrentPageImpl_nativeGetCurrentURL
|
|
(JNIEnv *env, jobject obj, jint webShellPtr)
|
|
{
|
|
JNIEnv * pEnv = env;
|
|
jobject jobj = obj;
|
|
char * charResult = nsnull;
|
|
jstring urlString = nsnull;
|
|
|
|
NativeBrowserControl* initContext = (NativeBrowserControl *) webShellPtr;
|
|
|
|
if (initContext == nsnull) {
|
|
::util_ThrowExceptionToJava(env, "Exception: null webShellPtr passed to raptorWebShellGetURL");
|
|
return nsnull;
|
|
}
|
|
|
|
if (initContext->initComplete) {
|
|
wsGetURLEvent * actionEvent = new wsGetURLEvent(initContext);
|
|
PLEvent * event = (PLEvent*) *actionEvent;
|
|
|
|
charResult = (char *) ::util_PostSynchronousEvent(initContext, event);
|
|
|
|
if (charResult != nsnull) {
|
|
urlString = ::util_NewStringUTF(env, (const char *) charResult);
|
|
}
|
|
else {
|
|
::util_ThrowExceptionToJava(env, "raptorWebShellGetURL Exception: GetURL() returned NULL");
|
|
return nsnull;
|
|
}
|
|
|
|
nsMemory::Free(charResult);
|
|
}
|
|
|
|
return urlString;
|
|
}
|
|
|
|
JNIEXPORT jobject JNICALL Java_org_mozilla_webclient_impl_wrapper_1native_CurrentPageImpl_nativeGetDOM
|
|
(JNIEnv *env, jobject obj, jint webShellPtr)
|
|
{
|
|
NativeBrowserControl* initContext = (NativeBrowserControl *) webShellPtr;
|
|
jobject result = nsnull;
|
|
jlong documentLong = nsnull;
|
|
jclass clazz = nsnull;
|
|
jmethodID mid = nsnull;
|
|
|
|
if (initContext == nsnull) {
|
|
::util_ThrowExceptionToJava(env, "Exception: null webShellPtr passed to raptorWebShellGetDOM");
|
|
return nsnull;
|
|
}
|
|
if (nsnull == initContext->currentDocument ||
|
|
nsnull == (documentLong = (jlong) initContext->currentDocument.get())){
|
|
return nsnull;
|
|
}
|
|
|
|
if (nsnull == (clazz = ::util_FindClass(env,
|
|
"org/mozilla/dom/DOMAccessor"))) {
|
|
::util_ThrowExceptionToJava(env, "Exception: Can't get DOMAccessor class");
|
|
return nsnull;
|
|
}
|
|
if (nsnull == (mid = env->GetStaticMethodID(clazz, "getNodeByHandle",
|
|
"(J)Lorg/w3c/dom/Node;"))) {
|
|
::util_ThrowExceptionToJava(env, "Exception: Can't get DOM Node.");
|
|
return nsnull;
|
|
}
|
|
|
|
wsGetDOMEvent * actionEvent = new wsGetDOMEvent(env, clazz, mid, documentLong);
|
|
PLEvent * event = (PLEvent*) *actionEvent;
|
|
result = (jobject) ::util_PostSynchronousEvent(initContext, event);
|
|
|
|
|
|
return result;
|
|
}
|
|
|
|
|
|
/*
|
|
* Class: org_mozilla_webclient_impl_wrapper_0005fnative_CurrentPageImpl
|
|
* Method: nativeGetSource
|
|
* Signature: ()Ljava/lang/String;
|
|
*/
|
|
|
|
/* PENDING(ashuk): remove this from here and in the motif directory
|
|
JNIEXPORT jstring JNICALL Java_org_mozilla_webclient_impl_wrapper_1native_CurrentPageImpl_nativeGetSource
|
|
(JNIEnv * env, jobject jobj)
|
|
{
|
|
jstring result = nsnull;
|
|
|
|
return result;
|
|
}
|
|
*/
|
|
|
|
|
|
/*
|
|
* Class: org_mozilla_webclient_impl_wrapper_0005fnative_CurrentPageImpl
|
|
* Method: nativeGetSourceBytes
|
|
* Signature: ()[B
|
|
*/
|
|
|
|
/* PENDING(ashuk): remove this from here and in the motif directory
|
|
JNIEXPORT jbyteArray JNICALL Java_org_mozilla_webclient_impl_wrapper_1native_CurrentPageImpl_nativeGetSourceBytes
|
|
(JNIEnv * env, jobject jobj, jint webShellPtr, jboolean viewMode)
|
|
{
|
|
|
|
|
|
NativeBrowserControl* initContext = (NativeBrowserControl *) webShellPtr;
|
|
|
|
if (initContext->initComplete) {
|
|
wsViewSourceEvent * actionEvent =
|
|
new wsViewSourceEvent(initContext->docShell, ((JNI_TRUE == viewMode)? PR_TRUE : PR_FALSE));
|
|
PLEvent * event = (PLEvent*) *actionEvent;
|
|
|
|
::util_PostEvent(initContext, event);
|
|
}
|
|
|
|
jbyteArray result = nsnull;
|
|
return result;
|
|
}
|
|
*/
|
|
|
|
|
|
/*
|
|
* Class: org_mozilla_webclient_impl_wrapper_0005fnative_CurrentPageImpl
|
|
* Method: nativeResetFind
|
|
* Signature: ()V
|
|
*/
|
|
JNIEXPORT void JNICALL Java_org_mozilla_webclient_impl_wrapper_1native_CurrentPageImpl_nativeResetFind
|
|
(JNIEnv * env, jobject obj, jint webShellPtr)
|
|
{
|
|
NativeBrowserControl* initContext = (NativeBrowserControl *) webShellPtr;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
* Class: org_mozilla_webclient_impl_wrapper_0005fnative_CurrentPageImpl
|
|
* Method: nativeSelectAll
|
|
* Signature: ()V
|
|
*/
|
|
JNIEXPORT void JNICALL Java_org_mozilla_webclient_impl_wrapper_1native_CurrentPageImpl_nativeSelectAll
|
|
(JNIEnv * env, jobject obj, jint webShellPtr)
|
|
{
|
|
NativeBrowserControl* initContext = (NativeBrowserControl *) webShellPtr;
|
|
if (initContext->initComplete) {
|
|
wsSelectAllEvent * actionEvent = new wsSelectAllEvent(initContext);
|
|
PLEvent * event = (PLEvent*) *actionEvent;
|
|
::util_PostEvent(initContext, event);
|
|
}
|
|
}
|
|
|
|
/*
|
|
* Class: org_mozilla_webclient_impl_wrapper_0005fnative_CurrentPageImpl
|
|
* Method: nativePrint
|
|
* Signature: (I)V
|
|
*/
|
|
JNIEXPORT void JNICALL Java_org_mozilla_webclient_impl_wrapper_1native_CurrentPageImpl_nativePrint
|
|
(JNIEnv * env, jobject obj, jint webShellPtr)
|
|
{
|
|
NativeBrowserControl* initContext = (NativeBrowserControl *) webShellPtr;
|
|
if (initContext->initComplete) {
|
|
wsPrintEvent * actionEvent = new wsPrintEvent(initContext);
|
|
PLEvent * event = (PLEvent*) *actionEvent;
|
|
::util_PostEvent(initContext, event);
|
|
}
|
|
}
|
|
|
|
/*
|
|
* Class: org_mozilla_webclient_impl_wrapper_0005fnative_CurrentPageImpl
|
|
* Method: nativePrintPreview
|
|
* Signature: (IZ)V
|
|
*/
|
|
JNIEXPORT void JNICALL Java_org_mozilla_webclient_impl_wrapper_1native_CurrentPageImpl_nativePrintPreview
|
|
(JNIEnv * env, jobject obj, jint webShellPtr, jboolean preview)
|
|
{
|
|
NativeBrowserControl* initContext = (NativeBrowserControl *) webShellPtr;
|
|
if (initContext->initComplete) {
|
|
wsPrintPreviewEvent * actionEvent = new wsPrintPreviewEvent(initContext, preview);
|
|
PLEvent * event = (PLEvent*) *actionEvent;
|
|
::util_PostEvent(initContext, event);
|
|
}
|
|
}
|
|
|