mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-22 09:45:41 +00:00
a0614d0908
only able to load the first burst from the RandomHTMLInputStream, because for some reason the native stream is getting closed prematurely. Need to investigate more. M classes_spec/org/mozilla/webclient/impl/wrapper_native/NavigationImpl.java - remove loadFromStreamBlocking. No point in implementing this since the loadFromStream() impl is inherently multi-threaded. M src_moz/EmbedWindow.cpp M src_moz/EmbedWindow.h - expose LoadStream() method that wraps same on nsIDocShell. M src_moz/InputStreamShim.cpp - Do a lock around our buffer deletion in or dtor. M src_moz/Makefile.in - activate nsActions and NavigationActionEvents M src_moz/NavigationActionEvents.cpp M src_moz/NavigationActionEvents.h - comment out everything but wsLoadFromStreamEvent. - fix it to work with the NativeBrowserControl. M src_moz/NavigationImpl.cpp - activate nativeLoadFromStream. This is the first *new* version method to use the old native event queue. M src_moz/ns_util.cpp M src_moz/ns_util.h - remove unused first arg from Post*Event methods. M test/automated/src/classes/org/mozilla/webclient/NavigationTest.java - activate loadFromStream test. M test/automated/src/classes/org/mozilla/webclient/RandomHTMLInputStream.java - add a randomExceptions param to the ctor to enable or disable randomly thrown exceptions.
152 lines
4.1 KiB
C
152 lines
4.1 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
|
|
*/
|
|
|
|
|
|
/**
|
|
|
|
* Util methods
|
|
|
|
*/
|
|
|
|
#ifndef ns_util_h
|
|
#define ns_util_h
|
|
|
|
#include "jni_util.h" // located in ../src_share,
|
|
// pulls in ../src_share/jni_util_export.h
|
|
|
|
#include "nsCOMPtr.h" // so we can save the docShell
|
|
#include "nsIWebBrowser.h"
|
|
#include "nsIDocShell.h" // so we can save our nsIDocShell
|
|
#include "nsIBaseWindow.h" // to get methods like SetVisibility
|
|
#include "nsIPresShell.h"
|
|
#include "nsIThread.h" // for PRThread
|
|
#include "nsIWebShell.h" // for nsIWebShell
|
|
#include "nsIEventQueueService.h" // for PLEventQueue
|
|
#include "nsIDOMDocument.h"
|
|
|
|
#include "wcIBrowserContainer.h" // our BrowserContainer
|
|
|
|
#include "NativeWrapperFactory.h"
|
|
|
|
#include "ns_globals.h"
|
|
|
|
// Ashu
|
|
#ifdef XP_UNIX
|
|
#include "nsIWidget.h" // for GTKWidget
|
|
#include <gtk/gtk.h>
|
|
#endif
|
|
//
|
|
|
|
#if defined(XP_UNIX) || defined(XP_MAC) || defined(XP_BEOS)
|
|
|
|
#define WC_ITOA(intVal, buf, radix) sprintf(buf, "%d", intVal)
|
|
#else
|
|
#define WC_ITOA(intVal, buf, radix) itoa(intVal, buf, radix)
|
|
#endif
|
|
|
|
//
|
|
// local classes
|
|
//
|
|
|
|
|
|
enum {
|
|
kEventQueueError = 1,
|
|
kCreateWebShellError,
|
|
kCreateDocShellError,
|
|
kGetBaseWindowError,
|
|
kInitWebShellError,
|
|
kShowWebShellError,
|
|
kHistoryWebShellError,
|
|
kClipboardWebShellError,
|
|
kFindComponentError,
|
|
kGetContentViewerError,
|
|
kGetDOMWindowError
|
|
};
|
|
|
|
extern const char *gSupportedListenerInterfaces[]; // defined in ns_util.cpp
|
|
|
|
/**
|
|
|
|
* This method calls PL_PostEvent(),
|
|
|
|
* http://lxr.mozilla.org/mozilla/source/xpcom/threads/plevent.c#248
|
|
|
|
* which simply uses nice monitors to insert the event into the provided
|
|
* event queue, which is from NativeWrapperFactory::sActionQueue. The
|
|
* events are processed in NativeEventThread.cpp:processEventLoop, which
|
|
* is called from the Java NativeEventThread.run(). See the code and
|
|
* comments for processEventLoop in NativeEventThread.cpp.
|
|
|
|
*/
|
|
|
|
void util_PostEvent (PLEvent * event);
|
|
|
|
|
|
/**
|
|
|
|
* This method calls PL_PostSynchronousEvent(),
|
|
|
|
* http://lxr.mozilla.org/mozilla/source/xpcom/threads/plevent.c#278
|
|
|
|
* which, instead of putting the event in the queue, as in
|
|
* util_PostEvent(), either calls the event's handler directly, or puts
|
|
* it in the queue and waits for it to be processed so it can return the
|
|
* result.
|
|
|
|
*/
|
|
|
|
void * util_PostSynchronousEvent (PLEvent * event);
|
|
|
|
typedef struct _wsStringStruct {
|
|
const PRUnichar *uniStr;
|
|
jstring jStr;
|
|
} wsStringStruct;
|
|
|
|
/**
|
|
|
|
* @param strings wsStringStruct []. A null terminated array of
|
|
* wsStringStruct instances. On return, the jStr of each element is the
|
|
* new jstring. Call util_DeleteJstringsFromUnichars to deallocate.
|
|
|
|
*/
|
|
|
|
nsresult util_CreateJstringsFromUnichars(wsStringStruct *strings,
|
|
PRInt32 arrayLen);
|
|
|
|
nsresult util_DeleteJstringsFromUnichars(wsStringStruct *strings,
|
|
PRInt32 arrayLen);
|
|
|
|
// hack functions to get around mozilla oddities
|
|
#ifdef XP_UNIX
|
|
jint util_GetGTKWinPtrFromCanvas(JNIEnv *env, jobject browserControlCanvas);
|
|
#endif
|
|
|
|
nsresult util_GetLocaleString(const char *aKey, PRUnichar **aResult);
|
|
|
|
#endif // ns_util_h
|