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
290 lines
6.0 KiB
C++
290 lines
6.0 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>
|
|
* Ashutosh Kulkarni <ashuk@eng.sun.com>
|
|
* Mark Lin <mark.lin@eng.sun.com>
|
|
* Mark Goddard
|
|
* Ed Burns <edburns@acm.org>
|
|
* Jason Mawdsley <jason@macadamian.com>
|
|
* Louis-Philippe Gagnon <louisphilippe@macadamian.com>
|
|
*/
|
|
|
|
/*
|
|
* HistoryActionEvents.cpp
|
|
*/
|
|
|
|
#include "HistoryActionEvents.h"
|
|
#include "ns_util.h"
|
|
#include "nsIHistoryEntry.h"
|
|
#include "nsIURI.h"
|
|
#include "nsString.h"
|
|
#include "nsReadableUtils.h"
|
|
|
|
/*
|
|
* wsCanBackEvent
|
|
*/
|
|
|
|
wsCanBackEvent::wsCanBackEvent(nsIWebNavigation* webNavigation) :
|
|
nsActionEvent(),
|
|
mWebNavigation(webNavigation)
|
|
{
|
|
|
|
}
|
|
|
|
void *
|
|
wsCanBackEvent::handleEvent ()
|
|
{
|
|
void *result = nsnull;
|
|
if (mWebNavigation) {
|
|
nsresult rv;
|
|
PRBool canGoBack;
|
|
|
|
rv = mWebNavigation->GetCanGoBack(&canGoBack);
|
|
|
|
if (NS_FAILED(rv)) {
|
|
return result;
|
|
}
|
|
|
|
result = (void *)canGoBack;
|
|
}
|
|
return result;
|
|
} // handleEvent()
|
|
|
|
/*
|
|
* wsCanForwardEvent
|
|
*/
|
|
|
|
wsCanForwardEvent::wsCanForwardEvent(nsIWebNavigation* webNavigation) :
|
|
nsActionEvent(),
|
|
mWebNavigation(webNavigation)
|
|
{
|
|
|
|
}
|
|
|
|
|
|
void *
|
|
wsCanForwardEvent::handleEvent ()
|
|
{
|
|
void *result = nsnull;
|
|
if (mWebNavigation) {
|
|
nsresult rv;
|
|
PRBool canGoForward;
|
|
|
|
rv = mWebNavigation->GetCanGoForward(&canGoForward);
|
|
|
|
if (NS_FAILED(rv)) {
|
|
return result;
|
|
}
|
|
|
|
result = (void *)canGoForward;
|
|
|
|
}
|
|
return result;
|
|
} // handleEvent()
|
|
|
|
|
|
/*
|
|
* wsBackEvent
|
|
*/
|
|
|
|
wsBackEvent::wsBackEvent(nsIWebNavigation* webNavigation) :
|
|
nsActionEvent(),
|
|
mWebNavigation(webNavigation)
|
|
{
|
|
}
|
|
|
|
|
|
void *
|
|
wsBackEvent::handleEvent ()
|
|
{
|
|
void *result = nsnull;
|
|
if (mWebNavigation) {
|
|
nsresult rv = mWebNavigation->GoBack();
|
|
|
|
result = (void *) rv;
|
|
}
|
|
return result;
|
|
} // handleEvent()
|
|
|
|
|
|
|
|
/*
|
|
* wsForwardEvent
|
|
*/
|
|
|
|
wsForwardEvent::wsForwardEvent(nsIWebNavigation* webNavigation) :
|
|
nsActionEvent(),
|
|
mWebNavigation(webNavigation)
|
|
{
|
|
}
|
|
|
|
|
|
void *
|
|
wsForwardEvent::handleEvent ()
|
|
{
|
|
void *result = nsnull;
|
|
if (mWebNavigation) {
|
|
|
|
nsresult rv = mWebNavigation->GoForward();
|
|
result = (void *) rv;
|
|
}
|
|
return result;
|
|
} // handleEvent()
|
|
|
|
|
|
/*
|
|
* wsGoToEvent
|
|
*/
|
|
|
|
wsGoToEvent::wsGoToEvent(nsIWebNavigation* webNavigation, PRInt32 historyIndex) :
|
|
nsActionEvent(),
|
|
mWebNavigation(webNavigation), mHistoryIndex(historyIndex)
|
|
{
|
|
}
|
|
|
|
|
|
void *
|
|
wsGoToEvent::handleEvent ()
|
|
{
|
|
void *result = nsnull;
|
|
nsresult rv = nsnull;
|
|
if (mWebNavigation) {
|
|
nsresult rv = mWebNavigation->GotoIndex(mHistoryIndex);
|
|
result = (void *) rv;
|
|
}
|
|
return result;
|
|
} // handleEvent()
|
|
|
|
|
|
|
|
/*
|
|
* wsGetHistoryLengthEvent
|
|
*/
|
|
|
|
wsGetHistoryLengthEvent::wsGetHistoryLengthEvent(NativeBrowserControl
|
|
*yourInitContext) :
|
|
nsActionEvent(),
|
|
mInitContext(yourInitContext)
|
|
{
|
|
}
|
|
|
|
|
|
void *
|
|
wsGetHistoryLengthEvent::handleEvent ()
|
|
{
|
|
void *result = nsnull;
|
|
|
|
if (mInitContext) {
|
|
nsISHistory* sHistory;
|
|
PRInt32 historyLength = 0;
|
|
nsresult rv = mInitContext->webNavigation->
|
|
GetSessionHistory(&sHistory);
|
|
|
|
if ( NS_FAILED(rv)) {
|
|
return result;
|
|
}
|
|
rv = sHistory->GetCount(&historyLength);
|
|
result = (void *) historyLength;
|
|
}
|
|
return result;
|
|
} // handleEvent()
|
|
|
|
|
|
/*
|
|
* wsGetHistoryIndexEvent
|
|
*/
|
|
|
|
wsGetHistoryIndexEvent::wsGetHistoryIndexEvent(NativeBrowserControl *yourInitContext) :
|
|
nsActionEvent(),
|
|
mInitContext(yourInitContext)
|
|
{
|
|
}
|
|
|
|
|
|
void *
|
|
wsGetHistoryIndexEvent::handleEvent ()
|
|
{
|
|
void *result = nsnull;
|
|
if (mInitContext) {
|
|
PRInt32 historyIndex = 0;
|
|
nsISHistory* sHistory;
|
|
nsresult rv = mInitContext->webNavigation->GetSessionHistory(&sHistory);
|
|
|
|
rv = sHistory->GetIndex(&historyIndex);
|
|
result = (void *) historyIndex;
|
|
}
|
|
return result;
|
|
} // handleEvent()
|
|
|
|
|
|
|
|
|
|
/*
|
|
* wsGetURLForIndexEvent
|
|
*/
|
|
|
|
wsGetURLForIndexEvent::wsGetURLForIndexEvent(NativeBrowserControl *yourInitContext,
|
|
PRInt32 historyIndex) :
|
|
nsActionEvent(),
|
|
mInitContext(yourInitContext),
|
|
mHistoryIndex(historyIndex)
|
|
{
|
|
}
|
|
|
|
|
|
void *
|
|
wsGetURLForIndexEvent::handleEvent ()
|
|
{
|
|
void *result = nsnull;
|
|
if (mInitContext) {
|
|
nsresult rv;
|
|
nsISHistory* sHistory;
|
|
rv = mInitContext->webNavigation->GetSessionHistory(&sHistory);
|
|
char *indexURL = nsnull;
|
|
|
|
nsIHistoryEntry * Entry;
|
|
rv = sHistory->GetEntryAtIndex(mHistoryIndex, PR_FALSE, &Entry);
|
|
if (NS_FAILED(rv)) {
|
|
return result;
|
|
}
|
|
|
|
nsIURI * URI;
|
|
rv = Entry->GetURI(&URI);
|
|
|
|
if (NS_FAILED(rv)) {
|
|
return result;
|
|
}
|
|
|
|
nsCString urlSpecString;
|
|
|
|
rv = URI->GetSpec(urlSpecString);
|
|
if (NS_FAILED(rv)) {
|
|
return result;
|
|
}
|
|
|
|
indexURL = ToNewCString(urlSpecString);
|
|
result = (void *) indexURL;
|
|
}
|
|
return result;
|
|
} // handleEvent()
|
|
|
|
|