7f3d1127ae
runs, but nothing else does. As you all probably already know, all mozilla API calls have to happen on the same thread. For webclient, this will be the NativeEventThread. This change-bundle does many many things, here are the main ones. These changes are in concert with the checkin I just did to the diagram at <http://www.mozilla.org/projects/blackwood/webclient/design/20040306-webclient-2_0.zargo>. M classes_spec/org/mozilla/webclient/impl/WrapperFactory.java M classes_spec/org/mozilla/webclient/impl/wrapper_native/WrapperFactoryImpl.java * <p>This class is the hub of the startup and shutdown sequence for * Webclient. It is a singleton and owns references to other app * singletons:</p> * * <ul> * <li><p>{@link NativeEventThread}</p></li> * * <li><p>{@link Bookmarks}</p></li> * * <li><p>{@link Preferences}</p></li> * * <li><p>{@link ProfileManager}</p></li> * <li><p>the native object singleton corresponding to this java * object (if necessary)</p></li> * * </ul> * * <p>It maintains a set of {@link BrowserControlImpl} instances so that * we may return the native pointer for each one.</p> * * <p>This class is responsible for creating and initializing and * deleting {@link BrowserControlImpl} instances, as well as ensuring * that the native counterpart is proprely maintained in kind.</p> * * <p>This class has a tight contract with {@link * NativeEventThread}.</p> - make BrowserControl creation and deletion part of this classes responsibilities. - introduce NativeWrapperFactory concept. - own the one and only NativeEventThread. M classes_spec/org/mozilla/webclient/impl/wrapper_native/NativeEventThread.java - make this a singleton. - remove dependencies on BrowserControl and nativeBrowserControl * <p>This is a singleton class. All native events pass thru this class * by virtue of the {@link #pushRunnable} or {@link pushNotifyRunnable} * methods.</p> - remove listener logic. This'll go into EventRegistration, where it belongs. A src_moz/NativeWrapperFactory.cpp A src_moz/NativeWrapperFactory.h - takes the place of the old WebclientContext - is now a class M classes_spec/org/mozilla/webclient/impl/BrowserControlImpl.java - this no longer destroys the nativeBrowserControl. That is now done by WrapperFactoryImpl. M classes_spec/org/mozilla/webclient/impl/WebclientFactoryImpl.java - no longer maintain browserControlCount. M classes_spec/org/mozilla/webclient/impl/wrapper_native/BookmarksImpl.java M classes_spec/org/mozilla/webclient/impl/wrapper_native/NavigationImpl.java M classes_spec/org/mozilla/webclient/impl/wrapper_native/PreferencesImpl.java M classes_spec/org/mozilla/webclient/impl/wrapper_native/ProfileManagerImpl.java - rename NativeContext to NativeWrapperFactory, to illustrate its singletonness. M classes_spec/org/mozilla/webclient/impl/wrapper_native/EventRegistrationImpl.java - comment out a bunch of stuff in anticipation of the new threading model, currently being fleshed out. M classes_spec/org/mozilla/webclient/impl/wrapper_native/ImplObjectNative.java - NativeEventThread is singleton M src_moz/BookmarksImpl.cpp M src_moz/PreferencesImpl.cpp M src_moz/ProfileManagerImpl.cpp M src_moz/RDFEnumeration.cpp M src_moz/RDFTreeNode.cpp - rename WebclientContext to NativeWrapperFactory. M src_moz/EmbedWindow.cpp - mBaseWindow->Destroy(); + if (mBaseWindow) { + mBaseWindow->Destroy(); + } M src_moz/Makefile.in - Bring back NavigationImpl - add NativeWrapperFactory. M src_moz/NativeBrowserControl.cpp M src_moz/NativeBrowserControl.h - move event queue and java related stuff to NativeWrapperFactory. This class is now essentially a copy of EmbedPrivate in GtkEmbed. M src_moz/NativeEventThread.cpp - remove methods, most of it has moved to WrapperFactoryImpl/NativeWrapperFactory. M src_moz/NavigationImpl.cpp - comment out all methods but LoadURI. M src_moz/WrapperFactoryImpl.cpp - take functionality over from NativeEventThread. M src_moz/ns_util.cpp M src_moz/ns_util.h - the eventQueue is owned by NativeWrapperFactory now. M src_moz/rdf_util.cpp M src_share/jni_util.cpp - make all exceptions RuntimeExceptions, so they can be thrown from a Runnable. M test/automated/src/classes/org/mozilla/webclient/impl/wrapper_native/WrapperFactoryImplTest.java - comment out the meat of this test until I figure out how to test it. M test/automated/src/test/BrowserControlFactoryTest_correct - new content. git-svn-id: svn://10.0.0.236/trunk@154953 18797224-902f-48f8-a5cc-f745e15eee43
198 lines
4.5 KiB
Makefile
198 lines
4.5 KiB
Makefile
# 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 mozilla.org code.
|
|
#
|
|
# The Initial Developer of the Original Code is Sun Microsystems,
|
|
# Inc. Portions created by Sun are
|
|
# Copyright (C) 1999 Sun Microsystems, Inc. All
|
|
# Rights Reserved.
|
|
#
|
|
# Contributor(s):
|
|
|
|
DEPTH = ../../..
|
|
topsrcdir = @top_srcdir@
|
|
srcdir = @srcdir@
|
|
VPATH = @srcdir@
|
|
|
|
|
|
# IMPORTANT: on Linux, if building webclient with a non-debug mozilla
|
|
# tree, the libwidget_gtk.so binary produced will not work with
|
|
# webclient. Namely, the symbol handle_gdk_event__FP9_GdkEventPv will
|
|
# be defined locally, not globaly, as is required. For the webclient
|
|
# 1.0 release, we're going to bundle a libwidget_gtk.so with the xpi.
|
|
# If you want to do a non-debug build of your own, you must make sure
|
|
# yor libwidget_gtk.so is linked without these options:
|
|
|
|
# -DNDEBUG -DTRIMMED
|
|
|
|
# and with these options
|
|
|
|
# -DNDEBUG -DDEBUG_edburns
|
|
|
|
# If your libwidget_gtk.so has this symbol:
|
|
|
|
# 0003b2d0 T handle_gdk_event__FP9_GdkEventPv
|
|
|
|
# with the capital T, you're ok. The version of libwidget_gtk.so used
|
|
# in the webclient 1.0 bundle is available at:
|
|
# <http://www.mozilla.org/projects/blackwood/webclient/bin/1.0/libwidget_gtk.so>.
|
|
# to build WEBCLIENT_PACKAGE_BUILD on linux, grab libwidget_gtk.so from
|
|
# the above URL and put it in the same directory as this file.
|
|
|
|
include $(DEPTH)/config/autoconf.mk
|
|
|
|
ifneq ($(BAL_INTERFACE),)
|
|
LIBRARY_NAME = webclient_bal
|
|
else
|
|
LIBRARY_NAME = webclient
|
|
endif
|
|
|
|
REQUIRES = xpcom \
|
|
layout \
|
|
shistory \
|
|
find \
|
|
appcomps \
|
|
appshell \
|
|
pref \
|
|
locale \
|
|
intl \
|
|
rdf \
|
|
bookmarks \
|
|
content \
|
|
editor \
|
|
string \
|
|
embed_base \
|
|
webBrowser_core \
|
|
webbrwsr \
|
|
webshell \
|
|
windowwatcher \
|
|
profile \
|
|
necko \
|
|
docshell \
|
|
dom \
|
|
widget \
|
|
uriloader \
|
|
webbrowserpersist \
|
|
gfx \
|
|
gtkembedmoz \
|
|
$(NULL)
|
|
|
|
# BROKEN SOURCES
|
|
# nsActions.cpp \
|
|
# CBrowserContainer.cpp \
|
|
# PromptActionEvents.cpp \
|
|
# CurrentPageImpl.cpp \
|
|
# CurrentPageActionEvents.cpp \
|
|
# HistoryImpl.cpp \
|
|
# HistoryActionEvents.cpp \
|
|
# ISupportsPeer.cpp \
|
|
# NativeEventThreadActionEvents.cpp \
|
|
# NavigationActionEvents.cpp \
|
|
# InputStreamShim.cpp \
|
|
# WindowControlImpl.cpp \
|
|
# WindowControlActionEvents.cpp \
|
|
# WindowCreator.cpp \
|
|
|
|
CPPSRCS = \
|
|
NativeBrowserControl.cpp \
|
|
NativeWrapperFactory.cpp \
|
|
EmbedWindow.cpp \
|
|
NativeEventThread.cpp \
|
|
NavigationImpl.cpp \
|
|
ns_util.cpp \
|
|
ns_util_export.cpp \
|
|
dom_util.cpp \
|
|
rdf_util.cpp \
|
|
BookmarksImpl.cpp \
|
|
RDFEnumeration.cpp \
|
|
RDFTreeNode.cpp \
|
|
wsRDFObserver.cpp \
|
|
PreferencesImpl.cpp \
|
|
ProfileManagerImpl.cpp \
|
|
WrapperFactoryImpl.cpp \
|
|
$(NULL)
|
|
|
|
ifeq ($(OS_ARCH),Linux)
|
|
CPPSRCS += \
|
|
gtk/GtkBrowserControlCanvas.cpp \
|
|
$(NULL)
|
|
DIRS = gtk
|
|
else
|
|
ifeq ($(OS_ARCH),WINNT)
|
|
CPPSRCS += \
|
|
win32/Win32BrowserControlCanvas.cpp \
|
|
$(NULL)
|
|
else
|
|
CPPSRCS += \
|
|
gtk/GtkBrowserControlCanvas.cpp \
|
|
$(NULL)
|
|
DIRS = gtk
|
|
endif
|
|
endif
|
|
|
|
|
|
EXTRA_LIBS += \
|
|
$(XPCOM_LIBS) \
|
|
$(NSPR_LIBS) \
|
|
$(DIST)/lib/$(LIB_PREFIX)embed_base_s.$(LIB_SUFFIX) \
|
|
$(NULL)
|
|
|
|
ifeq ($(OS_ARCH),WINNT)
|
|
EXTRA_LIBS += \
|
|
$(DIST)/lib/wc_share.lib \
|
|
$(MOZ_JDKHOME)/lib/jawt.lib \
|
|
$(NULL)
|
|
endif
|
|
|
|
|
|
include $(topsrcdir)/config/rules.mk
|
|
|
|
ifdef MOZ_ENABLE_GTK
|
|
ifndef MOZ_MONOLITHIC_TOOLKIT
|
|
CXXFLAGS += $(MOZ_GTK_CFLAGS)
|
|
CFLAGS += $(MOZ_GTK_CFLAGS)
|
|
EXTRA_DSO_LDOPTS += -lgtkxtbin -lgtksuperwin -lwc_share -lembed_base_s -L/usr/X11R6/lib -lXt
|
|
else
|
|
CXXFLAGS += $(TK_CFLAGS)
|
|
CFLAGS += $(TK_CFLAGS)
|
|
EXTRA_DSO_LDOPTS += -lgtkxtbin -lgtksuperwin -lwc_share -lembed_base_s -L/usr/X11R6/lib -lXt
|
|
endif
|
|
endif
|
|
|
|
ifneq ($(BAL_INTERFACE),)
|
|
CXXFLAGS += -DBAL_INTERFACE
|
|
endif
|
|
|
|
ifneq ($(BAL_INTERFACE),)
|
|
EXTRA_DSO_LDOPTS += -lwc_share_bal
|
|
else
|
|
ifneq ($(OS_ARCH),WINNT)
|
|
EXTRA_DSO_LDOPTS += -lwc_share
|
|
endif
|
|
endif
|
|
|
|
ifeq ($(OS_ARCH),Linux)
|
|
INCLUDES := -I$(MOZ_JDKHOME)/include -I$(MOZ_JDKHOME)/include/linux $(INCLUDES) \
|
|
-I$(DEPTH)/widget/src/gtk -I../src_share
|
|
else
|
|
ifeq ($(OS_ARCH),WINNT)
|
|
INCLUDES := -I$(MOZ_JDKHOME)/include -I$(MOZ_JDKHOME)/include/win32 $(INCLUDES) \
|
|
-I../src_share -I.
|
|
else
|
|
INCLUDES := -I$(MOZ_JDKHOME)/include -I$(MOZ_JDKHOME)/include/solaris $(INCLUDES) \
|
|
-I$(DEPTH)/widget/src/gtk -I../src_share
|
|
endif
|
|
endif
|
|
|
|
|
|
clobber_all:: clobber
|
|
|